From 184a0722e53f64f40ddb2c88f11f26941f565a8c Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 18 十二月 2024 14:56:44 +0800
Subject: [PATCH] 上报逻辑调整
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 7f0bd37..6c0676e 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -37,7 +37,7 @@
// wrkDetl.setBrand(locDetl.getBrand()); // 鍝侀」鏁�
// wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
// wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛鍚嶇О
-// wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
+// wrkDetl.setZpallet(locDetl.getZpallet()); // 璐ф灦鏉＄爜
// }
//
// public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
@@ -66,7 +66,7 @@
// locDetl.setBrand(wrkDetl.getBrand()); // 鍝侀」鏁�
// locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
// locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛鍚嶇О
-// locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+// locDetl.setZpallet(wrkDetl.getZpallet()); // 璐ф灦鏉＄爜
// }
//
// public static void setWaitPakIn(WaitPakin waitPakIn, MatCode matCode) {
@@ -113,14 +113,14 @@
/**
- * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ * 搴撲綅绫诲瀷妫�娴�
**/
- public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
- // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
-// if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
-// return false;
-// }
- return true;
+ public static boolean checkLocType(LocMast loc, LocTypeDto dto){
+ //搴撲綅绫诲瀷蹇呴』鍜屼紶鍏ョ殑搴撲綅淇″彿涓�鑷�
+ if (loc.getLocType1().equals(dto.getLocType1())) {
+ return true;
+ }
+ return false;
}
}
--
Gitblit v1.9.1