From 6f088dc1cb716e345da064a5e89f148bd248c75d Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 30 四月 2024 10:54:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index dc2fe42..f08cbde 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
+import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.service.*;
@@ -55,6 +56,13 @@
         int wrkNo = agvWrkMast.getWrkNo();
         String barcode = agvWrkMast.getBarcode();
         String orderNo = getOrderNoByWrkNo(wrkNo);
+        String agvBasDevp = "";
+        if (agvWrkMast.getIoType() > 100) {
+            agvBasDevp = agvWrkMast.getLocNo();
+        } else {
+            agvBasDevp = agvWrkMast.getSourceLocNo();
+        }
+
 
         //淇敼宸ヤ綔妗g姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
         agvWrkMast.setWrkSts(207L);
@@ -152,6 +160,12 @@
     public ReturnT<String> completedCarryWrk2(AgvWrkMast agvWrkMast) {
         int wrkNo = agvWrkMast.getWrkNo();
         String orderNo = getOrderNoByWrkNo(wrkNo);
+        String agvBasDevp = "";
+        if (agvWrkMast.getIoType() > 100) {
+            agvBasDevp = agvWrkMast.getLocNo();
+        } else {
+            agvBasDevp = agvWrkMast.getSourceLocNo();
+        }
         //淇敼宸ヤ綔妗g姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
         agvWrkMast.setWrkSts(207L);
         agvWrkMastService.updateById(agvWrkMast);

--
Gitblit v1.9.1