From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs

---
 src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
index 78d5074..de2b4cd 100644
--- a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
@@ -17,7 +17,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
 import java.util.Date;
 
 @Slf4j
@@ -118,9 +117,9 @@
                     return createInTask(result, wmsParam.getBarcode(), wmsParam.getStationCode());
                 }
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
-            log.info("璇锋眰wms鎶ラ敊锛寋}", e.getMessage());
+            log.info("璇锋眰wms鎶ラ敊锛屽叆鍙傦細{},寮傚父锛歿}",JSON.toJSONString(wmsParam), e.getMessage());
         } finally {
             addApiLog("鍏ュ簱浠诲姟璇锋眰鑾峰彇搴撲綅", wmsUrl + inboundTaskApplyPath, JSON.toJSONString(wmsParam), response, success);
         }
@@ -171,6 +170,7 @@
         taskWrk.setWrkNo(workNo1);
         taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//浠诲姟鐘舵�侊細娲惧彂
         taskWrk.setCreateTime(now);
+        taskWrk.setAssignTime(now);
         taskWrk.setIoType(1);//浠诲姟绫诲瀷
         taskWrk.setIoPri(13);//浼樺厛绾�
         taskWrk.setBarcode(barcode);//鏉$爜
@@ -178,7 +178,6 @@
         taskWrk.setCrnNo(locMast.getCrnNo());
         taskWrk.setTargetPoint(locNo);
         taskWrk.setStartPoint(startPoint + "");
-        taskWrk.setCrnNo(locMast.getCrnNo());
         if (taskWrk.getIoType() == 1) {
             taskWrk.setWrkSts(2);
             if (!Cools.isEmpty(taskWrk.getTargetPoint())) {

--
Gitblit v1.9.1