From ff66ddf96807fac02e01c7d2ecdfd1ba808af9c5 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 25 四月 2026 18:42:10 +0800
Subject: [PATCH] wms下发任务给wcs时上锁,防止erp发送中止任务

---
 src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
index d0db053..bb6c85a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
@@ -163,6 +163,7 @@
         param.setCreateTime(formatDate(resolveCreateTime(wrkMast)));
         param.setBizNo(resolveBizNo(wrkDetls, waitPakin));
         param.setStartTime(formatDate(resolveStartTime(wrkMast, waitPakin)));
+        param.setPhotos(wrkDetls.get(0).getPic());
         return param;
     }
 
@@ -211,9 +212,6 @@
 //    }
 
     private Date resolveCreateTime(WrkMast wrkMast) {
-        if (!Cools.isEmpty(wrkMast.getCrnEndTime())) {
-            return wrkMast.getCrnEndTime();
-        }
         if (!Cools.isEmpty(wrkMast.getModiTime())) {
             return wrkMast.getModiTime();
         }

--
Gitblit v1.9.1