From cacb1f0867e8aa5e4e4b8e941f3e9d5ce5a46406 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Mon, 21 Oct 2024 17:01:14 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E5=8F=96=E6=B6=88=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SchBaseVehiclematerialgroupServiceImpl.java       | 7 ++++---
 .../task/tasks/pcoperation/PcOperationCMTask.java          | 6 ++++++
 lms/nladmin-ui/src/views/wms/sch/task/index.vue            | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
index a254187..b1d7f64 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
@@ -191,7 +191,7 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
 
     @Override
     public Object createTask(JSONObject entity) {
-        Assert.noNullElements(new Object[]{entity.get("point_code2"), entity.get("vehicle_code")},"载具号不能为空!");
+        Assert.noNullElements(new Object[]{entity.get("point_code2"), entity.get("vehicle_code")}, "载具号不能为空!");
         JSONObject param = new JSONObject();
         param.put("device_code", entity.get("point_code2"));
         param.put("config_code", "PcOperationCMTask");
@@ -202,8 +202,9 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
                 .eq(SchBasePoint::getPoint_code, entity.get("point_code2"))
                 .eq(SchBasePoint::getPoint_status, GoodsEnum.OUT_OF_STOCK.getValue())
                 .set(SchBasePoint::getIs_lock, true));
-        vehiclematerialgroupMapper.delete(Wrappers.lambdaQuery(SchBaseVehiclematerialgroup.class)
-                .eq(SchBaseVehiclematerialgroup::getVehicle_code, entity.get("vehicle_code")));
+        this.update(Wrappers.lambdaUpdate(SchBaseVehiclematerialgroup.class)
+                .eq(SchBaseVehiclematerialgroup::getVehicle_code, entity.get("vehicle_code"))
+                .set(SchBaseVehiclematerialgroup::getIs_delete, true));
         return null;
     }
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/pcoperation/PcOperationCMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/pcoperation/PcOperationCMTask.java
index a533f8a..1c7dee2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/pcoperation/PcOperationCMTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/pcoperation/PcOperationCMTask.java
@@ -14,6 +14,7 @@ import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle;
 import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
 import org.nl.wms.ext.fab.service.dto.CallMaterVo;
 import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
+import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
 import org.nl.wms.sch.point.service.ISchBasePointService;
 import org.nl.wms.sch.point.service.dao.SchBasePoint;
 import org.nl.wms.sch.task.service.ISchBaseTaskService;
@@ -50,6 +51,8 @@ public class PcOperationCMTask extends AbstractTask {
     private ISchBasePointService schBasePointService;
     @Autowired
     private IMdBaseVehicleService iMdBaseVehicleService;
+    @Autowired
+    private ISchBaseVehiclematerialgroupService iSchBaseVehiclematerialgroupService;
 
     @Override
     protected void create() throws BadRequestException {
@@ -155,6 +158,9 @@ public class PcOperationCMTask extends AbstractTask {
             PointUtils.setUpdateByAcs(schBasePoint);
             schBasePointService.updateById(schBasePoint);
         }
+        iSchBaseVehiclematerialgroupService.update(Wrappers.lambdaUpdate(SchBaseVehiclematerialgroup.class)
+                .eq(SchBaseVehiclematerialgroup::getVehicle_code, taskObj.getVehicle_code())
+                .set(SchBaseVehiclematerialgroup::getIs_delete, false));
         // 获取参数
         taskObj.setTask_status(TaskStatus.CANCELED.getCode());
         taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
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 92d8154..80d73aa 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -225,6 +225,7 @@
             <el-button
               type="text"
               icon="el-icon-close"
+              :disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
               @click="doOperate(scope.row, 'b')"
             >取消</el-button>
             <el-button