From eea9c3e06de7b3559c6e1558ea276fd5e8646eb9 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 17 十月 2025 13:42:37 +0800
Subject: [PATCH] 1.所有序列码修改成批号
---
src/main/java/com/zy/asrs/entity/Pack.java | 2 +-
src/main/java/com/zy/asrs/entity/param/CombParam.java | 2 +-
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 2 +-
src/main/java/com/zy/asrs/utils/VersionUtils.java | 16 ++++++++--------
src/main/java/com/zy/common/model/TaskDto.java | 2 +-
src/main/webapp/static/js/order/outAll.js | 4 ++--
src/main/webapp/views/order/outAll.html | 4 ++--
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 2 +-
src/main/webapp/static/js/order/out.js | 4 ++--
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 2 +-
src/main/webapp/views/order/out.html | 4 ++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/entity/AdjDetl.java | 2 +-
14 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index 7d4c75a..67bccb3 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -147,7 +147,7 @@
// AdjDetl adjDetl = new AdjDetl(
// null, // 搴撲綅鍙穂闈炵┖]
// null, // 鐗╂枡缂栧彿[闈炵┖]
-// null, // 搴忓垪鐮�
+// null, // 鎵瑰彿
// null, // 鍘熺鏁�
// null, // 鍘熸暟閲�
// null, // 鍘熼噸閲�
diff --git a/src/main/java/com/zy/asrs/entity/Pack.java b/src/main/java/com/zy/asrs/entity/Pack.java
index c63e1f7..61b19a2 100644
--- a/src/main/java/com/zy/asrs/entity/Pack.java
+++ b/src/main/java/com/zy/asrs/entity/Pack.java
@@ -120,7 +120,7 @@
// Pack pack = new Pack(
// null, // 鏉＄爜[闈炵┖]
// null, // 鍟嗗搧缂栧彿
-// null, // 搴忓垪鐮�
+// null, // 鎵瑰彿
// null, // 璁㈠崟鐘舵��
// null, // 鐘舵��
// null, // 娣诲姞鏃堕棿
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 189d13e..00c3844 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -48,7 +48,7 @@
// 鐗╂枡缂栧彿
private String matnr;
- // 搴忓垪鐮�
+ // 鎵瑰彿
private String batch;
// 鐗╂枡鏁伴噺
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index 674ae15..28474fa 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -25,7 +25,7 @@
// 鐗╂枡缂栧彿
private String matnr;
- // 搴忓垪鐮�
+ // 鎵瑰彿
private String batch;
// 鐗╂枡鏁伴噺
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index 381d7c2..fda07cf 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -24,7 +24,7 @@
// 鍟嗗搧缂栧彿
private String matnr;
- // 搴忓垪鐮�
+ // 鎵瑰彿
private String batch;
// 鍙樻洿鏁伴噺
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index a467440..9ad991f 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -25,7 +25,7 @@
// 鍟嗗搧缂栧彿
private String matnr;
- // 搴忓垪鐮�
+ // 鎵瑰彿
private String batch;
// 鏁伴噺
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 00eb38c..b5c6c91 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -238,7 +238,7 @@
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
- waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
+ waitPakin.setBatch(detlDto.getBatch()); // 鎵瑰彿
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 5d8970a..be464fa 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -335,7 +335,7 @@
pack = new Pack(
param.getBarcode(), // 鏉＄爜[闈炵┖]
analyse.getMatnr(), // 鍟嗗搧缂栧彿
- analyse.getBarcode(), // 搴忓垪鐮�
+ analyse.getBarcode(), // 鎵瑰彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
now, // 娣诲姞鏃堕棿
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 09ef9c2..0b5745f 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -19,7 +19,7 @@
// wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
// wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿
// wrkDetl.setColor(matCode.getBarcode()); // 鏉＄爜
-// wrkDetl.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
+// wrkDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
// wrkDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
// wrkDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
// wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
@@ -34,7 +34,7 @@
// wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
// wrkDetl.setType(locDetl.getType()); // 鍨嬪彿
// wrkDetl.setColor(locDetl.getColor()); // 鏉＄爜
-// wrkDetl.setSupplier(locDetl.getSupplier()); // 搴忓垪鐮�
+// wrkDetl.setSupplier(locDetl.getSupplier()); // 鎵瑰彿
// wrkDetl.setWarehouse(locDetl.getWarehouse()); // 鍗曟嵁缂栧彿
// wrkDetl.setBrand(locDetl.getBrand()); // 鍝侀」鏁�
// wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
@@ -48,7 +48,7 @@
// locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
// locDetl.setType(matCode.getStr5()); // 鍨嬪彿
// locDetl.setColor(matCode.getBarcode()); // 鏉＄爜
-// locDetl.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
+// locDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
// locDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
// locDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
// locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
@@ -63,7 +63,7 @@
// locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
// locDetl.setType(wrkDetl.getType()); // 鍨嬪彿
// locDetl.setColor(wrkDetl.getColor()); // 鏉＄爜
-// locDetl.setSupplier(wrkDetl.getSupplier()); // 搴忓垪鐮�
+// locDetl.setSupplier(wrkDetl.getSupplier()); // 鎵瑰彿
// locDetl.setWarehouse(wrkDetl.getWarehouse()); // 鍗曟嵁缂栧彿
// locDetl.setBrand(wrkDetl.getBrand()); // 鍝侀」鏁�
// locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
@@ -77,7 +77,7 @@
// waitPakIn.setLgnum(matCode.getStr2()); // 瑙勬牸
// waitPakIn.setType(matCode.getStr5()); // 鍨嬪彿
// waitPakIn.setColor(matCode.getBarcode()); // 鏉＄爜
-// waitPakIn.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
+// waitPakIn.setSupplier(matCode.getStr6()); // 鎵瑰彿
// waitPakIn.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
// waitPakIn.setBrand(matCode.getStr3()); // 鍝侀」鏁�
// waitPakIn.setAltme(matCode.getStr1()); // 鍗曚綅
@@ -88,7 +88,7 @@
// orderDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
// orderDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
// orderDetl.setSpecs(matCode.getStr2()); // 瑙勬牸
-// orderDetl.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
+// orderDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
// }
//
// public static void setWaitPakIn(WaitPakin waitPakIn, OrderDetl orderDetl) {
@@ -98,7 +98,7 @@
// waitPakIn.setOrderNo(orderDetl.getOrderNo());
// waitPakIn.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
// waitPakIn.setType(orderDetl.getModel()); // 鍨嬪彿
-// waitPakIn.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
+// waitPakIn.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
// waitPakIn.setAltme(orderDetl.getUnit()); // 鍗曚綅
// }
//
@@ -109,7 +109,7 @@
// wrkDetl.setOrderNo(orderDetl.getOrderNo());
// wrkDetl.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
// wrkDetl.setType(orderDetl.getModel()); // 鍨嬪彿
-// wrkDetl.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
+// wrkDetl.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
// wrkDetl.setAltme(orderDetl.getUnit()); // 鍗曚綅
// }
public static void setPakin(Pakin pakin, Mat mat) {
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index f82e82e..693bee0 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -68,7 +68,7 @@
}
public boolean isAll(){
- // 姹囨�讳笉鑰冭檻搴忓垪鐮�
+ // 姹囨�讳笉鑰冭檻鎵瑰彿
List<DetlDto> detlDtos = new ArrayList<>();
for (LocDto locDto : this.getLocDtos()) {
DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index fd261b8..f1dab16 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -34,7 +34,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
@@ -160,7 +160,7 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '搴忓垪鐮�', align: 'center'},
+ {field: 'batch', title: '鎵瑰彿', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
diff --git a/src/main/webapp/static/js/order/outAll.js b/src/main/webapp/static/js/order/outAll.js
index 98a3634..d3db620 100644
--- a/src/main/webapp/static/js/order/outAll.js
+++ b/src/main/webapp/static/js/order/outAll.js
@@ -34,7 +34,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
@@ -160,7 +160,7 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '搴忓垪鐮�', align: 'center'},
+ {field: 'batch', title: '鎵瑰彿', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 9a59d23..d2cc5d1 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -107,9 +107,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">搴忓垪鐮�:</label>
+ <label class="layui-form-label">鎵瑰彿:</label>
<div class="layui-input-inline">
- <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/>
+ <input name="batch" class="layui-input" placeholder="鎵瑰彿"/>
</div>
</div>
<!-- <div class="layui-inline">-->
diff --git a/src/main/webapp/views/order/outAll.html b/src/main/webapp/views/order/outAll.html
index 6def93f..3e11c1d 100644
--- a/src/main/webapp/views/order/outAll.html
+++ b/src/main/webapp/views/order/outAll.html
@@ -107,9 +107,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">搴忓垪鐮�:</label>
+ <label class="layui-form-label">鎵瑰彿:</label>
<div class="layui-input-inline">
- <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/>
+ <input name="batch" class="layui-input" placeholder="鎵瑰彿"/>
</div>
</div>
<!-- <div class="layui-inline">-->
--
Gitblit v1.9.1