From aa0c2969838c2a794d9a45da7d4b67c5f6cb70a5 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 01 一月 2026 15:23:13 +0800
Subject: [PATCH] AGV回调

---
 src/main/java/com/zy/asrs/controller/OrderPakinController.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index 5dc404f..62d7fbf 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -12,6 +12,7 @@
 import com.zy.asrs.entity.result.WrkTraceVo;
 import com.zy.asrs.service.*;
 import com.zy.common.model.DetlDto;
+import com.zy.common.properties.CrossDockProperties;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +45,10 @@
     private WrkMastLogService wrkMastLogService;
     @Autowired
     private ClientService clientService;
+    @Autowired
+    private CrossDockService crossDockService;
+    @Autowired
+    private CrossDockProperties crossDockProperties;
 
     @RequestMapping(value = "/order/list/pda/page/auth")
     @ManagerAuth
@@ -206,6 +211,13 @@
                 }
             }
         }
+        
+        // 瓒婂簱鍔熻兘锛氬鏋滄槸瓒婂簱鍏ュ簱鍗曪紝璋冪敤瓒婂簱鏈嶅姟澶勭悊
+        if (param.getDocType() != null && param.getDocType().equals(crossDockProperties.getInboundDocTypeId())) {
+            String outOrderNo = crossDockService.processCrossDockInbound(order, param, getUserId());
+            return R.ok("瓒婂簱鍏ュ簱鍗曞垱寤烘垚鍔燂紝宸茶嚜鍔ㄧ敓鎴愯秺搴撳嚭搴撳崟锛�" + outOrderNo);
+        }
+        
         return R.ok("璁㈠崟娣诲姞鎴愬姛");
     }
 

--
Gitblit v1.9.1