From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001 From: ynhfasrs <ynhfasrs@qq.com> Date: 星期五, 27 六月 2025 14:23:37 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/VersionUtils.java | 61 +++--------------------------- 1 files changed, 7 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java index 06afa71..3f1259e 100644 --- a/src/main/java/com/zy/asrs/utils/VersionUtils.java +++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java @@ -1,8 +1,7 @@ package com.zy.asrs.utils; -import com.zy.asrs.entity.LocDetl; -import com.zy.asrs.entity.MatCode; -import com.zy.asrs.entity.WrkDetl; +import com.zy.asrs.entity.LocMast; +import com.zy.common.model.LocTypeDto; /** * Created by vincent on 2020/7/14 @@ -11,58 +10,12 @@ // 涓氬姟 ---------------------------------------------------------------------- - 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 boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){ - public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) { - wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿 - wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪 - 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.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()); // 鎵樼洏鏉$爜 + return true; } -- Gitblit v1.9.1