From ab290efb7df666e173fcd88c32f066f333825c5e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 18 十月 2025 08:50:01 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 172 +++++---------------------------------------------------
1 files changed, 17 insertions(+), 155 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 4797bbd..bb3bbfb 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,169 +1,22 @@
package com.zy.asrs.utils;
-import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.result.Pakin;
import com.zy.common.model.LocTypeDto;
-import com.zy.common.utils.excel.matcode.MatCodeExcel;
+
+import java.util.Objects;
/**
* Created by vincent on 2020/7/14
*/
public class VersionUtils {
- // 涓氬姟 ----------------------------------------------------------------------
-
- 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()); // 瀹㈡埛鍚嶇О
- }
-
- 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.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()); // 瀹㈡埛鍚嶇О
- }
-
- 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.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
- }
-
- public static void setWaitPakIn(WaitPakin waitPakIn, MatCode matCode) {
- waitPakIn.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
- waitPakIn.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
- waitPakIn.setLgnum(matCode.getStr2()); // 瑙勬牸
- waitPakIn.setType(matCode.getStr5()); // 鍨嬪彿
- waitPakIn.setColor(matCode.getBarcode()); // 鏉＄爜
- waitPakIn.setSupplier(matCode.getStr6()); // 鎵瑰彿
- waitPakIn.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
- waitPakIn.setBrand(matCode.getStr3()); // 鍝侀」鏁�
- waitPakIn.setAltme(matCode.getStr1()); // 鍗曚綅
- waitPakIn.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
- }
-
- public static void setOrderDetl(OrderDetl orderDetl, MatCode matCode) {
- orderDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
- orderDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
- orderDetl.setSpecs(matCode.getStr2()); // 瑙勬牸
- orderDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
- }
-
-
- // excel ----------------------------------------------------------------------
-
- public static MatCodeExcel getExcel(MatCode matCode) {
- return new MatCodeExcel(
- matCode.getMatNo(),
- matCode.getBarcode(),
- matCode.getMatName(),
- matCode.getStr1(),
- matCode.getStr2(),
- matCode.getStr3(),
- matCode.getStr4(),
- matCode.getStr5(),
- matCode.getStr6(),
- matCode.getStr7(),
- matCode.getStr8(),
- matCode.getStr9(),
- matCode.getStr10(),
- matCode.getStr11(),
- matCode.getStr12(),
- matCode.getStr13(),
- matCode.getStr14(),
- matCode.getStr15(),
- matCode.getStr16(),
- matCode.getStr17(),
- matCode.getStr18(),
- matCode.getStr19(),
- matCode.getStr20(),
- matCode.getStr21(),
- matCode.getStr22(),
- matCode.getStr23(),
- matCode.getNum1(),
- matCode.getNum2(),
- matCode.getNum3(),
- matCode.getNum4(),
- matCode.getNum5(),
- matCode.getNum6()
- );
- }
-
- public static void setMatCode(MatCode matCode, MatCodeExcel excel) {
- matCode.setMatNo(excel.getMatNo());
- matCode.setMatName(excel.getMatName());
- matCode.setBarcode(excel.getBarcode());
- matCode.setStr1(excel.getStr1());
- matCode.setStr2(excel.getStr2());
- matCode.setStr3(excel.getStr3());
- matCode.setStr4(excel.getStr4());
- matCode.setStr5(excel.getStr5());
- matCode.setStr6(excel.getStr6());
- matCode.setStr7(excel.getStr7());
- matCode.setStr8(excel.getStr8());
- matCode.setStr9(excel.getStr9());
- matCode.setStr10(excel.getStr10());
- matCode.setStr11(excel.getStr11());
- matCode.setStr12(excel.getStr12());
- matCode.setStr13(excel.getStr13());
- matCode.setStr14(excel.getStr14());
- matCode.setStr15(excel.getStr15());
- matCode.setStr16(excel.getStr16());
- matCode.setStr17(excel.getStr17());
- matCode.setStr18(excel.getStr18());
- matCode.setStr19(excel.getStr19());
- matCode.setStr20(excel.getStr20());
- matCode.setStr21(excel.getStr21());
- matCode.setStr22(excel.getStr22());
- matCode.setStr23(excel.getStr23());
- matCode.setNum1(excel.getNum1());
- matCode.setNum2(excel.getNum2());
- matCode.setNum3(excel.getNum3());
- matCode.setNum4(excel.getNum4());
- matCode.setNum5(excel.getNum5());
- matCode.setNum6(excel.getNum6());
- }
-
/**
- * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ * 鍏煎鐗�
**/
- public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
+ public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto) {
// 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
return false;
@@ -171,4 +24,13 @@
return true;
}
+ /**
+ * 绫诲瀷妫�娴�
+ * 瀹屽叏妫�娴�
+ **/
+ public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
+ // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
+ return Objects.equals(loc.getLocType1(), dto.getLocType1());
+ }
+
}
--
Gitblit v1.9.1