From 9fc9a5d498cef94d0dae58c22609e79c4fa0f5f0 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 16 七月 2024 13:25:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java | 27 ++++++++++++++++++---------
src/main/java/com/zy/core/Slave.java | 2 ++
src/main/java/com/zy/core/thread/ScaleThread.java | 5 ++---
src/main/resources/application.yml | 6 +++++-
4 files changed, 27 insertions(+), 13 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 c27ab6a..a584cca 100644
--- a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
@@ -68,23 +68,32 @@
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()!=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.setBatch(wrkDetls.get(0).getBatch());
- staEscalationParam.setOrderNo(wrkDetls.get(0).getSpecs());
- staEscalationParam.setTaskNo(wrkDetls.get(0).getModel());
- staEscalationParam.setWeight(wrkDetls.get(0).getWeight());
+ staEscalationParam.setMatnr(wrkDetl.getMatnr());
+ staEscalationParam.setBatch(wrkDetl.getBatch());
+ staEscalationParam.setOrderNo(wrkDetl.getSpecs());
+ staEscalationParam.setTaskNo(wrkDetl.getModel());
+ staEscalationParam.setWeight(wrkDetl.getWeight());
ReturnT<String> result = postMesData(reportOutPath,staEscalationParam);
if (result.getCode()==200){
wrkMast.setSheetNo("2");
@@ -116,7 +125,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);
diff --git a/src/main/java/com/zy/core/Slave.java b/src/main/java/com/zy/core/Slave.java
index 5d38e9d..ae58208 100644
--- a/src/main/java/com/zy/core/Slave.java
+++ b/src/main/java/com/zy/core/Slave.java
@@ -14,4 +14,6 @@
private Integer port;
+ private Integer staNo;
+
}
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index dc7bf98..6e9be47 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -54,8 +54,7 @@
//灏嗙О閲嶉噸閲忓啓鍏ヨ澶囧熀纭�鏁版嵁涓殑gross_wt瀛楁
if(scale > 20) {
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
- Integer staNo = slave.getId() == 1 ? 101 : 201;
- BasDevp basDevp = basDevpService.selectById(staNo);
+ BasDevp basDevp = basDevpService.selectById(slave.getStaNo());
if(!Cools.isEmpty(basDevp)) {
basDevp.setGrossWt(scale);
if (null != basDevpService && !basDevpService.updateById(basDevp)) {
@@ -63,7 +62,7 @@
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
- jsonObject.put("id", staNo);
+ jsonObject.put("id", slave.getStaNo());
jsonObject.put("scale", scale);
if (OutputQueue.SCALE.size() >= 32) {
OutputQueue.SCALE.poll();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6f51d81..951cd9b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -670,18 +670,22 @@
id: 1
ip: 10.10.10.211
port: 5005
+ staNo: 281
# 纾呯Г
scale[1]:
id: 2
ip: 10.10.10.212
port: 5005
+ staNo: 292
# 纾呯Г
scale[2]:
id: 3
ip: 10.10.10.213
port: 5005
+ staNo: 453
# 纾呯Г
scale[3]:
id: 4
ip: 10.10.10.214
- port: 5005
\ No newline at end of file
+ port: 5005
+ staNo: 460
\ No newline at end of file
--
Gitblit v1.9.1