From c7d036d6ba067fb90e53a56a400695d991101d89 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 03 七月 2025 15:20:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 53c008e..f1c570e 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,39 +1,47 @@
package com.zy.asrs.utils;
import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.result.Pakin;
+import com.zy.common.model.LocTypeDto;
/**
* 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.setAltme(matCode.getStr1()); // 鍗曚綅
- }
-
public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
- wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
- wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
- wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
+ 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.setAltme(matCode.getStr1()); // 鍗曚綅
+ /**
+ * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ * 鍏煎鐗�
+ **/
+ public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto) {
+ // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
+ if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
+ return false;
+ }
+ return true;
}
- public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
- locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
- locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
- locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
- locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ /**
+ * 绫诲瀷妫�娴�
+ * 瀹屽叏妫�娴�
+ **/
+ public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
+ // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
+ return dto.getLocType1().equals(loc.getLocType1());
}
}
--
Gitblit v1.9.1