From c50bd4910048d5b337f7c3fecc683ab4c4b58ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 27 Jun 2023 10:51:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=87=BA=E5=BA=93bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderMutiController.java | 12 ++++++------ .../com/glxp/api/entity/basic/UdiProductEntity.java | 1 + .../resources/mybatis/mapper/basic/UdiProductDao.xml | 2 +- 3 files changed, 8 insertions(+), 7 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 a0e5b2a2c..7893e1ee9 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java @@ -84,7 +84,7 @@ public class IoOrderMutiController { if (udiProductEntity.getUseMuti() == null || udiProductEntity.getUseMuti() == false) { return ResultVOUtils.error(999, "该产品不允许多次出库！"); } else { - if (udiProductEntity.getZdcfsycs() == null || udiProductEntity.getZdcfsycs().equals(0)) { + if (udiProductEntity.getUseNum() == null || udiProductEntity.getUseNum().equals(0)) { return ResultVOUtils.error(999, "该产品库存不足！"); } } @@ -121,11 +121,11 @@ public class IoOrderMutiController { ioOrderMutiEntityOne.setBatchNo(udiEntity.getBatchNo()); ioOrderMutiEntityOne.setExpireDate(udiEntity.getExpireDate()); ioOrderMutiEntityOne.setProduceDate(udiEntity.getProduceDate()); - ioOrderMutiEntityOne.setTotalCount(udiProductEntity.getZdcfsycs()); + ioOrderMutiEntityOne.setTotalCount(udiProductEntity.getUseNum()); ioOrderMutiEntityOne.setStatus(0); ioOrderMutiEntityOne.setCreateUser(customerService.getUserId() + ""); ioOrderMutiEntityOne.setUseCount(0); - ioOrderMutiEntityOne.setReCount(udiProductEntity.getZdcfsycs()); + ioOrderMutiEntityOne.setReCount(udiProductEntity.getUseNum()); ioOrderMutiEntityOne.setCreateTime(new Date()); ioOrderMutiEntityOne.setUpdateTime(new Date()); ioOrderMutiEntityOne.setNameCode(udiProductEntity.getNameCode()); @@ -175,7 +175,7 @@ public class IoOrderMutiController { if (udiProductEntity.getUseMuti() == null || udiProductEntity.getUseMuti() == false) { return ResultVOUtils.error(999, "该产品不允许多次出库！"); } else { - if (udiProductEntity.getZdcfsycs() == null || udiProductEntity.getZdcfsycs().equals(0)) { + if (udiProductEntity.getUseNum() == null || udiProductEntity.getUseNum().equals(0)) { return ResultVOUtils.error(999, "该产品库存不足！"); } } @@ -200,10 +200,10 @@ public class IoOrderMutiController { ioOrderMutiEntity1.setBatchNo(udiEntity.getBatchNo()); ioOrderMutiEntity1.setExpireDate(udiEntity.getExpireDate()); ioOrderMutiEntity1.setProduceDate(udiEntity.getProduceDate()); - ioOrderMutiEntity1.setTotalCount(udiProductEntity.getZdcfsycs()); + ioOrderMutiEntity1.setTotalCount(udiProductEntity.getUseNum()); ioOrderMutiEntity1.setStatus(0); ioOrderMutiEntity1.setUseCount(0); - ioOrderMutiEntity1.setReCount(udiProductEntity.getZdcfsycs()); + ioOrderMutiEntity1.setReCount(udiProductEntity.getUseNum()); ioOrderMutiEntity1.setCreateUser(customerService.getUserId() + ""); ioOrderMutiEntity1.setCreateTime(new Date()); ioOrderMutiEntity1.setUpdateTime(new Date()); 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 c1893bd26..afa29631f 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -95,5 +95,6 @@ public class UdiProductEntity { private String mjfs; private String categoryName; private Date updateTime; + private Integer useNum; } diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index f25339d4d..e1ce86b40 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -1098,7 +1098,7 @@