From 72c06d5800d3a99dbd7002a6946be749d9264b15 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 26 六月 2025 10:44:26 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index bb6afba..6343b92 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,6 +1,5 @@
package com.zy.asrs.utils;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.MatCode;
@@ -28,11 +27,11 @@
}
public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
- wrkDetl.setMatNo(locDetl.getMatNo()); // 浜у搧缂栧彿
- wrkDetl.setMatName(locDetl.getMatName()); // 浜у搧鎻忚堪
+ wrkDetl.setMatnr(locDetl.getMatnr()); // 浜у搧缂栧彿
+ wrkDetl.setMaktx(locDetl.getMaktx()); // 浜у搧鎻忚堪
wrkDetl.setSpecs(locDetl.getSpecs()); // 瑙勬牸
wrkDetl.setUnit(locDetl.getUnit()); // 鍗曚綅
- wrkDetl.setSize(locDetl.getSize()); // 灏哄
+// wrkDetl.setSize(locDetl.getSize()); // 灏哄
wrkDetl.setColor(locDetl.getColor()); // 棰滆壊
wrkDetl.setWeight(locDetl.getWeight()); // 鍗曢噸
wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
@@ -52,20 +51,20 @@
}
public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
- locDetl.setMatNo(wrkDetl.getMatNo()); // 浜у搧缂栧彿
- locDetl.setMatName(wrkDetl.getMatName()); // 浜у搧鎻忚堪
+ locDetl.setMatnr(wrkDetl.getMatnr()); // 浜у搧缂栧彿
+ locDetl.setMaktx(wrkDetl.getMaktx()); // 浜у搧鎻忚堪
locDetl.setSpecs(wrkDetl.getSpecs()); // 瑙勬牸
locDetl.setUnit(wrkDetl.getUnit()); // 鍗曚綅
- locDetl.setSize(wrkDetl.getSize()); // 灏哄
+// locDetl.setSize(wrkDetl.getSize()); // 灏哄
locDetl.setColor(wrkDetl.getColor()); // 棰滆壊
- locDetl.setQty(wrkDetl.getQty()); // 鏁伴噺
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
/**
- * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
**/
- public static void locMoveCheckLocType(LocMast sourceLoc, LocMast loc){
+ public static void locMoveCheckLocType(LocMast sourceLoc, LocMast loc) {
// 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
// if (sourceLoc.getLocType1() == 2 && loc.getLocType1() == 1) {
// throw new CoolException("楂樺簱浣嶄笉鑳界Щ杞嚦浣庡簱浣�");
@@ -73,9 +72,9 @@
}
/**
- * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
**/
- public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
+ public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto) {
return true;
}
--
Gitblit v1.9.1