From 04048d2a63603c14cb6c76ba6cd9aad91ca5172a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 九月 2024 13:33:38 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 4680c18..013fb4d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2277,7 +2277,7 @@
             crnCommand.setSourcePosX(crnStn.getRow().shortValue());     // 婧愬簱浣嶆帓
             crnCommand.setSourcePosY(crnStn.getBay().shortValue());     // 婧愬簱浣嶅垪
             crnCommand.setSourcePosZ(crnStn.getLev().shortValue());     // 婧愬簱浣嶅眰
-            crnCommand.setDestinationPosX((short) (locMast.getRow1()+slave.getOffset()));     // 鐩爣搴撲綅鎺�
+            crnCommand.setDestinationPosX(locMast.getRow1().shortValue());     // 鐩爣搴撲綅鎺�
             crnCommand.setDestinationPosY(locMast.getBay1().shortValue());     // 鐩爣搴撲綅鍒�
             crnCommand.setDestinationPosZ(locMast.getLev1().shortValue());     // 鐩爣搴撲綅灞�
             crnCommand.setLocType1(locMast.getLocType1());     // 璐х墿绫诲瀷
@@ -2468,7 +2468,7 @@
                     crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
                     crnCommand.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
                     crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡:  搴撲綅绉昏浆
-                    crnCommand.setSourcePosX((short)(locMast.getRow1()+slave.getOffset()));     // 婧愬簱浣嶆帓
+                    crnCommand.setSourcePosX(locMast.getRow1().shortValue());     // 婧愬簱浣嶆帓
                     crnCommand.setSourcePosY(locMast.getBay1().shortValue());     // 婧愬簱浣嶅垪
                     crnCommand.setSourcePosZ(locMast.getLev1().shortValue());     // 婧愬簱浣嶅眰
                     crnCommand.setDestinationPosX(crnStn.getRow().shortValue());     // 鐩爣搴撲綅鎺�
@@ -2521,7 +2521,7 @@
                         log.info("绌烘《寮哄埗鍏ュ簱锛�"+staProtocol.getAmount());
                         matCodeStore.setAnfme(Double.valueOf(staProtocol.getAmount()));
                     }else {
-                        matCodeStore.setAnfme(8d) ;
+                        matCodeStore.setAnfme(4d) ;
                     }
                     ArrayList<FullStoreParam.MatCodeStore> matCodeStores = new ArrayList<>();
                     matCodeStores.add(matCodeStore);

--
Gitblit v1.9.1