From 5ac4d85e8e6a80ada870b5c92eb45897c7815b51 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 13 七月 2023 10:41:08 +0800
Subject: [PATCH] rgv
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 85 +++++++++++++++++++-----------------------
1 files changed, 38 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 6236494..0e8be1f 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -15,56 +15,50 @@
// 涓氬姟 ----------------------------------------------------------------------
public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
- wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
- wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
- wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
- wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿
- wrkDetl.setColor(matCode.getBarcode()); // 鏉＄爜
- wrkDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
- wrkDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
- wrkDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
- wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
- wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
+// wrkDetl.setMatNo(matCode.getMatNo()); // 鐗╂枡缂栧彿
+// wrkDetl.setMatName(matCode.getMatName()); // 鐗╂枡鎻忚堪
+// wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
+// wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿
+// wrkDetl.setColor(matCode.getBarcode()); // 鏉＄爜
+// wrkDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+// wrkDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
+// wrkDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
+// wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+// wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
}
public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
- wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
- wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
- wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
- wrkDetl.setType(locDetl.getType()); // 鍨嬪彿
- wrkDetl.setColor(locDetl.getColor()); // 鏉＄爜
- wrkDetl.setSupplier(locDetl.getSupplier()); // 鎵瑰彿
- wrkDetl.setWarehouse(locDetl.getWarehouse()); // 鍗曟嵁缂栧彿
- wrkDetl.setBrand(locDetl.getBrand()); // 鍝侀」鏁�
- wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
- wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛鍚嶇О
+ wrkDetl.setMatnr(locDetl.getMatnr()); // 浜у搧缂栧彿
+ wrkDetl.setMaktx(locDetl.getMaktx()); // 浜у搧鎻忚堪
+ wrkDetl.setSpecs(locDetl.getSpecs()); // 瑙勬牸
+ wrkDetl.setUnit(locDetl.getUnit()); // 鍗曚綅
+// wrkDetl.setSize(locDetl.getSize()); // 灏哄
+ wrkDetl.setColor(locDetl.getColor()); // 棰滆壊
+ wrkDetl.setWeight(locDetl.getWeight()); // 鍗曢噸
wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
- locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
- locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
- locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
- locDetl.setType(matCode.getStr5()); // 鍨嬪彿
- locDetl.setColor(matCode.getBarcode()); // 鏉＄爜
- locDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
- locDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
- locDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
- locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
- locDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
+// locDetl.setMatNo(matCode.getMatNo()); // 鐗╂枡缂栧彿
+// locDetl.setMatName(matCode.getMatName()); // 鐗╂枡鎻忚堪
+// locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
+// locDetl.setType(matCode.getStr5()); // 鍨嬪彿
+// locDetl.setColor(matCode.getBarcode()); // 鏉＄爜
+// locDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+// locDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
+// locDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
+// locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+// locDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
}
public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
- locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
- locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
- locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
- locDetl.setType(wrkDetl.getType()); // 鍨嬪彿
- locDetl.setColor(wrkDetl.getColor()); // 鏉＄爜
- locDetl.setSupplier(wrkDetl.getSupplier()); // 鎵瑰彿
- locDetl.setWarehouse(wrkDetl.getWarehouse()); // 鍗曟嵁缂栧彿
- locDetl.setBrand(wrkDetl.getBrand()); // 鍝侀」鏁�
- locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
- locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛鍚嶇О
+ locDetl.setMatnr(wrkDetl.getMatnr()); // 浜у搧缂栧彿
+ locDetl.setMaktx(wrkDetl.getMaktx()); // 浜у搧鎻忚堪
+ locDetl.setSpecs(wrkDetl.getSpecs()); // 瑙勬牸
+ locDetl.setUnit(wrkDetl.getUnit()); // 鍗曚綅
+// locDetl.setSize(wrkDetl.getSize()); // 灏哄
+ locDetl.setColor(wrkDetl.getColor()); // 棰滆壊
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
@@ -73,19 +67,16 @@
**/
public static void locMoveCheckLocType(LocMast sourceLoc, LocMast loc){
// 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
- if (sourceLoc.getLocType1() == 2 && loc.getLocType1() == 1) {
- throw new CoolException("楂樺簱浣嶄笉鑳界Щ杞嚦浣庡簱浣�");
- }
+// if (sourceLoc.getLocType1() == 2 && loc.getLocType1() == 1) {
+// throw new CoolException("楂樺簱浣嶄笉鑳界Щ杞嚦浣庡簱浣�");
+// }
}
/**
* 搴撲綅绉昏浆鏃剁被鍨嬫娴�
**/
public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
- // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
- if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
- return false;
- }
+
return true;
}
--
Gitblit v1.9.1