From 41074b338be9cff71a43d910deab3ba6a7bfb69f Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 12 一月 2024 21:10:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 84 ++++++++++++++++++++++++++++++++++--------
1 files changed, 68 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
index dc0b0d6..0da9fed 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -5,8 +5,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.SingleMountUnstackingCompleteParam;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -18,6 +18,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
/**
* Created by Monkey D. Luffy on 2023.07.25
* 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鑷姩琛ョ┖鏉�
@@ -28,11 +30,11 @@
public class ReportToDismantleTheStackHandler extends AbstractHandler<String> {
@Autowired
- private WaitPakinService waitPakinService;
+ private WrkMastService wrkMastService;
@Autowired
- private LocMastService locMastService;
+ private WrkDetlSingleService wrkDetlSingleService;
@Autowired
- private CommonService commonService;
+ private WrkDetlService wrkDetlService;
@Autowired
private StaDescService staDescService;
@Autowired
@@ -48,17 +50,52 @@
public ReturnT<String> start(int staNo) {
try {
BasDevp basDevp = basDevpService.selectById(staNo);
- if (!Cools.isEmpty(basDevp) && !Cools.isEmpty(basDevp.getBarcode()) && basDevp.getWrkNo()==9992){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992锛堜綘鍙互鑷畾涔夛級
- WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", basDevp.getBarcode()));
- if (Cools.isEmpty(waitPakin)){
- ReturnT<String> result = null;
- result = postMesData(barcodeUploadpath,basDevp);
- System.out.println(result);
- if (result.getCode()==200){
- return SUCCESS;
- }else {
- log.error("鏉＄爜涓婁紶涓帶澶辫触");
+ Integer staOther = getStaOther(staNo);
+ if (staOther==0) return SUCCESS;
+ BasDevp basDevpOther = basDevpService.selectById(staOther);
+ if (Cools.isEmpty(basDevpOther) || basDevpOther.getReportSign()==1){
+ return SUCCESS;
+ }
+ if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992涓帶(妗佹灦)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭紙浣犲彲浠ヨ嚜瀹氫箟锛�
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if (Cools.isEmpty(wrkMast) || !wrkMast.getSheetNo().equals("0")){
+ return SUCCESS;
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
+ return SUCCESS;
+ }
+ SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetls);
+ singleMountUnstackingCompleteParam.setStaStart(staNo);
+ singleMountUnstackingCompleteParam.setStaEnd(staNo>119? 135:131);
+ ReturnT<String> result = null;
+ result = postMesData(barcodeUploadpath,singleMountUnstackingCompleteParam);
+ System.out.println(result);
+ if (true){
+ for (WrkDetl wrkDetl:wrkDetls){
+ WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
+ wrkDetlSingle.sync(wrkDetl);
+ wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
+ wrkDetlSingleService.insert(wrkDetlSingle);
}
+ wrkMast.setSheetNo("1");
+ wrkMastService.updateById(wrkMast);
+ return SUCCESS;
+ }
+ if (result.getCode()==200){
+ for (WrkDetl wrkDetl:wrkDetls){
+ WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
+ wrkDetlSingle.sync(wrkDetl);
+ wrkDetlSingleService.insert(wrkDetlSingle);
+ }
+ wrkMast.setSheetNo("1");
+ wrkMastService.updateById(wrkMast);
+ basDevp.setReportSign(1);
+ basDevpService.updateById(basDevp);
+ return SUCCESS;
+ }else {
+ log.error("鏉＄爜涓婁紶涓帶澶辫触");
}
}
}catch (Exception e){
@@ -94,7 +131,7 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "涓婃姤erp绯荤粺",
+ "涓婃姤妗佹灦绯荤粺",
erpUrl + erpPath,
null,
erpUrl,
@@ -107,4 +144,19 @@
}
return SUCCESS;
}
+
+ public Integer getStaOther(Integer staNo){
+ switch (staNo){
+ case 118:
+ return 119;
+ case 119:
+ return 118;
+ case 120:
+ return 121;
+ case 121:
+ return 120;
+ default:
+ return 0;
+ }
+ }
}
--
Gitblit v1.9.1