From 083841bb6c40097e19b17022454fcc7f12b7f092 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 02 八月 2025 08:59:49 +0800
Subject: [PATCH] 1.更换订单出库策略,走托盘多的物料先出 2.完善出库作业工作档丢失导致出库站电视机不显示

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkLogScheduler.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkLogScheduler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkLogScheduler.java
index 7b8f1cc..38e2188 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkLogScheduler.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkLogScheduler.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.wms.task;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zy.asrs.common.wms.entity.WrkMast;
 import com.zy.asrs.common.wms.service.WrkMastService;
 import com.zy.asrs.framework.common.Cools;
@@ -31,6 +32,10 @@
             return;
         }
         for (WrkMast wrkMast : wrkMasts) {
+            WrkMast wrkMast1= wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getMemo,wrkMast.getWrkNo()));
+            if(!Cools.isEmpty(wrkMast1)){
+                continue;
+            }
             if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) {
                 if (Cools.isEmpty(wrkMast.getExitMk())) {
                     continue;
@@ -41,9 +46,14 @@
                 }
             }
 
-            ReturnT<String> result = workLogHandler.start(wrkMast);
-            if (!result.isSuccess()) {
+            try{
+                ReturnT<String> result = workLogHandler.start(wrkMast);
+                if (!result.isSuccess()) {
+                    log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo());
+                }
+            } catch (Exception e){
                 log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo());
+                log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�,寮傚父:{}", wrkMast.getWrkNo(),e.getMessage());
             }
         }
     }

--
Gitblit v1.9.1