From 7d4f7982cbfbaee0c84800ab613cb01b2798fb88 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 23 五月 2025 09:39:25 +0800
Subject: [PATCH] #字段更新
---
src/main/webapp/views/locDetl/locDetl.html | 2 +-
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 2 +-
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 2 +-
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 3 ++-
src/main/webapp/static/js/saas/locDetl.js | 3 ++-
src/main/webapp/views/pakStore/locDetlQuery.html | 2 +-
src/main/webapp/views/report/viewWorkIn.html | 2 +-
src/main/webapp/static/js/locDetl/locDetl.js | 2 +-
src/main/webapp/views/report/viewWorkOut.html | 2 +-
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 2 +-
src/main/webapp/static/js/order/order.js | 7 +++++--
src/main/webapp/static/js/common.js | 11 ++++++++---
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 2 +-
13 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index c98e298..b4ddf91 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -245,7 +245,7 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
- callApiLogSaveOrder(order,kingDeeUtilType, "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�!璁㈠崟鍙凤細"+order.getOrderNo(), false);
+ callApiLogSaveOrder(order,kingDeeUtilType, "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�!鍚堝悓鍙凤細"+order.getOrderNo(), false);
// throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index a921432..df8f55f 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -220,7 +220,10 @@
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
,{field: 'proType', align: 'center',title: '灞炴��', hide: false}
- ,{field: 'temp1', align: 'center',title: '鍚堝悓鍙�', hide: false}
+ ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false}
+ ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: false}
+
+
]
var detlCols = [
@@ -230,7 +233,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
,{field: 'batch', align: 'center',title: '鎵规', hide:true,sort:true}
- ,{field: 'outOrderNo', align: 'center',title: '璁㈠崟鍙�', sort:true}
+ ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', sort:true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
@@ -259,6 +262,8 @@
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
,{field: 'proType', align: 'center',title: '灞炴��', hide: false}
- ,{field: 'temp1', align: 'center',title: '鍚堝悓鍙�', hide: false}
+ ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false}
+ ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: false}
+
]
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 1d79c03..a6ded71 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -9,7 +9,7 @@
,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200,hide:true, sort:true}
- ,{field: 'outOrderNo', align: 'center',title: '璁㈠崟鍙�'}
+ ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index a0dbb2e..a769f98 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -37,7 +37,7 @@
{field: 'specs', title:'浜у搧瑙勬牸', align: 'center'},
{field: 'maktx', title:'浜у搧鍚嶇О', align: 'center'},
{field: 'pgNo', title:'娲惧伐鍗曞彿', align: 'center'},
- {field: 'outOrderNo', title:'璁㈠崟鍙�', align: 'center'},
+ {field: 'outOrderNo', title:'鍚堝悓鍙�', align: 'center'},
{field: 'batch', title:'鎵规', align: 'center'},
{field: 'proType', title:'灞炴��', align: 'center'},
{field: 'color', title:'棰滆壊', align: 'center'},
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index dd61cdf..9a72262 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -35,7 +35,8 @@
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
,{field: 'proType', align: 'center',title: '灞炴��', hide: false}
- ,{field: 'temp1', align: 'center',title: '鍚堝悓鍙�', hide: false}
+ ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false}
+ ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: false}
];
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 46246c8..0e195e0 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -127,7 +127,8 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150},
{field: 'batch', title: '鎵瑰彿'},
{field: 'proType', title: '灞炴��'},
- {field: 'temp1', title: '鍚堝悓鍙�'},
+ {field: 'outOrderNo', title: '鍚堝悓鍙�'},
+ {field: 'temp1',title: '鍚嶇О鎬荤О'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
@@ -242,7 +243,9 @@
{field: 'batch', title: '鎵瑰彿', edit: true},
{field: 'proType', title: '灞炴��', edit: true},
{field: 'model', title: '浠ｇ爜', edit: true},
- {field: 'threeCode', title: '鍚堝悓鍙�', edit: true},
+ {field: 'outOrderNo', title: '鍚堝悓鍙�', edit: true},
+
+ {field: 'threeCode', title: '绗笁鏂逛唬鐮�'},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index 6b90bc9..15f5c7b 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -35,7 +35,8 @@
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
,{field: 'proType', align: 'center',title: '灞炴��', hide: false}
- ,{field: 'temp1', align: 'center',title: '鍚堝悓鍙�', hide: false}
+ ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false}
+ ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: false}
];
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index a71d749..6911130 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -46,7 +46,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="out_order_no" placeholder="鎴愬搧璁㈠崟鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="out_order_no" placeholder="鍚堝悓鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index 2624494..9b4958d 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -42,7 +42,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="outOrderNo" placeholder="鎴愬搧璁㈠崟鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off">
</div>
</div>
<!-- <div class="layui-inline">-->
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 6be55da..1273217 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -100,7 +100,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="outOrderNo" placeholder="鎴愬搧璁㈠崟鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 164a345..c422c02 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -84,7 +84,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="outOrderNo" placeholder="鎴愬搧璁㈠崟鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 482532c..4aae5ec 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -61,7 +61,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="outOrderNo" placeholder="鎴愬搧璁㈠崟鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off">
</div>
</div>
<div id="data-search-btn" class="layui-btn-container layui-form-item">
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index df9f05b..652c5c5 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -61,7 +61,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="outOrderNo" placeholder="鎴愬搧璁㈠崟鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off">
</div>
</div>
<div id="data-search-btn" class="layui-btn-container layui-form-item">
--
Gitblit v1.9.1