From b6de30f22118e4f8c467e08b228eea15ed9171d2 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 12 七月 2024 15:25:30 +0800
Subject: [PATCH] 日志打印

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 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 ba900d7..b334411 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -606,18 +606,18 @@
 
                         // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
                         if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
-//                            // 鑾峰彇娴呭簱浣嶏紝鐘舵�佷负S鐩存帴鍑猴紝鐘舵�佷负R锛屽垯鎵惧埌杩欎釜搴撲綅鐨勫伐浣滄。锛屾彁鍗囦紭鍏堢骇鍏堝嚭
-//                            String shallowLoc = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
-//                            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
-//                            if (locMast.getLocSts().equals("R")) {
-//                                List<TaskWrk> wrkMastList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("source_loc_no", locMast.getLocNo()));
-//                                if (!wrkMastList.isEmpty()) {
-//                                    TaskWrk wrkMast = wrkMastList.get(0);
-//                                    wrkMast.setIoPri(99);
-//                                    taskWrkMapper.updateById(wrkMast);
-//                                    continue;
-//                                }
-//                            }
+                            // 鑾峰彇娴呭簱浣嶏紝鐘舵�佷负S鐩存帴鍑猴紝鐘舵�佷负R锛屽垯鎵惧埌杩欎釜搴撲綅鐨勫伐浣滄。锛屾彁鍗囦紭鍏堢骇鍏堝嚭
+                            String shallowLoc = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
+                            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
+                            if (locMast.getLocSts().equals("R")) {
+                                List<TaskWrk> wrkMastList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("source_loc_no", locMast.getLocNo()));
+                                if (!wrkMastList.isEmpty()) {
+                                    TaskWrk wrkMast = wrkMastList.get(0);
+                                    wrkMast.setIoPri(99);
+                                    taskWrkMapper.updateById(wrkMast);
+                                    continue;
+                                }
+                            }
 
                             taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
 
@@ -832,6 +832,7 @@
             if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) {
                 //鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
                 TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(),crnProtocol.getTaskNo().intValue());
+                log.info("鏀跺埌鐢宠瀹屾垚璇锋眰锛�" + taskWrk.toString());
                 if (Cools.isEmpty(taskWrk)) {
 //                    log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗c�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
                     continue;
@@ -1054,7 +1055,7 @@
             try {
                 taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
             } catch (Exception e) {
-                log.error("鑷姩娲惧彂浠诲姟寮傚父锛�"+e.getMessage()+"{" + taskWrk.toString());
+//                log.error("鑷姩娲惧彂浠诲姟寮傚父锛�"+e.getMessage()+"{" + taskWrk.toString());
             }
         }
     }

--
Gitblit v1.9.1