From be25fdca12071375d82a09f78c1235322b4106d0 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 17 一月 2024 14:23:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 80 +++++++++++++++++++++++++++++++++------
1 files changed, 67 insertions(+), 13 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 e9209ba..613d2ed 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -22,7 +22,7 @@
/**
* Created by Monkey D. Luffy on 2023.07.25
- * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鑷姩琛ョ┖鏉�
+ * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鎷嗗灈淇℃伅涓婁紶
*/
@Slf4j
@Service
@@ -42,29 +42,46 @@
@Autowired
private BasDevpService basDevpService;
- @Value("${srXghyErp.url}")
+ @Value("${srHangJia.url}")
private String erpUrl;
- @Value("${srXghyErp.barcodeUploadPath}")
- private String barcodeUploadpath;
+ @Value("${srHangJia.reportOutPath}")
+ private String reportOutPath;
public ReturnT<String> start(int staNo) {
try {
BasDevp basDevp = basDevpService.selectById(staNo);
- if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992锛堜綘鍙互鑷畾涔夛級
+ Integer staOther = getStaOther(staNo);
+ Integer staEnd = getStaEnd(staNo);
+ if (staOther==0) return FAIL;
+ BasDevp basDevpOther = basDevpService.selectById(staOther);
+ if (Cools.isEmpty(basDevpOther) || basDevpOther.getReportSign()==1){
+ return FAIL;
+ }
+ BasDevp basDevpEnd = basDevpService.selectById(staEnd);
+ if (!basDevpEnd.getLoading().equals("Y") || !basDevpEnd.getAutoing().equals("Y") || !basDevpEnd.getInEnable().equals("Y")){
+ return FAIL;
+ }
+ if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0 ) || basDevpEnd.getWrkNo()>10000 || basDevpEnd.getReportSign()!=0){
+ return FAIL;
+ }
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd));
+ if (!Cools.isEmpty(wrkMast1)) return FAIL;
+ 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;
+ return FAIL;
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
- return SUCCESS;
+ return FAIL;
}
SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetls);
singleMountUnstackingCompleteParam.setStaStart(staNo);
- singleMountUnstackingCompleteParam.setStaEnd(staNo>119? 135:133);
+ singleMountUnstackingCompleteParam.setStaEnd(staEnd);
ReturnT<String> result = null;
- result = postMesData(barcodeUploadpath,singleMountUnstackingCompleteParam);
- System.out.println(result);
+ result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
+// System.out.println(result);
if (true){
for (WrkDetl wrkDetl:wrkDetls){
WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
@@ -74,19 +91,28 @@
}
wrkMast.setSheetNo("1");
wrkMastService.updateById(wrkMast);
+ basDevp.setReportSign(1);
+ basDevpService.updateById(basDevp);
+ basDevpEnd.setReportSign(1);
+ basDevpService.updateById(basDevp);
return SUCCESS;
}
if (result.getCode()==200){
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);
+ basDevp.setReportSign(1);
+ basDevpService.updateById(basDevp);
+ basDevpEnd.setReportSign(1);
+ basDevpService.updateById(basDevp);
return SUCCESS;
}else {
- log.error("鏉＄爜涓婁紶涓帶澶辫触");
+ log.error("鎷嗗灈淇℃伅涓婁紶澶辫触");
}
}
}catch (Exception e){
@@ -108,10 +134,10 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getString("result").equals("Y")) {
+ if (jsonObject.getInteger("Code")==200) {
success = true;
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);
+ log.error("鎷嗗灈淇℃伅涓婁紶璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);
throw new CoolException("涓婃姤erp绯荤粺澶辫触");
}
} catch (Exception e) {
@@ -135,4 +161,32 @@
}
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;
+ }
+ }
+
+ public Integer getStaEnd(Integer staNo){
+ switch (staNo){
+ case 118:
+ case 119:
+ return 131;
+ case 120:
+ case 121:
+ return 135;
+ default:
+ return 0;
+ }
+ }
}
--
Gitblit v1.9.1