From a7716ef7324235ae656c7cfab0be212b245da45d Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 21 一月 2026 10:59:13 +0800
Subject: [PATCH] 组托档添格层编码
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 11 ++++++-----
src/main/java/com/zy/asrs/controller/MobileController.java | 4 ++--
src/main/webapp/static/js/common.js | 10 +++++-----
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 1ca86a6..9184d71 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -327,14 +327,14 @@
return R.ok().add(combParams);
}
- @ManagerAuth(memo = "缁勬墭")
+ @ManagerAuth(memo = "缂撳啿搴撳叆搴撶粍鎵�")
@RequestMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam) {
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
- @ManagerAuth(memo = "缂撳啿搴撳叆搴撶粍鎵�")
+ @ManagerAuth(memo = "缁勬墭")
@RequestMapping("/cache/comb/auth")
public R onlineComb(@RequestBody CombParam combParam) {
if (Objects.isNull(combParam)) {
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index b07baec..e32396e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -605,9 +605,6 @@
if (Objects.isNull(container)) {
throw new CoolException("鏁版嵁閿欒锛氬鍣ㄧ爜涓嶅瓨鍦紒锛�");
}
- // if (param.getBarcode().length() != 8) {
- // throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
- // }
if (Objects.isNull(param.getType())) {
param.setType("0");
@@ -689,7 +686,10 @@
OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
.eq("order_id", order.getId())
.eq("matnr", elem.getMatnr()));
-
+ if (Objects.isNull(elem.getBoxType1())) {
+ throw new CoolException("鏍煎眰缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ detls.setBoxType1(elem.getBoxType1());
if (Objects.isNull(detls)) {
throw new CoolException("鏁版嵁閿欒锛氬崟鎹槑缁嗕笉瀛樺湪锛侊紒");
}
@@ -699,7 +699,7 @@
}
OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(),
elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
- elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
+ "1", elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
DetlDto detlDto = new DetlDto(order.getOrderNo(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(),
elem.getStandby2(), elem.getStandby3(),
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(),
@@ -762,6 +762,7 @@
waitPakin.setThreeCode(detlDto.getThreeCode());
waitPakin.setSuppCode(detlDto.getStandby1());
waitPakin.setStandby1(detlDto.getStandby1());
+ waitPakin.setBoxType1(detlDto.getBoxType1());
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 435c61c..cdb4a21 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -244,16 +244,16 @@
]
var detlCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true, width: 120}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true, width: 180}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false, width: 150}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: false}
,{field: 'threeCode', align: 'center',title: 'BS Code', hide: false}
,{field: 'tag$', align: 'center',title: '闆朵欢绫诲瀷', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
- ,{field: 'boxType1', align: 'center',title: '鏍煎眰缂栫爜', hide: false}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false, width: 120}
+ ,{field: 'boxType1', align: 'center',title: '鏍煎眰缂栫爜', hide: false, width: 130}
,{field: 'length', align: 'center',title: '閲嶉噺', hide: false}
,{field: 'volume', align: 'center',title: '灏哄', hide: false}
,{field: 'modiTime', align: 'center',title: '鏇存柊鏃堕棿', hide: false}
--
Gitblit v1.9.1