From d952a84673f12db2403ec735139421b92b1a2591 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 十月 2025 14:00:00 +0800
Subject: [PATCH] #
---
src/main/webapp/views/orderPakin/order.html | 6 +-
src/main/webapp/static/js/order/order.js | 44 +++++++++++++++++++++-
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 2
src/main/webapp/views/orderPakout/order.html | 6 +-
src/main/webapp/views/order/order.html | 7 ++-
5 files changed, 53 insertions(+), 12 deletions(-)
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 651a4e5..d0c21db 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -200,7 +200,7 @@
continue;
}
if (!orderDetl.getQty().equals(orderDetl.getAnfme())){
- settle = 99L;//浜屾鐢熸垚鍗曟嵁
+ settle = 98L;//浜屾鐢熸垚鍗曟嵁鍓嶇疆 鎵嬪姩鐢熸垚
}
String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getQty()));
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 6345ea7..6fd6cab 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -95,7 +95,9 @@
} else if (layEvent === 'del') {
doDel(data.id);
} else if (layEvent === 'complete') {
- doModify(data.id, data.orderNo, 4);
+ doModify(data.id, data.orderNo, 6);
+ } else if (layEvent === 'continueExecution') {
+ doModify99(data.id, data.orderNo, 99);
} else if (layEvent === 'look') {
var $a = $(obj.tr).find('a[lay-event="look"]');
var offset = $a.offset();
@@ -439,7 +441,45 @@
// 淇敼璁㈠崟鐘舵��
function doModify(orderId, orderNo, settle) {
- layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧锛�', {
+ layer.confirm('纭畾瑕佸交搴曠粨鏉熷崟鎹悧锛燂紙灏嗚浆涓哄巻鍙叉。妗堬級', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
+ layer.close(i);
+ layer.load(2);
+ console.log(orderId);
+ console.log(settle);
+ $.ajax({
+ url: baseUrl+"/order/update/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ id: orderId,
+ orderNo: orderNo,
+ settle: settle
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200){
+ if (insTbCount === 0) {
+ insTb.reload({page: {curr: 1}});
+ } else {
+ $(".layui-laypage-btn")[0].click();
+ }
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 淇敼璁㈠崟鐘舵��
+ function doModify99(orderId, orderNo, settle) {
+ layer.confirm('纭畾瑕佺户缁墽琛屽悧锛燂紙浼氬皢鏈墽琛屾暟閲忛噸鏂扮敓鎴愭墽琛屽崟鎹級', {
shade: .1,
skin: 'layui-layer-admin'
}, function (i) {
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 3e88192..04ab4c5 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -97,11 +97,12 @@
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
{{# if (d.settle == 0 || d.settle == 1) { }}
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
{{# } }}
- {{# if (d.settle == 2) { }}
- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
+ {{# if (d.settle == 98) { }}
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">褰诲簳瀹岀粨</a>
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="continueExecution">缁х画鎵ц</a>
{{# } }}
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
diff --git a/src/main/webapp/views/orderPakin/order.html b/src/main/webapp/views/orderPakin/order.html
index 22e7828..4e32b77 100644
--- a/src/main/webapp/views/orderPakin/order.html
+++ b/src/main/webapp/views/orderPakin/order.html
@@ -97,10 +97,10 @@
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
{{# if (d.settle == 0 || d.settle == 1) { }}
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>-->
{{# } }}
- {{# if (d.settle == 2) { }}
+ {{# if (d.settle == 0 || d.settle == 1 || d.settle == 2) { }}
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
{{# } }}
</script>
diff --git a/src/main/webapp/views/orderPakout/order.html b/src/main/webapp/views/orderPakout/order.html
index ef12f3e..6c353f3 100644
--- a/src/main/webapp/views/orderPakout/order.html
+++ b/src/main/webapp/views/orderPakout/order.html
@@ -97,10 +97,10 @@
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
{{# if (d.settle == 0 || d.settle == 1) { }}
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>-->
{{# } }}
- {{# if (d.settle == 2) { }}
+ {{# if (d.settle == 0 || d.settle == 1 || d.settle == 2) { }}
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
{{# } }}
</script>
--
Gitblit v1.9.1