From 249e5581656200f6d8a86898fb5bd3b2af51f364 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 08 十二月 2022 13:08:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 346299c..7f0bd37 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -15,9 +15,9 @@
// wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
// wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
// wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-// wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿
+// 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()); // 鍗曚綅
@@ -30,9 +30,9 @@
// wrkDetl.setBatch(locDetl.getBatch());
// wrkDetl.setOrderNo(locDetl.getOrderNo());
// wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
-// wrkDetl.setType(locDetl.getType()); // 鍨嬪彿
+// 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()); // 鍗曚綅
@@ -44,9 +44,9 @@
// locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
// locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
// locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-// locDetl.setType(matCode.getStr5()); // 鍨嬪彿
+// 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()); // 鍗曚綅
@@ -59,9 +59,9 @@
// locDetl.setBatch(wrkDetl.getBatch());
// locDetl.setOrderNo(wrkDetl.getOrderNo());
// locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
-// locDetl.setType(wrkDetl.getType()); // 鍨嬪彿
+// 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()); // 鍗曚綅
@@ -73,9 +73,9 @@
// waitPakIn.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
// waitPakIn.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
// waitPakIn.setLgnum(matCode.getStr2()); // 瑙勬牸
-// waitPakIn.setType(matCode.getStr5()); // 鍨嬪彿
+// 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()); // 鍗曚綅
@@ -86,7 +86,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) {
@@ -95,8 +95,8 @@
// waitPakIn.setBatch(orderDetl.getBatch());
// waitPakIn.setOrderNo(orderDetl.getOrderNo());
// waitPakIn.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
-// waitPakIn.setType(orderDetl.getModel()); // 鍨嬪彿
-// waitPakIn.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
+// waitPakIn.setType(orderDetl.getModel()); // 鎵规
+// waitPakIn.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
// waitPakIn.setAltme(orderDetl.getUnit()); // 鍗曚綅
// }
//
@@ -106,8 +106,8 @@
// wrkDetl.setBatch(orderDetl.getBatch());
// wrkDetl.setOrderNo(orderDetl.getOrderNo());
// wrkDetl.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
-// wrkDetl.setType(orderDetl.getModel()); // 鍨嬪彿
-// wrkDetl.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
+// wrkDetl.setType(orderDetl.getModel()); // 鎵规
+// wrkDetl.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
// wrkDetl.setAltme(orderDetl.getUnit()); // 鍗曚綅
// }
@@ -117,9 +117,9 @@
**/
public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
// 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
- if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
- return false;
- }
+// if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
+// return false;
+// }
return true;
}
--
Gitblit v1.9.1