From bc20e7dc43b97367b7b70b678e71140a33846ff0 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 30 七月 2025 22:36:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 55d4484..0ab3f5a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -93,6 +93,8 @@
locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setProddate(wrkDetl.getProddate());//鐢熶骇鏃ユ湡
+ locDetl.setDeadline(wrkDetl.getDeadline());//鍒版湡鏃ユ湡
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
@@ -190,6 +192,9 @@
}
for (DetlDto detlDto : detlDtos) {
+ if(detlDto.getAnfme() <= 0 ){
+ continue;
+ }
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
@@ -199,6 +204,12 @@
locDetl.setLocNo(wrkMast.getLocNo());
locDetl.setAnfme(detlDto.getAnfme());
locDetl.setZpallet(zpallet); // 鎵樼洏鏉＄爜
+ locDetl.setSuppCode(detlDto.getContainerCode());// 鏂欑鐮�
+ locDetl.setBatch(detlDto.getBatch()); // 鎵瑰彿
+ locDetl.setThreeCode(detlDto.getCsocode());
+ locDetl.setDeadTime(detlDto.getIsoseq());
+ locDetl.setProddate(detlDto.getProddate());
+ locDetl.setDeadline(detlDto.getDeadline());
locDetl.setAppeTime(now);
locDetl.setAppeUser(9527L);
locDetl.setModiTime(now);
@@ -231,8 +242,6 @@
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no",locMast1.getLocNo()));
- } else {
- throw new CoolException("婧愬簱浣嶇姸鎬佸紓甯�");
}
break;
@@ -257,6 +266,8 @@
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ locDetl.setProddate(wrkDetl.getProddate());//鐢熶骇鏃ユ湡
+ locDetl.setDeadline(wrkDetl.getDeadline());//鍒版湡鏃ユ湡
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
if (!locDetlService.insert(locDetl)) {
@@ -289,6 +300,8 @@
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ locDetl.setProddate(wrkDetl.getProddate());
+ locDetl.setDeadline(wrkDetl.getDeadline());
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
if (!locDetlService.insert(locDetl)) {
--
Gitblit v1.9.1