From 1c55a832ef8c153ea2a5d3a61c762259a745d367 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 01 四月 2022 13:18:41 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/VersionUtils.java |  202 +++++++++++++++++++++++++-------------------------
 1 files changed, 102 insertions(+), 100 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 07bf914..4913503 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.utils;
 
-import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.MatCode;
 import com.zy.common.model.LocTypeDto;
 import com.zy.common.utils.excel.matcode.MatCodeExcel;
 
@@ -9,107 +10,108 @@
  */
 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()); // 鐗╂枡鎻忚堪w
-        wrkDetl.setBatch(locDetl.getBatch());
-        wrkDetl.setOrderNo(locDetl.getOrderNo());
-        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.setBatch(wrkDetl.getBatch());
-        locDetl.setOrderNo(wrkDetl.getOrderNo());
-        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()); // 鎵瑰彿
-    }
-
-    public static void setWaitPakIn(WaitPakin waitPakIn, OrderDetl orderDetl) {
-        waitPakIn.setMatnr(orderDetl.getMatnr()); // 鐗╂枡缂栧彿
-        waitPakIn.setMaktx(orderDetl.getMaktx()); // 鐗╂枡鎻忚堪
-        waitPakIn.setBatch(orderDetl.getBatch());
-        waitPakIn.setOrderNo(orderDetl.getOrderNo());
-        waitPakIn.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
-        waitPakIn.setType(orderDetl.getModel()); // 鍨嬪彿
-        waitPakIn.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
-        waitPakIn.setAltme(orderDetl.getUnit()); // 鍗曚綅
-    }
-
-    public static void setWrkDetl(WrkDetl wrkDetl, OrderDetl orderDetl) {
-        wrkDetl.setMatnr(orderDetl.getMatnr()); // 鐗╂枡缂栧彿
-        wrkDetl.setMaktx(orderDetl.getMaktx()); // 鐗╂枡鎻忚堪
-        wrkDetl.setBatch(orderDetl.getBatch());
-        wrkDetl.setOrderNo(orderDetl.getOrderNo());
-        wrkDetl.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
-        wrkDetl.setType(orderDetl.getModel()); // 鍨嬪彿
-        wrkDetl.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
-        wrkDetl.setAltme(orderDetl.getUnit()); // 鍗曚綅
-    }
+//    public static void setWrkDetl(WrkDetl wrkDetl, Mat mat) {
+//        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()); // 鐗╂枡鎻忚堪w
+//        wrkDetl.setBatch(locDetl.getBatch());
+//        wrkDetl.setOrderNo(locDetl.getOrderNo());
+//        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.setBatch(wrkDetl.getBatch());
+//        locDetl.setOrderNo(wrkDetl.getOrderNo());
+//        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()); // 鎵瑰彿
+//    }
+//
+//    public static void setWaitPakIn(WaitPakin waitPakIn, OrderDetl orderDetl) {
+//        waitPakIn.setMatnr(orderDetl.getMatnr()); // 鐗╂枡缂栧彿
+//        waitPakIn.setMaktx(orderDetl.getMaktx()); // 鐗╂枡鎻忚堪
+//        waitPakIn.setBatch(orderDetl.getBatch());
+//        waitPakIn.setOrderNo(orderDetl.getOrderNo());
+//        waitPakIn.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
+//        waitPakIn.setType(orderDetl.getModel()); // 鍨嬪彿
+//        waitPakIn.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
+//        waitPakIn.setAltme(orderDetl.getUnit()); // 鍗曚綅
+//    }
+//
+//    public static void setWrkDetl(WrkDetl wrkDetl, OrderDetl orderDetl) {
+//        wrkDetl.setMatnr(orderDetl.getMatnr()); // 鐗╂枡缂栧彿
+//        wrkDetl.setMaktx(orderDetl.getMaktx()); // 鐗╂枡鎻忚堪
+//        wrkDetl.setBatch(orderDetl.getBatch());
+//        wrkDetl.setOrderNo(orderDetl.getOrderNo());
+//        wrkDetl.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
+//        wrkDetl.setType(orderDetl.getModel()); // 鍨嬪彿
+//        wrkDetl.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
+//        wrkDetl.setAltme(orderDetl.getUnit()); // 鍗曚綅
+//    }
 
 
     // excel ----------------------------------------------------------------------

--
Gitblit v1.9.1