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 | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 0d02f62..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,14 +1,9 @@
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.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;
@@ -46,6 +41,8 @@
private WaitMatoutService waitMatoutService;
@Autowired
private IoCompleteService ioCompleteService;
+ @Autowired
+ private PltBarcodeService pltBarcodeService;
/**
* ERP鎺ュ彛鏄惁鍚敤
@@ -76,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);
@@ -115,6 +113,18 @@
}
}
+ //鏇存柊缁勬墭鏁版嵁鐘舵�佷负鍏ュ簱瀹屾垚 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()){
@@ -149,6 +159,7 @@
}
// 淇敼搴撲綅鐘舵�� S ====>> F
if (locMast.getLocSts().equals("S")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -207,6 +218,7 @@
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -275,6 +287,7 @@
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -293,6 +306,7 @@
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
+ locMast.setFullPlt(wrkMast.getFullPlt());
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -316,7 +330,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);
@@ -326,6 +342,7 @@
}
}
// 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
+ locMast.setFullPlt(fullPlt);
locMast.setLocSts(locSts);
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
@@ -403,6 +420,7 @@
}
// 淇敼婧愬簱浣嶇姸鎬� R ===>> O
if (locMast.getLocSts().equals("R")) {
+ locMast.setFullPlt("N");
locMast.setLocSts("O");
locMast.setBarcode("");
locMast.setModiTime(now);
@@ -416,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