From b00eeab31bd13ba34a03301aa441b0751d6a93e4 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 19 十二月 2025 17:00:51 +0800
Subject: [PATCH] 第六排成品可以放第七排原材料
---
src/main/java/com/zy/ints/controller/WaitMatchkController.java | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/ints/controller/WaitMatchkController.java b/src/main/java/com/zy/ints/controller/WaitMatchkController.java
index 81e14b2..f728351 100644
--- a/src/main/java/com/zy/ints/controller/WaitMatchkController.java
+++ b/src/main/java/com/zy/ints/controller/WaitMatchkController.java
@@ -18,7 +18,9 @@
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.MatCodeService;
import com.zy.common.web.BaseController;
+import com.zy.ints.entity.IoComplete;
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;
@@ -40,6 +42,8 @@
private LocDetlService locDetlService;
@Autowired
private MatCodeService matCodeService;
+ @Autowired
+ private IoCompleteService ioCompleteService;
//鐩樼偣閫氱煡妗�
@@ -143,11 +147,59 @@
if(!locDetlService.delete(wrapperDetl)){
throw new CoolException("鍒犻櫎鏁伴噺涓�0鏄庣粏鍑洪敊[locNo:"+locDetl.getLocNo()+"],[matNo:"+locDetl.getMatNo()+"]");
}
+
+ //鐩樼偣缁撴灉鎻掑叆鍥炴姤妗�
+ IoComplete ioComplete = new IoComplete();
+ ioComplete.setBillNo(entity.getBillNo());
+ ioComplete.setSeqNo(entity.getSeqNo());
+ ioComplete.setTaskType(4); //鐩樹簭
+ ioComplete.setLocNo(entity.getLocNo());
+ ioComplete.setMatNo(entity.getMatNo());
+ ioComplete.setMatName(locDetl.getMatName());
+ ioComplete.setZpallet(locDetl.getZpallet());
+ ioComplete.setQty(locDetl.getQty());
+ ioComplete.setUpdStatus(0);
+ ioComplete.setModiUser(getUserId());
+ ioComplete.setModiTime(now);
+ ioComplete.setAppeUser(getUserId());
+ ioComplete.setAppeTime(now);
+ if(!ioCompleteService.insert(ioComplete)){
+ throw new CoolException("鎻掑叆鍥炴姤妗ｅ嚭閿橻locNo:"+locDetl.getLocNo()+"],[matNo:"+locDetl.getMatNo()+"]");
+ }
+
}else{
if(!entity.getCheckQty().equals(locDetl.getQty())){ //搴撳瓨鏁伴噺涓庣洏鐐规暟閲忕浉鍚屼笉鐢ㄦ洿鏂�
locDetl.setQty(entity.getCheckQty());
if(!locDetlService.update(locDetl,wrapperDetl)){
throw new CoolException("鏇存柊搴撳瓨鏄庣粏鍑洪敊[locNo:"+locDetl.getLocNo()+"],[matNo:"+locDetl.getMatNo()+"]");
+ }
+
+ //鐩樼偣缁撴灉鎻掑叆鍥炴姤妗�
+ Double qty = 0D;
+ int type = 0;
+ if(entity.getCheckQty()>locDetl.getQty()){//鐩樼泩
+ qty = entity.getCheckQty() - locDetl.getQty();
+ type = 3;
+ } else { //鐩樹簭
+ qty = locDetl.getQty() - entity.getCheckQty();
+ type = 4;
+ }
+ IoComplete ioComplete = new IoComplete();
+ ioComplete.setBillNo(entity.getBillNo());
+ ioComplete.setSeqNo(entity.getSeqNo());
+ ioComplete.setTaskType(type);
+ ioComplete.setLocNo(entity.getLocNo());
+ ioComplete.setMatNo(entity.getMatNo());
+ ioComplete.setMatName(locDetl.getMatName());
+ ioComplete.setZpallet(locDetl.getZpallet());
+ ioComplete.setQty(qty);
+ ioComplete.setUpdStatus(0);
+ ioComplete.setModiUser(getUserId());
+ ioComplete.setModiTime(now);
+ ioComplete.setAppeUser(getUserId());
+ ioComplete.setAppeTime(now);
+ if(!ioCompleteService.insert(ioComplete)){
+ throw new CoolException("鎻掑叆鍥炴姤妗ｅ嚭閿橻locNo:"+locDetl.getLocNo()+"],[matNo:"+locDetl.getMatNo()+"]");
}
}
@@ -180,6 +232,25 @@
if(!locDetlService.insert(one)){
throw new CoolException("鎻掑叆搴撳瓨鏄庣粏鍑洪敊[locNo:"+entity.getLocNo()+"],[matNo:"+entity.getMatNo()+"]");
}
+
+ //鐩樼偣缁撴灉鎻掑叆鍥炴姤妗�
+ IoComplete ioComplete = new IoComplete();
+ ioComplete.setBillNo(entity.getBillNo());
+ ioComplete.setSeqNo(entity.getSeqNo());
+ ioComplete.setTaskType(3); //鐩樼泩
+ ioComplete.setLocNo(entity.getLocNo());
+ ioComplete.setMatNo(entity.getMatNo());
+ ioComplete.setMatName(one.getMatName());
+ ioComplete.setZpallet(one.getZpallet());
+ ioComplete.setQty(entity.getCheckQty());
+ ioComplete.setUpdStatus(0);
+ ioComplete.setModiUser(getUserId());
+ ioComplete.setModiTime(now);
+ ioComplete.setAppeUser(getUserId());
+ ioComplete.setAppeTime(now);
+ if(!ioCompleteService.insert(ioComplete)){
+ throw new CoolException("鎻掑叆鍥炴姤妗ｅ嚭閿橻locNo:"+entity.getLocNo()+"],[matNo:"+entity.getMatNo()+"]");
+ }
}
entity.setVerifyStatus(1);
--
Gitblit v1.9.1