From a7b476eaa50abb7cdebf691cc232c26926ee1328 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期六, 18 九月 2021 10:40:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index a489602..b1d2c77 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -20,6 +20,7 @@
import com.zy.common.service.CommonService;
import com.zy.ints.entity.WaitMatchk;
import com.zy.ints.service.IoCompleteService;
+import com.zy.ints.service.WaitMatchkLogService;
import com.zy.ints.service.WaitMatchkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -66,6 +67,8 @@
private WrkDetlLogService wrkDetlLogService;
@Autowired
private WaitMatchkService waitMatchkService;
+ @Autowired
+ private WaitMatchkLogService waitMatchkLogService;
@Autowired
private IoCompleteService ioCompleteService;
@@ -197,6 +200,14 @@
for (LocDetlDto locDetlDto : locDetlDtos) {
// String replace = UUID.randomUUID().toString().replace("-", "");
LocDetl locDetl = locDetlDto.getLocDetl();
+
+ //////鎻掑叆鐩樼偣妗ｅ墠锛屽皢閫氱煡妗ｄ箣鍓嶇浉鍚屽簱浣嶆暟鎹浆鍘嗗彶妗�
+ List<WaitMatchk> waitMatchks = waitMatchkService.selectList(new EntityWrapper<WaitMatchk>().eq("loc_no",locDetl.getLocNo()));
+ for(WaitMatchk one : waitMatchks){
+ waitMatchkLogService.save(one.getBillNo(),one.getLocNo(),one.getMatNo());
+ waitMatchkService.delete(new EntityWrapper<WaitMatchk>().eq("bill_no",one.getBillNo()).eq("loc_no",one.getLocNo()).eq("mat_no",one.getMatNo()));
+ }
+
//鐢熸垚鐩樼偣妗�
WaitMatchk waitMatchk = new WaitMatchk();
waitMatchk.setBillNo(billNo);//璁㈠崟缂栧彿
@@ -205,7 +216,7 @@
waitMatchk.setMatNo(locDetl.getMatNo());//浜у搧缂栧彿
waitMatchk.setMatName(locDetl.getMatName());//閾插钩鍚嶇О
waitMatchk.setSeqNo(i);
- waitMatchk.setIoTime(new Date());
+// waitMatchk.setIoTime(new Date());
waitMatchk.setZpallet(locDetl.getZpallet());
waitMatchk.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
waitMatchk.setAppeTime(new Date());
--
Gitblit v1.9.1