From 93b591f65d0dbc0ab2238fb8a027c58f44e5fb66 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 08 九月 2021 16:12:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 174 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 143 insertions(+), 31 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 c34bd07..0d02f62 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -1,14 +1,25 @@
package com.zy.asrs.task.handler;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.service.*;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.VersionUtils;
+import com.zy.ints.entity.IoComplete;
import com.zy.ints.entity.WaitMatin;
+import com.zy.ints.entity.WaitMatout;
+import com.zy.ints.service.IoCompleteService;
import com.zy.ints.service.WaitMatinService;
+import com.zy.ints.service.WaitMatoutService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -30,9 +41,17 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private WaitPakinService waitPakinService;
- @Autowired
private WaitMatinService waitMatinService;
+ @Autowired
+ private WaitMatoutService waitMatoutService;
+ @Autowired
+ private IoCompleteService ioCompleteService;
+
+ /**
+ * ERP鎺ュ彛鏄惁鍚敤
+ */
+ @Value("${erp.enabled}")
+ private Boolean erpEnabled;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -95,31 +114,37 @@
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
}
- // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> 2
- if(!"0".equals(wrkDetl.getBillNo()) || !"0".equals(wrkDetl.getSeqNo())){
- WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
- if(null != waitMatin && waitMatin.getInQty() >= waitMatin.getQty()){
- waitMatin.setIoStatus(2);
- waitMatin.setModiTime(new Date());
- boolean res = waitMatinService.update(waitMatin, new EntityWrapper<WaitMatin>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
- if(!res){
- exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊鍏ュ簱閫氱煡妗ｅけ璐ワ紱[workNo={0}],[billNo={1}]", wrkMast.getWrkNo(),wrkDetl.getBillNo());
- }
+
+ // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ====>> 2
+ WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
+ if(null != waitMatin && waitMatin.getInQty() >= waitMatin.getQty()){
+ waitMatin.setIoStatus(2);
+ waitMatin.setModiTime(now);
+ boolean res = waitMatinService.update(waitMatin, new EntityWrapper<WaitMatin>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
+ if(!res){
+ exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊鍏ュ簱閫氱煡妗ｅけ璐ワ紱[workNo={0}],[billNo={1}],[seqNo={2}]", wrkMast.getWrkNo(),wrkDetl.getBillNo(),wrkDetl.getSeqNo());
}
}
- //todo:鎻掑叆鍥炴姤妗�
-// try {
-// WaitPakin setParam = new WaitPakin();
-// setParam.setIoStatus("Y");
-// boolean updateRes = waitPakinService.update(setParam
-// , new EntityWrapper<WaitPakin>().eq("zpallet", wrkDetl.getZpallet())
-// .eq("mat_no", wrkDetl.getMatNo())
-// .eq("qty", wrkDetl.getQty()));
-// if (!updateRes && updateRes) {
-// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊鍏ュ簱閫氱煡妗ｅけ璐ワ紱[workNo={0}]", wrkMast.getWrkNo());
-// }
-// } catch (Exception ignore){}
+ //鎻掑叆鍥炴姤妗� insert ====>> io_complete
+ if(erpEnabled && "Y".equals(wrkMast.getLinkMis())){
+ IoComplete ioComplete = new IoComplete();
+ ioComplete.setBillNo(wrkDetl.getBillNo());
+ ioComplete.setSeqNo(wrkDetl.getSeqNo());
+ ioComplete.setTaskType(1);//鍏ュ簱
+ ioComplete.setLocNo(wrkMast.getLocNo());
+ ioComplete.setZpallet(wrkMast.getBarcode());
+ ioComplete.setMatNo(wrkDetl.getMatNo());
+ ioComplete.setMatName(wrkDetl.getMatName());
+ ioComplete.setQty(wrkDetl.getQty());
+ ioComplete.setUpdStatus(0);//涓婃姤鐘舵�侊紝寰呭鐞�
+ ioComplete.setModiTime(now);
+ ioComplete.setAppeTime(now);
+ boolean res = ioCompleteService.insert(ioComplete);
+ if(!res){
+ exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鎻掑叆鍥炴姤閫氱煡妗ｅけ璐ワ紱[workNo={0}],[billNo={1}],[seqNo={2}]", wrkMast.getWrkNo(),wrkDetl.getBillNo(),wrkDetl.getSeqNo());
+ }
+ }
}
// 淇敼搴撲綅鐘舵�� S ====>> F
@@ -147,7 +172,37 @@
if (!locDetlService.updateAnfme(locDetl.getQty() - wrkDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
- // todo:luxiaotao 3)淇敼鍑哄簱閫氱煡妗� iostatus ==> Y
+
+ // 鏇存柊鍑哄簱閫氱煡妗� ioStatus ====>> 2
+ WaitMatout waitMatout = waitMatoutService.selectOne(new EntityWrapper<WaitMatout>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
+ if(null != waitMatout && waitMatout.getOutQty() >= waitMatout.getQty()){
+ waitMatout.setIoStatus(2);
+ waitMatout.setModiTime(now);
+ boolean res = waitMatoutService.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
+ if(!res){
+ exceptionHandle("鎷ｆ枡鍑哄簱 ===>> 鏇存柊鍑哄簱閫氱煡妗ｅけ璐ワ紱[workNo={0}],[billNo={1}],[seqNo={2}]", wrkMast.getWrkNo(),wrkDetl.getBillNo(),wrkDetl.getSeqNo());
+ }
+ }
+
+ //鎻掑叆鍥炴姤妗� insert ====>> io_complete
+ if(erpEnabled && "Y".equals(wrkMast.getLinkMis())){
+ IoComplete ioComplete = new IoComplete();
+ ioComplete.setBillNo(wrkDetl.getBillNo());
+ ioComplete.setSeqNo(wrkDetl.getSeqNo());
+ ioComplete.setTaskType(2);//鍑哄簱
+ ioComplete.setLocNo(wrkMast.getLocNo());
+ ioComplete.setZpallet(wrkMast.getBarcode());
+ ioComplete.setMatNo(wrkDetl.getMatNo());
+ ioComplete.setMatName(wrkDetl.getMatName());
+ ioComplete.setQty(wrkDetl.getQty());
+ ioComplete.setUpdStatus(0);//涓婃姤鐘舵�侊紝寰呭鐞�
+ ioComplete.setModiTime(now);
+ ioComplete.setAppeTime(now);
+ boolean res = ioCompleteService.insert(ioComplete);
+ if(!res){
+ exceptionHandle("鎷ｆ枡鍑哄簱 ===>> 鎻掑叆鍥炴姤閫氱煡妗ｅけ璐ワ紱[workNo={0}],[billNo={1}],[seqNo={2}]", wrkMast.getWrkNo(),wrkDetl.getBillNo(),wrkDetl.getSeqNo());
+ }
+ }
}
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
@@ -185,7 +240,38 @@
exceptionHandle("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[matNo={1}]", wrkMast.getWrkNo(), wrkDetl.getMatNo());
}
}
- // todo:luxiaotao 3)淇敼鍑哄簱閫氱煡妗� status ==> Y
+
+ // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ====>> 2
+ WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
+ if(null != waitMatin && waitMatin.getInQty() >= waitMatin.getQty()){
+ waitMatin.setIoStatus(2);
+ waitMatin.setModiTime(now);
+ boolean res = waitMatinService.update(waitMatin, new EntityWrapper<WaitMatin>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
+ if(!res){
+ exceptionHandle("骞舵澘鍏ュ簱 ===>> 鏇存柊鍏ュ簱閫氱煡妗ｅけ璐ワ紱[workNo={0}],[billNo={1}],[seqNo={2}]", wrkMast.getWrkNo(),wrkDetl.getBillNo(),wrkDetl.getSeqNo());
+ }
+ }
+
+ //鎻掑叆鍥炴姤妗� insert ====>> io_complete
+ if(erpEnabled && "Y".equals(wrkMast.getLinkMis())){
+ IoComplete ioComplete = new IoComplete();
+ ioComplete.setBillNo(wrkDetl.getBillNo());
+ ioComplete.setSeqNo(wrkDetl.getSeqNo());
+ ioComplete.setTaskType(1);//鍏ュ簱
+ ioComplete.setLocNo(wrkMast.getLocNo());
+ ioComplete.setZpallet(wrkMast.getBarcode());
+ ioComplete.setMatNo(wrkDetl.getMatNo());
+ ioComplete.setMatName(wrkDetl.getMatName());
+ ioComplete.setQty(wrkDetl.getQty());
+ ioComplete.setUpdStatus(0);//涓婃姤鐘舵�侊紝寰呭鐞�
+ ioComplete.setModiTime(now);
+ ioComplete.setAppeTime(now);
+ boolean res = ioCompleteService.insert(ioComplete);
+ if(!res){
+ exceptionHandle("骞舵澘鍏ュ簱 ===>> 鎻掑叆鍥炴姤閫氱煡妗ｅけ璐ワ紱[workNo={0}],[billNo={1}],[seqNo={2}]", wrkMast.getWrkNo(),wrkDetl.getBillNo(),wrkDetl.getSeqNo());
+ }
+ }
+
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
@@ -205,7 +291,6 @@
if (wrkDetls57.isEmpty()) {
exceptionHandle("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
}
- // todo:luxiaotao 3)淇敼鐩樼偣閫氱煡妗� status ==> Y
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
locMast.setLocSts("F");
@@ -229,7 +314,6 @@
exceptionHandle("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触锛沎婧愬簱浣�={0}],[鐩爣搴撲綅={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
}
}
- // todo:luxiaotao 3)淇敼鐩樼偣閫氱煡妗� status ==> Y
// 淇敼婧愬簱浣嶇姸鎬� ==> O
LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
if (null != sourceLoc) {
@@ -283,7 +367,35 @@
exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
}
for (WrkDetl wrkDetl : wrkDetls101) {
- // todo:luxiaotao 3)淇敼鍑哄簱閫氱煡妗� status ==> Y
+ WaitMatout waitMatout = waitMatoutService.selectOne(new EntityWrapper<WaitMatout>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
+ if(null != waitMatout && waitMatout.getOutQty() >= waitMatout.getQty()){
+ waitMatout.setIoStatus(2);
+ waitMatout.setModiTime(now);
+ boolean res = waitMatoutService.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
+ if(!res){
+ exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊鍑哄簱閫氱煡妗ｅけ璐ワ紱[workNo={0}],[billNo={1}],[seqNo={2}]", wrkMast.getWrkNo(),wrkDetl.getBillNo(),wrkDetl.getSeqNo());
+ }
+ }
+
+ //鎻掑叆鍥炴姤妗� insert ====>> io_complete
+ if(erpEnabled && "Y".equals(wrkMast.getLinkMis())){
+ IoComplete ioComplete = new IoComplete();
+ ioComplete.setBillNo(wrkDetl.getBillNo());
+ ioComplete.setSeqNo(wrkDetl.getSeqNo());
+ ioComplete.setTaskType(2);//鍑哄簱
+ ioComplete.setLocNo(wrkMast.getLocNo());
+ ioComplete.setZpallet(wrkMast.getBarcode());
+ ioComplete.setMatNo(wrkDetl.getMatNo());
+ ioComplete.setMatName(wrkDetl.getMatName());
+ ioComplete.setQty(wrkDetl.getQty());
+ ioComplete.setUpdStatus(0);//涓婃姤鐘舵�侊紝寰呭鐞�
+ ioComplete.setModiTime(now);
+ ioComplete.setAppeTime(now);
+ boolean res = ioCompleteService.insert(ioComplete);
+ if(!res){
+ exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鎻掑叆鍥炴姤閫氱煡妗ｅけ璐ワ紱[workNo={0}],[billNo={1}],[seqNo={2}]", wrkMast.getWrkNo(),wrkDetl.getBillNo(),wrkDetl.getSeqNo());
+ }
+ }
}
// 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
--
Gitblit v1.9.1