From 04b1ba2cf7f144079f1ae65d5d24fdcda330d1f9 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 21 一月 2024 16:09:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 72 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 20 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 4391cba..8207b1c 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -51,28 +51,56 @@
try {
BasDevp basDevp = basDevpService.selectById(staNo);
Integer staOther = getStaOther(staNo);
- if (staOther==0) return SUCCESS;
+ Integer staEnd = getStaEnd(staNo);
+ if (staOther==0) return FAIL;
BasDevp basDevpOther = basDevpService.selectById(staOther);
if (Cools.isEmpty(basDevpOther) || basDevpOther.getReportSign()==1){
- return SUCCESS;
+ 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).eq("wrk_sts",51L));
+ 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:131);
+ singleMountUnstackingCompleteParam.setStaEnd(staEnd);
ReturnT<String> result = null;
- result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
- System.out.println(result);
if (true){
+ return FAIL;
+ }
+ result = postMesData(reportOutPath,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);
+// 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);
@@ -83,18 +111,9 @@
wrkMastService.updateById(wrkMast);
basDevp.setReportSign(1);
basDevpService.updateById(basDevp);
- 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);
+ basDevpEnd.setReportSign(1);
+ basDevpService.updateById(basDevpEnd);
+
return SUCCESS;
}else {
log.error("鎷嗗灈淇℃伅涓婁紶澶辫触");
@@ -119,7 +138,7 @@
.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);
@@ -161,4 +180,17 @@
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