From 18ca574f7fd77c87b5bce54ab3326e7f7fa2e846 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 15 二月 2023 14:57:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   36 +-----------------------------------
 1 files changed, 1 insertions(+), 35 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 9a63749..25e48c1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2526,7 +2526,7 @@
                     wrkCharge.setCharge(steCharge.ssbm);
                     wrkCharge.setWrkNo(commonService.getChargeWorkNo(4));
                     wrkCharge.setWrkSts(21L);   // 21.鍑嗗鍏呯數
-                    wrkCharge.setCrnNo(2);  // 鍥哄畾2鍙峰爢鍨涙満
+                    wrkCharge.setCrnNo(1);  // 鍥哄畾1鍙峰爢鍨涙満
                     wrkCharge.setIoPri((double) 10);
                     wrkCharge.setLocNo(chargeLocNo);
                     wrkCharge.setMemo("charge");
@@ -2534,40 +2534,6 @@
                     if (!wrkChargeService.insert(wrkCharge)) {
                         News.error("淇濆瓨{}鍙风┛姊溅鍏呯數浠诲姟澶辫触!!!", ste.getId());
                         continue;
-                    }
-
-                    // 灏忚溅澶勪簬閫氶亾
-                    List<String> channel = slaveProperties.getChannel();
-                    for (String channelLocNo : channel) {
-                        if (steProtocol.getRow().intValue() == Utils.getRow(channelLocNo)
-                                && steProtocol.getBay().intValue() == Utils.getBay(channelLocNo)
-                                && steProtocol.getLev().intValue() == Utils.getLev(channelLocNo)) {
-                            Integer otherSte = existOtherSte(channelLocNo, wrkCharge.getSteNo());
-                            if (null != otherSte) {
-                                News.warn("{}鍙峰皬杞﹀厖鐢甸樆鏂紝鍘熷洜锛氶�氶亾瀛樺湪{}鍙风┛姊溅锛�", wrkCharge.getSteNo(), otherSte);
-                            } else {
-                                // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-                                SteCommand steCommand = new SteCommand();
-                                steCommand.setSteNo(wrkCharge.getSteNo()); // 绌挎杞︾紪鍙�
-                                steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙�
-                                steCommand.setTaskMode(SteTaskModeType.GO_ORIGIN);  // 鍘诲彸绔�
-
-                                steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), false).shortValue());
-                                steCommand.setBay(steProtocol.getBay());
-                                steCommand.setLev(steProtocol.getLev());
-                                if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
-                                    News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
-                                } else {
-                                    // 淇敼宸ヤ綔妗g姸鎬� 21.鍑嗗鍏呯數 ===> 25.灏忚溅璧拌
-                                    wrkCharge.setWrkSts(25L);
-                                    Date now = new Date();
-                                    wrkCharge.setModiTime(now);
-                                    if (!wrkChargeService.updateById(wrkCharge)) {
-                                        News.error("淇敼鍏呯數浠诲姟鐘舵�� 21.鍑嗗鍏呯數 ===> 25.灏忚溅璧拌 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
-                                    }
-                                }
-                            }
-                        }
                     }
 
                     // 澶勪簬鍏呯數搴撲綅缁�

--
Gitblit v1.9.1