From 0d2db0eb60792766a9e24ea86a8d429a3751c978 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 18 Aug 2024 11:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=A0=A1=E9=AA=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IoCollectOrderCodeManController.java | 112 +++++++++++++----- .../inout/IoCodeTempController.java | 2 +- .../glxp/api/req/inout/AddTagCodeReqeust.java | 1 + 3 files changed, 82 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index 6c31b89ea..6f5254e62 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -159,22 +159,47 @@ public class IoCollectOrderCodeManController extends BaseController { collectOrderBiz = vailByBatchNo(udiRelevanceResponses, collectOrderBizs, udiEntity); - if (IntUtil.value(workPlace.getCheckInsert()) == 1) { - //信息提醒 - if (collectOrderBiz == null) { - collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity); - collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); - } else { - collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1); - } - } else { - //禁止录入 - if (collectOrderBiz == null) - return ResultVOUtils.error(500, "非此单据追溯码！"); - else { - collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1); - } + switch (workPlace.getCheckInsert()) { + case 1: //插入 + if (collectOrderBiz == null) { + collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity); + collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); + } else { + collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1); + } + break; + case 2: //不插入 + if (collectOrderBiz == null) + return ResultVOUtils.error(500, "非此单据追溯码！"); + int count = collectOrderBiz.getScanCount() + 1; + if (count > collectOrderBiz.getCount()) { + return ResultVOUtils.error(500, "扫码数量超出！"); + } + collectOrderBiz.setScanCount(count); + + break; + case 3: //提醒是否插入 + + if (!IntUtil.value(addTagCodeReqeust.getInsert())) { + if (collectOrderBiz == null) + return ResultVOUtils.error(502, "非此单据追溯码！"); + int count1 = collectOrderBiz.getScanCount() + 1; + if (count1 > collectOrderBiz.getCount()) { + return ResultVOUtils.error(502, "扫码数量超出！"); + } + } else { + if (collectOrderBiz == null) { + collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity); + collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); + } else { + collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1); + } + } + + break; + default: + break; } @@ -190,23 +215,46 @@ public class IoCollectOrderCodeManController extends BaseController { //按单不校验三期 collectOrderBiz = vailNoBatchNo(udiRelevanceResponses, collectOrderBizs); - //先不管 - if (IntUtil.value(workPlace.getCheckInsert()) == 1) { - //信息提醒 - if (collectOrderBiz == null) { - collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity); - collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); - } else { - collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1); - } - - } else { - //禁止录入 - if (collectOrderBiz == null) - return ResultVOUtils.error(500, "非此单据追溯码！"); - else { - collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1); - } + switch (workPlace.getCheckInsert()) { + case 1: //插入 + if (collectOrderBiz == null) { + collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity); + collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); + } else { + collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1); + } + break; + case 2: //不插入 + if (collectOrderBiz == null) + return ResultVOUtils.error(500, "非此单据追溯码！"); + int count = collectOrderBiz.getScanCount() + 1; + if (count > collectOrderBiz.getCount()) { + return ResultVOUtils.error(500, "扫码数量超出！"); + } + collectOrderBiz.setScanCount(count); + + break; + case 3: //提醒是否插入 + + if (!IntUtil.value(addTagCodeReqeust.getInsert())) { + if (collectOrderBiz == null) + return ResultVOUtils.error(502, "非此单据追溯码！"); + int count1 = collectOrderBiz.getScanCount() + 1; + if (count1 > collectOrderBiz.getCount()) { + return ResultVOUtils.error(502, "扫码数量超出！"); + } + } else { + if (collectOrderBiz == null) { + collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity); + collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); + } else { + collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1); + } + } + + break; + default: + break; } } collectOrderBizService.updateById(collectOrderBiz); 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 4a3a8aad8..6fe3e9584 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -293,7 +293,7 @@ public class IoCodeTempController extends BaseController { return baseResponse; } } - BaseResponse baseResponse = ResultVOUtils.error(502, "校验未完成"); + BaseResponse baseResponse = ResultVOUtils.error(502, "校验未完成,缺少" + lostMsg.substring(1)); udiEntity.setCode(code); baseResponse.setData(udiEntity); return baseResponse; diff --git a/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java b/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java index 859a9e2ca..f85511a0b 100644 --- a/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java +++ b/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java @@ -23,6 +23,7 @@ public class AddTagCodeReqeust { private String workPlaceCode; private String fromCorp; private String invCode; + private Boolean insert; }