bug修改

master
anthonywj 2 years ago
parent 239ca19545
commit 07c26bf55e

@ -370,6 +370,9 @@ public class IoCodeTempController extends BaseController {
//批次号校验
//判断此产品是否开启允许无批次号
UdiProductEntity udiInfoEntity = udiProductService.findByNameCode(udiEntity.getUdi());
if (udiInfoEntity == null) {
return ResultVOUtils.error(500, "耗材字典不存在此产品!");
}
if (!udiInfoEntity.getAllowNoBatch()) {
if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
return ResultVOUtils.error(500, "序列号与批次号不能同时为空!");

@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface UdiRelevanceDao extends BaseMapperPlus<IoCodeDao, IoCodeEntity, IoCodeEntity> {
public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRelevanceEntity, UdiRelevanceEntity> {
List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest);

@ -136,7 +136,7 @@ public class IoCodeTempEntity {
private Date createTime;
@TableField(exist = false)
private Integer status; //条码校验状态
private int status; //条码校验状态
@TableField(exist = false)
private String mySupId; //更新供应商

@ -58,6 +58,10 @@ public class FilterUdiUtils {
}
if (StrUtil.isEmpty(udiEntity.getUdi())) {
return null;
}
if (udiEntity.getUdi().length() < 14
) {
return null;
} else
return udiEntity;
}

Loading…
Cancel
Save