From 5c451346ea0c7d8750ecee019a76c8104e8d4d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Wed, 19 Jul 2023 15:31:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java | 1 + .../java/com/glxp/api/req/inv/InnerOrderDetailRequest.java | 1 + src/main/java/com/glxp/api/res/inout/IoOrderResponse.java | 2 +- src/main/resources/mybatis/mapper/inout/IoOrderDao.xml | 5 ++++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index 53633f2d7..84c717d56 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -197,4 +197,5 @@ public class FilterOrderRequest extends ListPageRequest { private String unionRemark; private String remark; + private Integer confirmStatus; } diff --git a/src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java index bc8197b4f..fe067661d 100644 --- a/src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java @@ -9,5 +9,6 @@ public class InnerOrderDetailRequest extends ListPageRequest { private String orderIdFk; private String productId; private String billNo; + private String nameCode; } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 28fa32531..4dff3b355 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -230,7 +230,7 @@ public class IoOrderResponse { //总金额 private BigDecimal allAmount; - + private Integer confirmStatus; /** * 校验信息 diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 1dd5be140..d12eb1efe 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -503,6 +503,9 @@ LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId LEFT JOIN io_order_detail_code dc ON io.billNo = dc.orderIdFk + + AND io.checkStatus = #{confirmStatus} + AND io.id = #{id} @@ -630,7 +633,7 @@ order by ${orderBy} ${sort} - order by updateTime desc + order by checkStatus asc,updateTime desc From cece855d6b8a9f0d933233b0c3d1fea858a08531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 19 Jul 2023 16:13:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=89=E6=9C=9F=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=BA=8F=E5=88=97=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 19 ++++++++++++++++--- .../api/service/inout/IoCodeTempService.java | 2 ++ .../inout/impl/IoCodeTempServiceImpl.java | 17 +++++++++++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index e201cdb28..c786e01b7 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -448,7 +448,7 @@ public class IoCodeTempController extends BaseController { long recent = 0; if (udiRelevanceResponse.getRecentDateTime() != null) recent = udiRelevanceResponse.getRecentDateTime().longValue(); - if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()&& udiRelevanceResponse.getIsDateBy()==2) { + if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 2) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); long expireTime = MsDateUtil.parseDateExpire(expireDate); @@ -456,7 +456,7 @@ public class IoCodeTempController extends BaseController { long resultTime = expireTime - System.currentTimeMillis(); if (resultTime > 0) { - long time = resultTime / ( 60 * 60 * 1000); + long time = resultTime / (60 * 60 * 1000); // long time = resultTime / (24 * 60 * 60 * 1000); if (resultTime < recentTieme) { return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "时,是否确定继续添加?"); @@ -465,7 +465,7 @@ public class IoCodeTempController extends BaseController { } } - if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy()==1) { + if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire() && udiRelevanceResponse.getIsDateBy() == 1) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); long expireTime = MsDateUtil.parseDateExpire(expireDate); @@ -1258,5 +1258,18 @@ public class IoCodeTempController extends BaseController { else return ResultVOUtils.error(500, "修改失败!"); } + @AuthRuleAnnotation("") + @PostMapping("warehouse/inout/checkTempCode") + public BaseResponse checkTempCode(@RequestBody IoCodeTempEntity codeTempEntity) { + + Boolean falg=codeTempService.checkTempCode(codeTempEntity); + if(!falg){ + return ResultVOUtils.error(999,"该产品已存在，请勿重复录入"); + } + + return ResultVOUtils.success(); + + } + } diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java index c77a3386e..7eacccda2 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java @@ -45,4 +45,6 @@ public interface IoCodeTempService { boolean isExit(String orderId); Integer selectExitCount(String orderId, String bacthNo, Long relId, String supId); + + Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java index 5a787ae76..203a38007 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java @@ -113,4 +113,21 @@ public class IoCodeTempServiceImpl implements IoCodeTempService { return ioCodeTempDao.selectExitCount(filterCodeRequest); } + @Override + public Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity) { + + QueryWrapper ew=new QueryWrapper<>(); + ew.eq("code",ioCodeTempEntity.getCode()); + ew.eq("corpOrderId",ioCodeTempEntity.getCorpOrderId()); + ew.eq("batchNo",ioCodeTempEntity.getBatchNo()); + ew.eq("produceDate",ioCodeTempEntity.getProduceDate()); + ew.eq("expireDate",ioCodeTempEntity.getExpireDate()); + ew.eq("serialNo",ioCodeTempEntity.getSerialNo()); + Long count = ioCodeTempDao.selectCount(ew); + if(count>0){ + return false; + } + return true; + } + } From d1d99533cee5f1ab185ac5e6d6bd0313d20d545f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Wed, 19 Jul 2023 16:26:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/schemas/schema_v2.1.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index e1b3f5609..6b8e5226c 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -599,5 +599,6 @@ CREATE TABLE if not exists `io_destiny_process_detail` CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1); - +CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', + 'varchar(255) ', 1);