From 948f59b1392e66e968a507a65f6945f1dd6da025 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期一, 14 十月 2024 15:21:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..7332e89 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2588,7 +2588,7 @@
type = 1;
}
if(inStn.getSourceStaNo() == 2102){
- weight = staProtocol.getWeight().doubleValue();
+ weight = staProtocol.getWeight().doubleValue()/10;
}
work1 = true;
@@ -2652,7 +2652,7 @@
}
if(inStn.getSourceStaNo() == 2102){
- weight2 = staProtocol.getWeight().doubleValue();
+ weight2 = staProtocol.getWeight().doubleValue()/10;
}
work2 = true;
@@ -2740,10 +2740,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 +2846,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