From 10aef23d06cf1d12bc48273e7844328ddf0efcc8 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 13 一月 2026 12:30:31 +0800
Subject: [PATCH] no message
---
src/main/webapp/views/wrkMast/wrkMast.html | 7 +++
src/main/webapp/static/js/orderPakout/out.js | 11 ++++-
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 6 ++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 13 ++++--
src/main/java/com/zy/asrs/entity/WrkMast.java | 1
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 17 --------
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 2
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 14 +++++++
src/main/webapp/static/js/wrkMast/wrkMast.js | 10 ++++-
src/main/webapp/static/js/common.js | 4 +-
src/main/webapp/static/js/orderPakin/order.js | 7 ++-
11 files changed, 58 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 7bf629d..142a023 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -29,6 +29,7 @@
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
@TableField("wrk_no")
+ @TableId(value = "wrk_no", type = IdType.AUTO)
private Integer wrkNo;
@ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
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 caa2446..0c6077d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1131,23 +1131,6 @@
throw new CoolException("鏁版嵁閿欒,缁勬嫋妗ｅ凡涓嶅瓨鍦�!!");
}
- //淇敼鍗曟嵁鎵ц鏁伴噺
- waitPakins.forEach(waitPakin -> {
- OrderDetlPakin detlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
- .eq("matnr", waitPakin.getMatnr())
- .eq("barcode", waitPakin.getZpallet())
- .eq("order_no", waitPakin.getOrderNo()));
- if (Objects.isNull(detlPakin)) {
- throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
- }
- detlPakin.setWorkQty(waitPakin.getAnfme());
-
- if (!orderDetlPakinService.updateById(detlPakin)) {
- throw new CoolException("鍗曟嵁鏄庣粏淇敼澶辫触锛侊紒");
- }
- });
-
-
generateCrnInTask(waitPakins, param.getStation(), param.getLocType1(), userId);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index eebde6d..9dfce08 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -510,10 +510,10 @@
OrderInAndOutUtil.updateOrder(Boolean.FALSE, orderDetl.getOrderId(), 2L, userId);
}
- //TODO 鍒ゆ柇璁惧鍙凤紝鐢熸垚鍏ュ簱浠诲姟銆傛病鏈夋満鍙板彿锛岃鏄庢槸鏅�氬嚭搴撲换鍔�
- if (!Objects.isNull(deviceNo)) {
- genInStock(wrkMast, deviceNo, userId);
- }
+// //TODO 鍒ゆ柇璁惧鍙凤紝鐢熸垚鍏ュ簱浠诲姟銆傛病鏈夋満鍙板彿锛岃鏄庢槸鏅�氬嚭搴撲换鍔�
+// if (!Objects.isNull(deviceNo)) {
+// genInStock(wrkMast, deviceNo, userId);
+// }
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(taskDto.getLocNo());
if (locMast.getLocSts().equals("F")) {
@@ -1304,7 +1304,10 @@
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
wrkMast.setStaNo(staNo + ""); // 鐩爣绔�
- wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
+ //鍒ゆ柇鏄惁涓洪鏂欏嚭搴�
+ if (Objects.isNull(wrkMast.getWrkCode())) {
+ wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
+ }
wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
wrkMast.setModiTime(now);
wrkMast.setModiUser(userId);
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index e44b3b9..7ee12c0 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -65,7 +65,7 @@
* @author Ryan
* @date 2026/1/5 14:07
*/
- @Scheduled(cron = "0/30 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderIssued() {
// String erpReport = Parameter.get().getErpReport();
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 6729460..aaa41ca 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -180,6 +180,20 @@
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("缁勬墭妗ｄ繚瀛樺け璐ワ紒锛�");
}
+
+ //淇敼鍗曟嵁鎵ц鏁伴噺
+ OrderDetlPakin detlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
+ .eq("matnr", waitPakin.getMatnr())
+ .eq("barcode", waitPakin.getZpallet())
+ .eq("order_no", waitPakin.getOrderNo()));
+ if (Objects.isNull(detlPakin)) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ detlPakin.setWorkQty(waitPakin.getAnfme() * matnr.getVolume());
+
+ if (!orderDetlPakinService.updateById(detlPakin)) {
+ throw new CoolException("鍗曟嵁鏄庣粏淇敼澶辫触锛侊紒");
+ }
});
} else {
throw new CoolException("鍏ュ簱鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛侊紒");
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index effa1fd..a8c966e 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -559,7 +559,11 @@
break;
}
// 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(15L);
+ if (!Objects.isNull(wrkMast.getWrkCode())) {
+ //棰嗘枡鍑哄簱浠诲姟锛屼笉淇敼
+ } else {
+ wrkMast.setWrkSts(15L);
+ }
wrkMast.setModiTime(now);
if (!wrkMastService.updateById(wrkMast)) {
// exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 3b135cb..b81003f 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -276,7 +276,7 @@
return num.toFixed(2);
}
}
- , {field: 'zpallet', align: 'center', title: '鎵樼洏鏉＄爜', hide: false}
+ , {field: 'zpallet', align: 'center', title: 'SN', hide: false}
, {field: 'specs', align: 'center', title: '瑙勬牸', hide: false}
, {
field: 'safeQty', align: 'center', title: '褰掗浂闃�鍊�', hide: true, templet: function (d) {
@@ -305,7 +305,7 @@
, {field: 'price', align: 'center', title: '鍗曚环', hide: true}
, {field: 'sku', align: 'center', title: 'sku', hide: true}
, {field: 'units', align: 'center', title: '鍗曚綅閲�', hide: true}
- , {field: 'barcode', align: 'center', title: 'SN', hide: false}
+ , {field: 'barcode', align: 'center', title: 'SN', hide: true}
, {field: 'origin', align: 'center', title: '浜у湴', hide: true}
, {field: 'manu', align: 'center', title: '鍘傚', hide: true}
, {field: 'manuDate', align: 'center', title: '鐢熶骇鏃ユ湡', hide: true}
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index 50444da..d08e291 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -129,9 +129,10 @@
{ field: 'batch', title: '鎵瑰彿' },
{ field: 'specs', title: '瑙勬牸' },
{ field: 'unit', title: '鍗曚綅' },
- { field: 'anfme', title: '寰呭畬缁撴暟閲�' },
- { field: 'qty', title: '寰呬笂鎶ユ暟閲�', style: 'font-weight: bold' },
- { field: 'workQty', title: '宸蹭笂鎶ユ暟閲�' }
+ { field: 'anfme', title: '鏁伴噺' },
+ { field: 'workQty', title: '鎵ц涓�' },
+ { field: 'qty', title: '宸插畬鎴�', style: 'font-weight: bold' }
+
// {field: 'unit', title: '鍗曚綅'},
// {
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index 4f8b535..87b973e 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -159,7 +159,7 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'standby1', title: '鏈哄彴鍙�', align: 'center'},
+ // {field: 'standby1', title: '鏈哄彴鍙�', align: 'center'},
{
field: 'anfme',
title: '鏁伴噺',
@@ -183,7 +183,14 @@
templet: '#locFrozenLoc'
},
{
- field: 'staNos',
+ field: 'standby1',
+ align: 'center',
+ title: '鏈哄彴',
+ merge: ['deviceNo'],
+ templet: '#tbBasicTbStaNos'
+ },
+ {
+ field: 'locNo',
align: 'center',
title: '鍑哄簱绔�',
merge: ['locNo'],
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index d0e9883..fc14496 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -37,7 +37,7 @@
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:300}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:350}
]],
request: {
pageName: 'curr',
@@ -269,7 +269,6 @@
layer.msg(data.wrkNo + res.msg);
})
layer.closeAll();
-
});
break;
// 鍙栨秷
@@ -292,6 +291,13 @@
});
}
break;
+ //绌烘澘鍥炲簱
+ case 'empty':
+ layer.confirm('绌烘澘鍏ュ簱璇ョ瑪宸ヤ綔妗�', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function () {
+ http.post()
+ })
+ layer.closeAll();
+ break;
// 鎷ｆ枡鍏ュ簱
case 'pick':
layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 6fc48be..8128480 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -123,8 +123,13 @@
<a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢鐘舵��</a>
+ {{#if (d.ioType === 101) { }}
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">绌�</a>
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">浣�</a>
+ {{# } }}
{{#if (d.ioType === 103) { }}
- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鎷�</a>
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">绌�</a>
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">浣�</a>
{{# } }}
{{#if (d.ioType === 107) { }}
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鐩�</a>
--
Gitblit v1.9.1