From 8214c8fa159ef931f465e59f00d753ce7b120257 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 25 三月 2022 15:20:37 +0800
Subject: [PATCH] #杰克缝纫机立库 【根据单号检索单据数据】 优化2
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 9 +++++++++
src/main/java/com/zy/asrs/entity/WaitPakin.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 11 ++++++-----
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index a18b5bf..8030ba0 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -30,7 +30,7 @@
/**
- * 浠撳簱鍙�
+ * 瑙勬牸
*/
@ApiModelProperty(value= "瑙勬牸")
private String lgnum;
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index fd0a2c1..58f8a31 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -44,6 +44,7 @@
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
throw new CoolException("鏉＄爜鏁版嵁宸插瓨鍦�");
}
+ Date now = new Date();
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
for (CombParam.CombMat combMat : param.getCombMats()) {
@@ -57,9 +58,9 @@
waitPakin.setAnfme(combMat.getCount()); // 鏁伴噺
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(new Date());
+ waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
- waitPakin.setModiTime(new Date());
+ waitPakin.setModiTime(now);
VersionUtils.setWaitPakIn(waitPakin, matCode);
if (!waitPakinService.insert(waitPakin)) {
@@ -88,10 +89,10 @@
waitPakin.setAnfme(comb.getCount()); // 鏁伴噺
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(new Date());
+ waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
- waitPakin.setModiTime(new Date());
-// VersionUtils.setWaitPakIn(waitPakin, orderDetl);
+ waitPakin.setModiTime(now);
+ VersionUtils.setWaitPakIn(waitPakin, orderDetl);
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("娣诲姞鍏ュ簱閫氱煡妗ｅけ璐�");
}
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 4797bbd..b89240c 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -85,6 +85,15 @@
orderDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
}
+ public static void setWaitPakIn(WaitPakin waitPakIn, OrderDetl orderDetl) {
+ waitPakIn.setMatnr(orderDetl.getMatnr()); // 鐗╂枡缂栧彿
+ waitPakIn.setMaktx(orderDetl.getMaktx()); // 鐗╂枡鎻忚堪
+ waitPakIn.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
+ waitPakIn.setType(orderDetl.getModel()); // 鍨嬪彿
+ waitPakIn.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
+ waitPakIn.setAltme(orderDetl.getUnit()); // 鍗曚綅
+ }
+
// excel ----------------------------------------------------------------------
--
Gitblit v1.9.1