From 1ec0f01384f5019aec98e0b8ced7c28c544a94e0 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 11 五月 2026 19:30:26 +0800
Subject: [PATCH] #MES接口对接
---
src/main/webapp/static/js/locRule/locRule.js | 2 +-
src/main/webapp/static/js/orderPakout/out.js | 2 +-
src/main/webapp/static/js/matTurn/matTurn.js | 2 +-
src/main/webapp/views/matTurn/turnOverQuery.html | 2 +-
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 4 ++--
src/main/webapp/static/js/common.js | 16 ++++++++--------
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 6f4008b..5989ef9 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -87,8 +87,8 @@
if (issued <= 0.0D) {
continue;
}
- List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, detl.getMatnr(), detl.getBatch() != ""?detl.getBatch():"R002",
- detl.getBrand(), detl.getStandby1(), detl.getStandby2(), detl.getStandby3(), detl.getBoxType1() !=""?detl.getBoxType1():"R002", detl.getBoxType2(), detl.getBoxType3());
+ List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, detl.getMatnr(), detl.getBatch(),
+ detl.getBrand(), detl.getStandby1(), detl.getStandby2(), detl.getStandby3(), detl.getBoxType1(), detl.getBoxType2(), detl.getBoxType3());
for (LocDetl locDetl : locDetls) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()).eq("loc_sts", "F"));
if (locMast != null) {
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 9455563..32d36fa 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -185,8 +185,8 @@
// {field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
, {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', width: 200}
- , {field: 'specs', align: 'center', title: '瑙勬牸'}
- , {field: 'model', align: 'center', title: '鍨嬪彿', hide: false}
+ , {field: 'specs', align: 'center', title: '搴撲綅绫诲瀷'}
+ , {field: 'model', align: 'center', title: '鍨嬪彿', hide: true}
, {field: 'color', align: 'center', title: '棰滆壊', hide: true}
, {field: 'brand', align: 'center', title: '鍝佺墝', hide: false}
, {field: 'upQty', align: 'center', title: '缁勬墭涓婇檺', hide: true}
@@ -242,7 +242,7 @@
{field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort: true}
, {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort: true}
, {field: 'anfme', align: 'center', title: '鏁伴噺', hide: false}
- , {field: 'specs', align: 'center', title: '瑙勬牸', hide: false}
+ , {field: 'specs', align: 'center', title: '搴撲綅绫诲瀷', hide: false}
, {field: 'model', align: 'center', title: '浠ｇ爜', hide: true}
, {field: 'color', align: 'center', title: '棰滆壊', hide: true}
, {field: 'brand', align: 'center', title: '鍝佺墝', hide: true}
@@ -265,7 +265,7 @@
{field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿', sort: true, width: 160}
, {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О', sort: true, width: 120}
, {field: 'orderNo', align: 'center', title: '鍗曟嵁缂栧彿', hide: false, width: 120}
- , {field: 'batch', align: 'center', title: '鎵规', sort: false}
+ , {field: 'batch', align: 'center', title: '鎵规', sort: true,hide:true}
, {
field: 'anfme', align: 'center', title: '鏁伴噺', hide: false, templet: function (d) {
var raw = d.anfme;
@@ -300,7 +300,7 @@
}
, {field: 'weight', align: 'center', title: '閲嶉噺锛堝叕鏂わ級', hide: false, width: 120}
, {field: 'zpallet', align: 'center', title: 'SN', hide: false}
- , {field: 'specs', align: 'center', title: '瑙勬牸', hide: false}
+ , {field: 'specs', align: 'center', title: '搴撲綅绫诲瀷', hide: false,sort:true}
, {
field: 'safeQty', align: 'center', title: '褰掗浂闃堝��', hide: true, templet: function (d) {
var raw = d.safeQty;
@@ -322,9 +322,9 @@
}
}
, {field: 'color', align: 'center', title: '棰滆壊', hide: true}
- , {field: 'brand', align: 'center', title: '鍝佺墝', hide: false}
- , {field: 'model', align: 'center', title: '鍨嬪彿', hide: false}
- , {field: 'unit', align: 'center', title: '鍗曚綅', hide: false}
+ , {field: 'brand', align: 'center', title: '鍝佺墝', hide: true}
+ , {field: 'model', align: 'center', title: '鍨嬪彿', hide: true}
+ , {field: 'unit', align: 'center', title: '鍗曚綅', hide: true}
, {field: 'price', align: 'center', title: '鍗曚环', hide: true}
, {field: 'sku', align: 'center', title: 'sku', hide: true}
, {field: 'units', align: 'center', title: '鍗曚綅閲�', hide: true}
diff --git a/src/main/webapp/static/js/locRule/locRule.js b/src/main/webapp/static/js/locRule/locRule.js
index 37b0dfc..4c1b24f 100644
--- a/src/main/webapp/static/js/locRule/locRule.js
+++ b/src/main/webapp/static/js/locRule/locRule.js
@@ -24,7 +24,7 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
, {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'}
- , {field: 'specs', align: 'center', title: '瑙勬牸'}
+ , {field: 'specs', align: 'center', title: '搴撲綅绫诲瀷'}
, {field: 'model', align: 'center', title: '鍨嬪彿'}
, {field: 'cstmr', align: 'center', title: '瀹㈡埛'}
, {field: 'batch', align: 'center', title: '鎵瑰彿'}
diff --git a/src/main/webapp/static/js/matTurn/matTurn.js b/src/main/webapp/static/js/matTurn/matTurn.js
index 906f369..40a25cf 100644
--- a/src/main/webapp/static/js/matTurn/matTurn.js
+++ b/src/main/webapp/static/js/matTurn/matTurn.js
@@ -11,7 +11,7 @@
style: 'color: blue;font-weight: bold'
}
, {field: 'maktx', align: 'center', title: '鍝佸悕'}
- , {field: 'specs', align: 'center', title: '鍝佸悕'}
+ , {field: 'specs', align: 'center', title: '搴撲綅绫诲瀷'}
];
}
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index b30a32f..65cae7a 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -35,7 +35,7 @@
, {field: 'matnr', align: 'center', title: '鍟嗗搧缂栫爜', width: 160}
, {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О', width: 200}
, {field: 'standby1', align: 'center', title: '鏈哄彴鍙�'}
- , {field: 'specs', align: 'center', title: '瑙勬牸'}
+ , {field: 'specs', align: 'center', title: '搴撲綅绫诲瀷'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
, {field: 'enableQty', align: 'center', title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
diff --git a/src/main/webapp/views/matTurn/turnOverQuery.html b/src/main/webapp/views/matTurn/turnOverQuery.html
index 2ad1a5a..e0e5229 100644
--- a/src/main/webapp/views/matTurn/turnOverQuery.html
+++ b/src/main/webapp/views/matTurn/turnOverQuery.html
@@ -87,7 +87,7 @@
{type: 'checkbox'},
{field: 'matnr', align: 'center', title: '鍝佸彿'}
, {field: 'maktx', align: 'center', title: '鍝佸悕'}
- , {field: 'specs', align: 'center', title: '瑙勬牸'}
+ , {field: 'specs', align: 'center', title: '搴撲綅绫诲瀷'}
];
}
--
Gitblit v1.9.1