From 4ec829bcbe9d8370476b71c9692eb7b3ef6e5e6f Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 26 一月 2022 17:37:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 66 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 15 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 819eb95..2e0151d 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,10 @@
package com.zy.asrs.task.handler;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-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.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Cools;
+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;
@@ -19,6 +15,7 @@
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;
@@ -45,6 +42,14 @@
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.鍏ュ簱瀹屾垚
@@ -69,6 +74,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,25 +97,46 @@
}
// 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
for (WrkDetl wrkDetl : wrkDetls) {
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()).eq("supplier", wrkDetl.getSupplier()));
if (null != locDetl) {
boolean res = locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), wrkMast.getLocNo(), wrkDetl.getMatNo());
if (!res) {
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
} else {
+ WrkDetl wrk_no = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
+ .eq("wrk_no", wrkMast.getWrkNo()));
+
locDetl = new LocDetl();
+
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ locDetl.setMemo(wrkMast.getMemo());
VersionUtils.setLocDetl(locDetl, wrkDetl); // 鐗堟湰鎺у埗
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ if (!Cools.isEmpty(wrk_no)){
+ locDetl.setMemo(wrk_no.getMemo());
+ locDetl.setSupplier(wrk_no.getSupplier());
+ }
if (!locDetlService.insert(locDetl)) {
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
}
- // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ====>> 2
- WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>().eq("bill_no",wrkDetl.getBillNo()).eq("seq_no",wrkDetl.getSeqNo()));
+ //鏇存柊缁勬墭鏁版嵁鐘舵�佷负鍏ュ簱瀹屾垚 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());
+ }
+ }
+
+ // 鏇存柊鍏ュ簱閫氱煡妗� 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);
@@ -120,7 +147,7 @@
}
//鎻掑叆鍥炴姤妗� insert ====>> io_complete
- if("Y".equals(wrkMast.getLinkMis())){
+ if(erpEnabled && "Y".equals(wrkMast.getLinkMis())){
IoComplete ioComplete = new IoComplete();
ioComplete.setBillNo(wrkDetl.getBillNo());
ioComplete.setSeqNo(wrkDetl.getSeqNo());
@@ -142,6 +169,7 @@
}
// 淇敼搴撲綅鐘舵�� S ====>> F
if (locMast.getLocSts().equals("S")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -178,7 +206,7 @@
}
//鎻掑叆鍥炴姤妗� insert ====>> io_complete
- if("Y".equals(wrkMast.getLinkMis())){
+ if(erpEnabled && "Y".equals(wrkMast.getLinkMis())){
IoComplete ioComplete = new IoComplete();
ioComplete.setBillNo(wrkDetl.getBillNo());
ioComplete.setSeqNo(wrkDetl.getSeqNo());
@@ -200,6 +228,7 @@
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -246,7 +275,7 @@
}
//鎻掑叆鍥炴姤妗� insert ====>> io_complete
- if("Y".equals(wrkMast.getLinkMis())){
+ if(erpEnabled && "Y".equals(wrkMast.getLinkMis())){
IoComplete ioComplete = new IoComplete();
ioComplete.setBillNo(wrkDetl.getBillNo());
ioComplete.setSeqNo(wrkDetl.getSeqNo());
@@ -268,6 +297,7 @@
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -286,6 +316,7 @@
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -309,7 +340,9 @@
}
// 淇敼婧愬簱浣嶇姸鎬� ==> 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);
@@ -319,6 +352,7 @@
}
}
// 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
+ locMast.setFullPlt(fullPlt);
locMast.setLocSts(locSts);
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -371,7 +405,7 @@
}
//鎻掑叆鍥炴姤妗� insert ====>> io_complete
- if("Y".equals(wrkMast.getLinkMis())){
+ if(erpEnabled && "Y".equals(wrkMast.getLinkMis())){
IoComplete ioComplete = new IoComplete();
ioComplete.setBillNo(wrkDetl.getBillNo());
ioComplete.setSeqNo(wrkDetl.getSeqNo());
@@ -396,6 +430,7 @@
}
// 淇敼婧愬簱浣嶇姸鎬� R ===>> O
if (locMast.getLocSts().equals("R")) {
+ locMast.setFullPlt("N");
locMast.setLocSts("O");
locMast.setBarcode("");
locMast.setModiTime(now);
@@ -409,6 +444,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