From 756fa60cebfb82ba824e87d080d44fc9ec34ecc8 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 14:01:09 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index b61bfb3..7c50433 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,6 +1,8 @@
package com.zy.asrs.utils;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.result.Pakin;
import com.zy.common.model.LocTypeDto;
/**
@@ -11,7 +13,7 @@
// 涓氬姟 ----------------------------------------------------------------------
-// public static void setWrkDetl(WrkDetl wrkDetl, Mat mat) {
+ // public static void setWrkDetl(WrkDetl wrkDetl, Mat mat) {
// wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
// wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
// wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
@@ -110,12 +112,24 @@
// wrkDetl.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
// wrkDetl.setAltme(orderDetl.getUnit()); // 鍗曚綅
// }
+ public static void setPakin(Pakin pakin, Mat mat) {
+ pakin.setMatnr(mat.getMatnr());
+ pakin.setMaktx(mat.getMaktx());
+ pakin.setName(mat.getName());
+ pakin.setSpecs(mat.getSpecs());
+ pakin.setModel(mat.getModel());
+ pakin.setUnit(mat.getUnit());
+ pakin.setBarcode(mat.getBarcode());
+ pakin.setItemNum(Integer.valueOf(mat.getItemNum()));
+ pakin.setPrice(mat.getPrice());
+ pakin.setWeight(mat.getWeight());
+ }
/**
- * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
**/
- public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
+ public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto) {
// 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
return false;
@@ -123,4 +137,13 @@
return true;
}
+ /**
+ * 绫诲瀷妫�娴�
+ * 瀹屽叏妫�娴�
+ **/
+ public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
+ // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
+ return dto.getLocType1().equals(loc.getLocType1());
+ }
+
}
--
Gitblit v1.9.1