From f3de21a928fd73a1c9f66a7fe4d24afb1c9916af Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 24 十一月 2024 10:25:48 +0800
Subject: [PATCH] #cs1
---
src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 a584cca..d2000cb 100644
--- a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
@@ -70,7 +70,8 @@
if (staProtocol.isAutoing() && staProtocol.getWorkNo()!=0){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()));
if (Cools.isEmpty(wrkMast)) return FAIL;
- if (wrkMast.getSheetNo()!=null && wrkMast.getSheetNo()=="2") return FAIL;
+ if (wrkMast.getIoType()==1 || wrkMast.getIoType()==10) return FAIL;
+ if (wrkMast.getSheetNo()!=null && wrkMast.getSheetNo().equals("2")) return FAIL;
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
WrkDetl wrkDetl = null;
if (Cools.isEmpty(wrkDetls) || wrkDetls.isEmpty()){
@@ -88,12 +89,13 @@
log.error("2妤肩炕杞�掓枡淇℃伅涓婁紶鏃讹紝宸ヤ綔鍙凤細"+JSON.toJSONString(wrkMast));
StaEscalationParam staEscalationParam = new StaEscalationParam();
staEscalationParam.setDevNo(staNo);
- staEscalationParam.setIoType(wrkMast.getIoType()==101? 1:3);
+ 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(Cools.isEmpty(wrkDetl.getWrkNo()) ? "0":wrkDetl.getWrkNo().toString());
ReturnT<String> result = postMesData(reportOutPath,staEscalationParam);
if (result.getCode()==200){
wrkMast.setSheetNo("2");
@@ -107,7 +109,7 @@
}
}
}catch (Exception e){
- log.error("寮傚父锛侊紒锛�"+e);
+ log.error("寮傚父4锛侊紒锛�"+e);
return FAIL;
}
return FAIL;
--
Gitblit v1.9.1