From 80f5bd729e3147f3b62bb701c045e6183dff87e3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 29 十月 2024 15:48:16 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
index 08d7636..a462bfd 100644
--- a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
@@ -68,20 +68,34 @@
if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992涓帶(妗佹灦)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭紙浣犲彲浠ヨ嚜瀹氫箟锛�
if (staProtocol.isAutoing() && staProtocol.getWorkNo()!=0){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()).ne("sheet_no","2"));
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()));
if (Cools.isEmpty(wrkMast)) return FAIL;
+ if (wrkMast.getSheetNo().equals("2")) return FAIL;
+ if (wrkMast.getSheetNo()!=null && wrkMast.getSheetNo()=="2") return FAIL;
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ WrkDetl wrkDetl = null;
if (Cools.isEmpty(wrkDetls) || wrkDetls.isEmpty()){
- return FAIL;
+// return FAIL;
+ wrkDetl = new WrkDetl();
+ wrkDetl.setMatnr("1");
+ wrkDetl.setBatch("1");
+ wrkDetl.setModel("1");
+ wrkDetl.setSpecs("1");
+ wrkDetl.setWeight(1.0);
+ } else {
+ wrkDetl = wrkDetls.get(0);
}
-
log.error("2妤肩炕杞�掓枡淇℃伅涓婁紶鏃讹紝绔欑偣鐘舵�侊細"+JSON.toJSONString(staProtocol));
log.error("2妤肩炕杞�掓枡淇℃伅涓婁紶鏃讹紝宸ヤ綔鍙凤細"+JSON.toJSONString(wrkMast));
StaEscalationParam staEscalationParam = new StaEscalationParam();
staEscalationParam.setDevNo(staNo);
- staEscalationParam.setIoType(wrkMast.getIoType()==101? 1:3);
- staEscalationParam.setMatnr(wrkDetls.get(0).getMatnr());
- staEscalationParam.setWeight(wrkDetls.get(0).getWeight());
+ staEscalationParam.setIoType(wrkMast.getIoTypeMes$());
+ staEscalationParam.setMatnr(wrkDetl.getMatnr());
+ staEscalationParam.setBatch(wrkDetl.getBatch());
+ staEscalationParam.setOrderNo(wrkDetl.getSpecs());
+ staEscalationParam.setTaskNo(wrkDetl.getModel());
+ staEscalationParam.setWeight(wrkDetl.getWeight());
+ staEscalationParam.setWrkno(wrkDetl.getWrkNo().toString());
ReturnT<String> result = postMesData(reportOutPath,staEscalationParam);
if (result.getCode()==200){
wrkMast.setSheetNo("2");
@@ -113,7 +127,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("Code")==200) {
+ if (jsonObject.getInteger("code")==200) {
success = true;
} else {
log.error("2妤肩炕杞�掓枡淇℃伅涓婁紶璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);
--
Gitblit v1.9.1