From d0a507981f771afb68eeee1e94e82c1970d1c65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 22 May 2023 14:20:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=89=A9=E8=B5=84=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=87=BA=E5=BA=93=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/entity/basic/UdiRelevanceEntity.java | 2 ++ src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java | 2 +- .../java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java | 2 +- src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java | 2 +- src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 3 +++ 5 files changed, 8 insertions(+), 3 deletions(-) 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..d365a80b9 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 String 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..2962ac9ca 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 String 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..197ab6d15 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 String 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..c22f537ad 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 String zdcfsycs; public int getBhzxxsbzsl() { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index a900f4f03..5f6e283af 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -952,6 +952,9 @@ relCode=#{relCode}, + + zdcfsycs=#{zdcfsycs}, + needCert=#{needCert}, From 4a6f792398ee255f3c61fedccc36db2c30f5a36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 22 May 2023 14:47:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderMutiController.java | 29 +++++++++++++++---- .../api/entity/basic/ProductInfoEntity.java | 2 +- .../api/entity/basic/UdiProductEntity.java | 3 +- .../api/entity/basic/UdiRelevanceEntity.java | 2 +- .../api/req/basic/UdiRelevanceRequest.java | 2 +- .../req/basic/UdiRelevanceSaveRequest.java | 2 +- .../api/res/basic/UdiRelevanceResponse.java | 2 +- .../mybatis/mapper/basic/UdiProductDao.xml | 2 ++ 8 files changed, 32 insertions(+), 12 deletions(-) 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 d365a80b9..e54995426 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -172,5 +172,5 @@ public class UdiRelevanceEntity { @TableField(value = "certIdFk") private String certIdFk; @TableField(value = "zdcfsycs") - private String 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 2962ac9ca..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 String zdcfsycs; + 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 197ab6d15..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 String zdcfsycs; + 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 c22f537ad..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 String zdcfsycs; + 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 @@