From 045c46e4891afefd6d1d9d8988f1416eacd3de1b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 25 三月 2022 14:44:49 +0800
Subject: [PATCH] #杰克缝纫机立库 【根据单号检索单据数据】 优化
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 8112dba..4797bbd 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;
/**
@@ -80,6 +78,14 @@
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()); // 鎵瑰彿
+ }
+
+
// excel ----------------------------------------------------------------------
public static MatCodeExcel getExcel(MatCode matCode) {
@@ -154,5 +160,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