From dd60ee6ab5c6e4d877d0957c2948f6529407782d Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Thu, 17 Oct 2024 17:51:46 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E6=89=8B=E6=8C=81=E5=8F=AB=E6=96=99?=
 =?UTF-8?q?=E9=80=81=E6=96=99=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HandheldServiceImpl.java     | 28 +++++++++++++++++++
 .../service/impl/SchBasePointServiceImpl.java |  3 +-
 .../task/tasks/handheld/RackTask.java         |  6 +++-
 .../src/views/wms/sch/task/index.vue          | 10 +++----
 4 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java
index 7b8e9a5..e28b1d7 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/handheld/service/impl/HandheldServiceImpl.java
@@ -89,14 +89,42 @@ public class HandheldServiceImpl implements HandheldService {
             case "3":
                 interiorAisle(vehicle, device_code, param);
                 break;
+            case "4":
+                applyDeliveryRacks(vehicle, device_code, param);
+                break;
             default:
                 break;
         }
 
     }
 
+    /**
+     * 空载具送回货架
+     *
+     * @param vehicle
+     * @param device_code
+     * @param param
+     */
+    private void applyDeliveryRacks(String vehicle, String device_code, JSONObject param) {
+        MdBaseVehicle mdBaseVehicle = iMdBaseVehicleService.selectByVehicleCode(vehicle);
+        if (ObjectUtil.isEmpty(mdBaseVehicle)) throw new BadRequestException("载具不存在!");
+        SchBasePoint schBasePoint = iSchBasePointService.selectByPointCode(device_code);
+        if (ObjectUtil.isEmpty(schBasePoint)) throw new BadRequestException("设备点位不存在!");
+        AbstractTask connectorTask = taskFactory.getTask("RACKTask");
+        // 准备参数：设备编码
+        JSONObject jo = new JSONObject();
+        jo.put("device_code", device_code);
+        jo.put("config_code", "RACKTask");
+        jo.put("create_mode", GeneralDefinition.AUTO_CREATION);
+        jo.put("vehicle_code", vehicle);
+        jo.put("vehicle_type", mdBaseVehicle.getVehicle_type());
+        jo.put("ext_data", param);
+        connectorTask.apply(jo);
+    }
+
     /**
      * 内部过道送托盘
+     *
      * @param vehicle
      * @param device_code
      * @param param
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
index c9a66f0..e7fdb8b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
@@ -396,7 +396,8 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
                 .eq(SchBasePoint::getIs_lock, false)
                 .eq(SchBasePoint::getIs_used, true)
                 .eq(SchBasePoint::getPoint_status, pointStatus)
-                .eq(SchBasePoint::getPoint_type, "1")
+                .eq(!vehicle_type.equals("G01"),SchBasePoint::getPoint_type, "1")
+                .eq(vehicle_type.equals("G01"),SchBasePoint::getPoint_type, "0")
                 .eq(StrUtil.isNotBlank(vehicle_type), SchBasePoint::getCan_vehicle_type, vehicle_type)
                 .isNull(seq == 2, SchBasePoint::getVehicles)
                 .isNull(seq == 1, SchBasePoint::getVehicle_code)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/handheld/RackTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/handheld/RackTask.java
index 2639d85..670aaa9 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/handheld/RackTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/handheld/RackTask.java
@@ -63,7 +63,11 @@ public class RackTask extends AbstractTask {
         for (SchBaseTask task : tasks) {
 
             String vehicle_type = task.getVehicle_type();
-            SchBasePoint schBasePoint = schBasePointService.selectByGroundPoint(RegionEnum.ZDZWQ.getRegion_code(),
+            String regionCode = RegionEnum.ZDZWQ.getRegion_code();
+            if(StrUtil.isNotBlank(vehicle_type) && VehicleTypeEnum.TRAY.getVehicleCode().equals(vehicle_type)){
+                regionCode = RegionEnum.LAG_ROBOT_BEANDING_CELL.getRegion_code();
+            }
+            SchBasePoint schBasePoint = schBasePointService.selectByGroundPoint(regionCode,
                     GoodsEnum.OUT_OF_STOCK.getValue(),vehicle_type, 1);
             if (ObjectUtil.isEmpty(schBasePoint)) {
                 task.setRemark("未找到所需点位!");
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index 4f82a34..92d8154 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -222,11 +222,11 @@
         <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
         <el-table-column v-permission="[]" label="操作" width="160px" align="center" fixed="right">
           <template slot-scope="scope">
-            <!--            <el-button-->
-            <!--              type="text"-->
-            <!--              icon="el-icon-upload"-->
-            <!--              @click="doOperate(scope.row, 'c')"-->
-            <!--            >下发</el-button>-->
+            <el-button
+              type="text"
+              icon="el-icon-close"
+              @click="doOperate(scope.row, 'b')"
+            >取消</el-button>
             <el-button
               type="text"
               icon="el-icon-success"