From 8808ebb9bb3eb8e6bc9ed8bfc6cfaf53e63d6614 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 02 十一月 2023 16:44:20 +0800
Subject: [PATCH] 日志统计

---
 src/main/java/com/zy/common/web/WcsController.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index a0081aa..5524d58 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -53,6 +53,8 @@
     private AgvWorkService agvWorkService;
     @Autowired
     private AgvBasDevpService agvBasDevpService;
+    @Autowired
+    private AgvWrkMastService agvWrkMastService;
 //    @Autowired
 //    private ErpService erpService;
 
@@ -347,12 +349,17 @@
         if(Cools.isEmpty(agvBasDevp) || !"O".equals(agvBasDevp.getLocSts())){
             throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦ㄦ垨鑰呯珯鐐逛笉涓虹┖");
         }
+        //鍘绘壘agv宸ヤ綔妗d换鍔�
+        if(!Cools.isEmpty(agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
+                .eq("barcode",containerCode)))){
+            throw new CoolException("璇ユ枡绠辨鍦ㄥ叆搴撲腑");
+        }
         //缁戝畾绔欑偣
         agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
 
         //鐢熸垚宸ヤ綔妗�
         List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
-        agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null);
+        agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null, true);
 
 
         return R.ok();

--
Gitblit v1.9.1