From c9a3592c20b7913dd9949383721ae26c32563eb7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 02 十一月 2024 10:25:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 8d43987..f77025b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2082,7 +2082,7 @@
&& basDevp.getWrkNo() == 0 && basDevp.getCanining().equals("Y")){
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo((short) 9997);
- staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ staProtocol.setStaNo((short) (basDevp.getDevNo()==1004?1003:1013));
// staProtocol.setStaNo((short) 1013);
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol));
@@ -2588,12 +2588,13 @@
type = 1;
}
if(inStn.getSourceStaNo() == 2102){
- weight = staProtocol.getWeight().doubleValue();
+ weight = staProtocol.getWeight().doubleValue()/10;
}
work1 = true;
if (inStn.getSourcePlcId() == 4 || inStn.getSourcePlcId() ==5){ //鐏岃绔欓渶瑕佽幏鍙栬緭閫佺嚎鐗╂枡浠ｇ爜
matnr = staProtocol.getMatnr();
+ batch = staProtocol.getBatch();
}
devpThread.setPakMk(inStn.getSourceStaNo(),false);
@@ -2652,12 +2653,13 @@
}
if(inStn.getSourceStaNo() == 2102){
- weight2 = staProtocol.getWeight().doubleValue();
+ weight2 = staProtocol.getWeight().doubleValue()/10;
}
work2 = true;
if (inStn.getSourcePlcId() == 4){
matnr2 = staProtocol.getMatnr();
+ batch2 = staProtocol.getBatch();
}
devpThread.setPakMk(inStn.getSourceStaNo(),false);
break;
@@ -2740,10 +2742,10 @@
log.info("{}鍙穜gv宸ヤ綅涓�宸ヤ綔瀹屾垚澶嶄綅,宸ヤ綔鍙�:{}",rgvSlave.getId(),rgvProtocol.getTaskNo1());
if (offer){
//瀹屾垚rgv浠诲姟
- Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", rgvProtocol.getRgvNo()).eq("wrk_no", rgvProtocol.getTaskNo1());
+ Wrapper<WrkMastSta> wrkMastStaWrapper = new EntityWrapper<WrkMastSta>().eq("wrk_crn", rgvSlave.getId()).eq("wrk_no", rgvProtocol.getTaskNo1());
WrkMastSta wrkMastSta1 = wrkMastStaService.selectOne(wrkMastStaWrapper);
if (Cools.isEmpty(wrkMastSta1)){
- log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鏈壘鍒板搴攔gv浠诲姟,{}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
+ log.error("瀹屾垚{}鍙疯溅宸ヤ綅涓�浠诲姟鏈壘鍒板搴攔gv浠诲姟,{}",rgvSlave.getId(),rgvProtocol.getTaskNo1());
}else {
if (wrkMastSta1.getWrkType() == 8 ){
wrkMastSta1.setWrkSts(3);
@@ -2846,7 +2848,7 @@
WrkMastSta wrkMastSta = wrkMastStaService.selectByRgvNoandWrkNo(rgvSlave.getId(), rgvProtocol.getTaskNo1());
WrkMast wrkMast = wrkMastService.selectByworkNo(rgvProtocol.getTaskNo1());
if (Cools.isEmpty(wrkMastSta)){
- log.error("鏈煡璇㈠埌rgv宸ヤ綔浠诲姟锛宺gv缂栧彿{},宸ヤ綔鍙穥}",rgvProtocol.getRgvNo(),rgvProtocol.getTaskNo1());
+ log.error("鏈煡璇㈠埌rgv宸ヤ綔浠诲姟锛宺gv缂栧彿{},宸ヤ綔鍙穥}",rgvSlave.getId(),rgvProtocol.getTaskNo1());
continue;
}
for (RgvSlave.Sta outStn :rgvSlave.getOutStn()){
--
Gitblit v1.9.1