From b13e59285f6c1aee3ce3208c8664320cdb0580a7 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 31 Mar 2023 16:31:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=A0=A1=E9=AA=8C=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/inout/IoOrderDetailBizEntity.java | 5 ++- .../entity/inout/IoOrderDetailCodeEntity.java | 4 ++ .../service/inout/IoCheckInoutService.java | 37 +++++++++++++++---- .../mapper/system/SyncDataBustypeDao.xml | 13 ++----- src/main/resources/schemas/schema_v2.1.sql | 2 + 5 files changed, 44 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java index 00ddb573..b50b5d51 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java @@ -180,11 +180,14 @@ public class IoOrderDetailBizEntity { private String filePath; - @TableField(exist = false) private boolean checkSuccess; @TableField(exist = false) private int scanCount; + + @TableField(exist = false) + private String errMsg; + } diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java index f1c24b7b..56e83867 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java @@ -188,4 +188,8 @@ public class IoOrderDetailCodeEntity { @TableField(exist = false) private int orderCount; + @TableField(exist = false) + private String errMsg; + + } diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 2b0f97c2..42298942 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -45,8 +45,6 @@ public class IoCheckInoutService { @Resource IoOrderDetailResultService orderDetailResultService; @Resource - InvPreinOrderService invPreinOrderService; - @Resource InvPreinDetailService invPreinDetailService; @Resource IoGenInvService genInvService; @@ -304,6 +302,7 @@ public class IoCheckInoutService { String errMsg = ""; //正向校验 for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { + String msg = ""; for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) { if (!bizEntity.isCheckSuccess() && !codeEntity.isCheckSuccess() && checkId(bizEntity, codeEntity) == null && checkBatchNo(bizEntity, codeEntity) == null @@ -315,15 +314,23 @@ public class IoCheckInoutService { bizEntity.setCheckSuccess(true); bizEntity.setScanCount(codeEntity.getReCount()); codeEntity.setCheckSuccess(true); + } else { + bizEntity.setScanCount(codeEntity.getReCount()); + bizEntity.setCheckSuccess(false); + msg = "数量不匹配"; } break; } } + if (StrUtil.isEmpty(msg) && !bizEntity.isCheckSuccess()) { + msg = "三期不匹配"; + } + bizEntity.setErrMsg(msg); } for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { if (!bizEntity.isCheckSuccess()) { - errMsg = errMsg + bizEntity.getCoName() + ";"; + errMsg = errMsg + bizEntity.getCoName() + bizEntity.getErrMsg() + ";"; } } @@ -399,28 +406,36 @@ public class IoCheckInoutService { bizEntity.setCheckSuccess(false); } for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { + String msg = ""; for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) { if (!bizEntity.isCheckSuccess() && !codeEntity.isCheckSuccess() && checkId(bizEntity, codeEntity) == null && checkBatchNo(bizEntity, codeEntity) == null + && checkProductDate(bizEntity, codeEntity) == null + && checkExpireDate(bizEntity, codeEntity) == null ) { if (checkCount(bizEntity, codeEntity) == null) { + bizEntity.setCheckSuccess(true); codeEntity.setCheckSuccess(true); bizEntity.setScanCount(codeEntity.getReCount()); } else { + msg = "数量不匹配"; bizEntity.setScanCount(codeEntity.getReCount()); bizEntity.setCheckSuccess(false); } break; } } + if (StrUtil.isEmpty(msg) && !bizEntity.isCheckSuccess()) { + msg = "三期不匹配"; + } + bizEntity.setErrMsg(msg); } - for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { if (!bizEntity.isCheckSuccess()) { - errMsg = errMsg + bizEntity.getCoName() + ";"; + errMsg = errMsg + bizEntity.getCoName() + bizEntity.getErrMsg() + ";"; } } return errMsg; @@ -532,17 +547,21 @@ public class IoCheckInoutService { } for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) { + String msg = ""; for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { if (!bizEntity.isCheckSuccess() && !codeEntity.isCheckSuccess() && checkId(bizEntity, codeEntity) == null && checkBatchNo(bizEntity, codeEntity) == null + && checkProductDate(bizEntity, codeEntity) == null + && checkExpireDate(bizEntity, codeEntity) == null ) { - if (checkCount(bizEntity, codeEntity) == null) { + bizEntity.setCheckSuccess(true); codeEntity.setCheckSuccess(true); codeEntity.setOrderCount(bizEntity.getCount()); } else { + msg = "数量不匹配"; codeEntity.setCheckSuccess(false); codeEntity.setOrderCount(bizEntity.getCount()); } @@ -551,12 +570,16 @@ public class IoCheckInoutService { codeEntity.setCheckSuccess(false); } } + if (StrUtil.isEmpty(msg) && !codeEntity.isCheckSuccess()) { + msg = "三期不匹配"; + } + codeEntity.setErrMsg(msg); } String errMsg = ""; for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) { if (!codeEntity.isCheckSuccess()) { - errMsg = errMsg + codeEntity.getCoName() + ";"; + errMsg = errMsg + codeEntity.getCoName() + codeEntity.getErrMsg() + ";"; } } return errMsg; diff --git a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml index 494431b0..d1f41c21 100644 --- a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml @@ -2,8 +2,6 @@ - -