From cbe346528fea2fea06b92b354ec5a71717544c12 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 一月 2021 20:18:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index f79da50..9c36d7a 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,9 +1,7 @@
package com.zy.asrs.utils;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.*;
+import com.zy.common.model.LocTypeDto;
import com.zy.common.utils.excel.matcode.MatCodeExcel;
/**
@@ -17,18 +15,26 @@
wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
- wrkDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
+ 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.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
}
public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
- wrkDetl.setColor(locDetl.getColor()); // 鍔╄鐮�
- wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛
+ 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()); // 鎵樼洏鏉＄爜
}
@@ -36,19 +42,26 @@
locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
- locDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
- locDetl.setBname(matCode.getStr4()); // 瀹㈡埛
+ 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.setColor(wrkDetl.getColor()); // 鍔╄鐮�
- locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ 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()); // 鎵樼洏鏉＄爜
}
@@ -56,9 +69,13 @@
waitPakIn.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
waitPakIn.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
waitPakIn.setLgnum(matCode.getStr2()); // 瑙勬牸
- waitPakIn.setColor(matCode.getStr3()); // 鍔╄鐮�
+ 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()); // 瀹㈡埛
+ waitPakIn.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
}
// excel ----------------------------------------------------------------------
@@ -135,5 +152,15 @@
matCode.setNum6(excel.getNum6());
}
+ /**
+ * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ **/
+ public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
+ // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
+ if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
+ return false;
+ }
+ return true;
+ }
}
--
Gitblit v1.9.1