From 5153b9e9037df46c9645954bc6ae17a7bfcd5f73 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 21 Feb 2023 10:19:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/st/instor/rest/CheckController.java | 7 +++++++ .../nl/wms/st/instor/service/CheckService.java | 5 +++++ .../st/instor/service/impl/CheckServiceImpl.java | 11 +++++++++++ .../src/views/wms/st/inStor/check/check.js | 9 ++++++++- .../src/views/wms/st/inStor/check/index.vue | 16 +++++++++++----- 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java index e417f3372..f1151077c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java @@ -153,4 +153,11 @@ public class CheckController { checkService.disposeConfirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @PostMapping("/confirmBtn") + @Log("强制确认") + @ApiOperation("强制确认") + public ResponseEntity confirmBtn(@RequestBody JSONObject whereJson) { + checkService.confirmBtn(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java index 838c5994a..0dbb46722 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java @@ -119,4 +119,9 @@ public interface CheckService { * 新增全部在库木箱 */ void allInsert(JSONObject whereJson); + + /** + * 强制确认 + */ + void confirmBtn(JSONObject whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java index 5ddcab2b4..56817ed26 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java @@ -808,4 +808,15 @@ public class CheckServiceImpl implements CheckService { dtlTab.insert(jsonDtl); } } + + @Override + @Transactional(rollbackFor = Exception.class) + public void confirmBtn(JSONObject whereJson) { + WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_CheckMst"); + + JSONObject jsonMst = mstTab.query("check_id = '" + whereJson.getString("check_id") + "'").uniqueResult(0); + jsonMst.put("status", "99"); + + mstTab.update(jsonMst); + } } diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/check/check.js b/lms/nladmin-ui/src/views/wms/st/inStor/check/check.js index 9797f4db2..4c27bf6d3 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/check/check.js +++ b/lms/nladmin-ui/src/views/wms/st/inStor/check/check.js @@ -115,4 +115,11 @@ export function allInsert(data) { data }) } -export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1, disposeConfirm, allInsert } +export function confirmBtn(data) { + return request({ + url: '/api/check/confirmBtn', + method: 'post', + data + }) +} +export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1, disposeConfirm, allInsert, confirmBtn } diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue b/lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue index 279cd3446..2773abded 100644 --- a/lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue @@ -130,17 +130,17 @@ > 异常处理 - + 强制确认 + ( + this.crud.toQuery() + )) } } } From 7c97a94a82a6606bdf10c4d25727480895402f70 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 21 Feb 2023 11:02:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 318254ebb..e2970f9af 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -580,7 +580,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { data.put("box_length", box_length); data.put("box_width", box_width); data.put("box_high", box_high); - data.put("bundle_times", 2); Double box_length_value = Double.valueOf(box_length); if (box_length_value >= 772) { From 642cecc8a66bce662a160fc1cfadb74238944035 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 21 Feb 2023 14:49:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/acs/service/impl/AcsToWmsServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index e2970f9af..1be84a52b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -395,6 +395,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (ObjectUtil.isEmpty(sub_jo)) { throw new BadRequestException("未查询到该木箱对应的包装关系！"); } + + // 校验木箱长度类型 + double box_length = sub_jo.getDoubleValue("box_length"); + + if (522 <= box_length && box_length <= 614) { + device_code = device_code + "_1"; + } else if (672 <= box_length && box_length <= 814) { + device_code = device_code + "_2"; + } else { + device_code = device_code + "_3"; + } + String sale_order_name = sub_jo.getString("sale_order_name"); //查询是否存在可用的空位