diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java index 6c3588d21..fb65f2004 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java @@ -68,8 +68,20 @@ public class IoOrderMutiController { public BaseResponse checkUdi(@RequestBody IoOrderMutiEntity ioOrderMutiEntity) { if (StrUtil.isNotBlank(ioOrderMutiEntity.getUdiCode())) { + //查询码是否包含序列号 UdiEntity udiEntity = FilterUdiUtils.getUdi(ioOrderMutiEntity.getUdiCode()); + + //查询物资信息 + UdiProductEntity udiProductEntity = udiProductService.selectUdiByName(udiEntity.getUdi()); + if(udiProductEntity.getUseMuti()==null || udiProductEntity.getUseMuti()==false){ + return ResultVOUtils.error(999, "该产品不允许多次出库！"); + }else{ + if(udiProductEntity.getZdcfsycs() == null || udiProductEntity.getZdcfsycs().equals(0)){ + return ResultVOUtils.error(999, "该产品库存不足！"); + } + } + if (StrUtil.isNotBlank(udiEntity.getSerialNo())) { //包含 QueryWrapper ew = new QueryWrapper<>(); @@ -82,8 +94,6 @@ public class IoOrderMutiController { } return ResultVOUtils.success(ioOrderMutiEntityOne.getId()); } else { - //查询物资信息 - UdiProductEntity udiProductEntity = udiProductService.selectUdiByName(udiEntity.getUdi()); ioOrderMutiEntityOne = new IoOrderMutiEntity(); ioOrderMutiEntityOne.setId(IdUtil.getSnowflakeNextId()); ioOrderMutiEntityOne.setRelIdFk(udiProductEntity.getRelId()); @@ -92,11 +102,11 @@ public class IoOrderMutiController { ioOrderMutiEntityOne.setBatchNo(udiEntity.getBatchNo()); ioOrderMutiEntityOne.setExpireDate(udiEntity.getExpireDate()); ioOrderMutiEntityOne.setProduceDate(udiEntity.getProduceDate()); - ioOrderMutiEntityOne.setTotalCount(20); + ioOrderMutiEntityOne.setTotalCount(udiProductEntity.getZdcfsycs()); ioOrderMutiEntityOne.setStatus(0); ioOrderMutiEntityOne.setCreateUser(customerService.getUserId() + ""); ioOrderMutiEntityOne.setUseCount(0); - ioOrderMutiEntityOne.setReCount(20); + ioOrderMutiEntityOne.setReCount(udiProductEntity.getZdcfsycs()); ioOrderMutiEntityOne.setCreateTime(new Date()); ioOrderMutiEntityOne.setUpdateTime(new Date()); ioOrderMutiEntityOne.setNameCode(udiProductEntity.getNameCode()); @@ -143,6 +153,13 @@ public class IoOrderMutiController { UdiEntity udiEntity = FilterUdiUtils.getUdi(ioOrderMutiEntity.getUdiCode()); //查询物资信息 UdiProductEntity udiProductEntity = udiProductService.selectUdiByName(udiEntity.getUdi()); + if(udiProductEntity.getUseMuti()==null || udiProductEntity.getUseMuti()==false){ + return ResultVOUtils.error(999, "该产品不允许多次出库！"); + }else{ + if(udiProductEntity.getZdcfsycs() == null || udiProductEntity.getZdcfsycs().equals(0)){ + return ResultVOUtils.error(999, "该产品库存不足！"); + } + } IoOrderMutiEntity ioOrderMutiEntity1 = new IoOrderMutiEntity(); ioOrderMutiEntity1.setId(IdUtil.getSnowflakeNextId()); @@ -152,10 +169,10 @@ public class IoOrderMutiController { ioOrderMutiEntity1.setBatchNo(udiEntity.getBatchNo()); ioOrderMutiEntity1.setExpireDate(udiEntity.getExpireDate()); ioOrderMutiEntity1.setProduceDate(udiEntity.getProduceDate()); - ioOrderMutiEntity1.setTotalCount(20); + ioOrderMutiEntity1.setTotalCount(udiProductEntity.getZdcfsycs()); ioOrderMutiEntity1.setStatus(0); ioOrderMutiEntity1.setUseCount(0); - ioOrderMutiEntity1.setReCount(20); + ioOrderMutiEntity1.setReCount(udiProductEntity.getZdcfsycs()); ioOrderMutiEntity1.setCreateUser(customerService.getUserId() + ""); ioOrderMutiEntity1.setCreateTime(new Date()); ioOrderMutiEntity1.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/entity/basic/ProductInfoEntity.java b/src/main/java/com/glxp/api/entity/basic/ProductInfoEntity.java index b34a1a3d6..0db267ddf 100644 --- a/src/main/java/com/glxp/api/entity/basic/ProductInfoEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/ProductInfoEntity.java @@ -61,7 +61,7 @@ public class ProductInfoEntity { private String sfwblztlcp; private String cgzmraqxgxx; private String sfbjwycxsy; - private String zdcfsycs; + private Integer zdcfsycs; private String sfwwjbz; private String syqsfxyjxmj; private String qtxxdwzlj; diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index cfc6a11fb..201cdbf9f 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -78,8 +78,9 @@ public class UdiProductEntity { private Integer status; private String supId; - + private Boolean useMuti; //是否多次使用 private Long relSupId; + private Integer zdcfsycs; public Boolean getAllowNoBatch() { diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 371b2e711..e54995426 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -171,4 +171,6 @@ public class UdiRelevanceEntity { @TableField(value = "certIdFk") private String certIdFk; + @TableField(value = "zdcfsycs") + private Integer zdcfsycs ; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java index 2de29a4bd..5217a10b4 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java @@ -37,6 +37,6 @@ public class UdiRelevanceRequest { private Boolean useMuti; //是否多次使用 private Integer useNum; //最小包装单元可使用次数 - + private Integer zdcfsycs; } diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index 68603f09a..9230bba9d 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -100,5 +100,5 @@ public class UdiRelevanceSaveRequest { private boolean groupBuy; //是否集采产品 private boolean needCert; //是否需要资质材料 private String certIdFk; - + private Integer zdcfsycs; } diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index d2f06e5dd..3b2c75ea9 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -108,7 +108,7 @@ public class UdiRelevanceResponse { private boolean needCert; //是否需要资质材料 private String classifyName; //物资分类名称 - + private Integer zdcfsycs; public int getBhzxxsbzsl() { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 27cf7ff02..7cb2ba463 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -964,6 +964,8 @@