From 6e4a1fa5dfb97e2ed07a9598524cead18bf3a3d7 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期三, 17 十一月 2021 14:24:06 +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 a0cef33..e8115b4 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);//璁㈠崟缂栧彿
@@ -559,7 +570,7 @@
throw new CoolException("搴撲綅涓嶅瓨鍦�");
}
//鏌ヨ搴撲綅鐘舵��
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")){
//鏇存柊搴撲綅鐘舵��
locMast.setLocSts("F");
// boolean b = locMastService.updateById(locMast);
--
Gitblit v1.9.1