From 0eb4bcffe0c6e017f9a9967576f12818c9b05db7 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期六, 11 九月 2021 13:36:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 184 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 166 insertions(+), 18 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 7261645..ab64af7 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -1,12 +1,20 @@
package com.zy.asrs.task.handler;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
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;
@@ -28,7 +36,19 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private WaitPakinService waitPakinService;
+ private WaitMatinService waitMatinService;
+ @Autowired
+ private WaitMatoutService waitMatoutService;
+ @Autowired
+ private IoCompleteService ioCompleteService;
+ @Autowired
+ private PltBarcodeService pltBarcodeService;
+
+ /**
+ * ERP鎺ュ彛鏄惁鍚敤
+ */
+ @Value("${erp.enabled}")
+ private Boolean erpEnabled;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -53,6 +73,7 @@
case 10:
// 淇敼搴撲綅鐘舵��=D
if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("D");
locMast.setIoTime(now);
locMast.setModiTime(now);
@@ -91,22 +112,54 @@
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
}
- // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
- 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());
+
+ //鏇存柊缁勬墭鏁版嵁鐘舵�佷负鍏ュ簱瀹屾垚 IoStatus ====>> 2
+ Wrapper<PltBarcode> wrapper = new EntityWrapper<PltBarcode>().eq("barcode", wrkDetl.getZpallet())
+ .eq("bill_no", wrkDetl.getBillNo()).eq("seq_no", wrkDetl.getSeqNo()).eq("mat_no", wrkDetl.getMatNo());
+ PltBarcode pltBarcode = pltBarcodeService.selectOne(wrapper);
+ if(null != pltBarcode) {
+ pltBarcode.setIoStatus(2);//鍏ュ簱瀹屾垚
+ boolean res = pltBarcodeService.update(pltBarcode, wrapper);
+ if(!res){
+// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊缁勬墭鏁版嵁澶辫触锛沎workNo={0}],[billNo={1}],[seqNo={2}]", wrkMast.getWrkNo(),wrkDetl.getBillNo(),wrkDetl.getSeqNo());
}
- } catch (Exception ignore){}
+ }
+
+ // 鏇存柊鍏ュ簱閫氱煡妗� 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());
+ }
+ }
}
// 淇敼搴撲綅鐘舵�� S ====>> F
if (locMast.getLocSts().equals("S")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -130,11 +183,42 @@
if (!locDetlService.updateAnfme(locDetl.getQty() - wrkDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
- // todo:luxiaotao 3)淇敼鍑哄簱閫氱煡妗� status ==> 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
if (locMast.getLocSts().equals("Q")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -155,7 +239,7 @@
for (WrkDetl wrkDetl:wrkDetls54) {
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
+ if (!locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[matNo={1}]", wrkMast.getWrkNo(), wrkDetl.getMatNo());
}
} else {
@@ -168,10 +252,42 @@
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")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -188,9 +304,9 @@
if (wrkDetls57.isEmpty()) {
exceptionHandle("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
}
- // todo:luxiaotao 3)淇敼鐩樼偣閫氱煡妗� status ==> Y
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -212,10 +328,11 @@
exceptionHandle("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触锛沎婧愬簱浣�={0}],[鐩爣搴撲綅={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
}
}
- // todo:luxiaotao 3)淇敼鐩樼偣閫氱煡妗� status ==> Y
// 淇敼婧愬簱浣嶇姸鎬� ==> O
LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
+ String fullPlt = sourceLoc.getFullPlt();
if (null != sourceLoc) {
+ sourceLoc.setFullPlt("N");
sourceLoc.setBarcode("");
sourceLoc.setLocSts("O");
sourceLoc.setModiTime(now);
@@ -225,6 +342,7 @@
}
}
// 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
+ locMast.setFullPlt(fullPlt);
locMast.setLocSts(locSts);
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -266,7 +384,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()))) {
@@ -274,6 +420,7 @@
}
// 淇敼婧愬簱浣嶇姸鎬� R ===>> O
if (locMast.getLocSts().equals("R")) {
+ locMast.setFullPlt("N");
locMast.setLocSts("O");
locMast.setBarcode("");
locMast.setModiTime(now);
@@ -287,6 +434,7 @@
case 110:
// 淇敼搴撲綅鐘舵�� R ===>> O
if (locMast.getLocSts().equals("R")) {
+ locMast.setFullPlt("N");
locMast.setLocSts("O");
locMast.setBarcode("");
locMast.setModiTime(now);
--
Gitblit v1.9.1