From 2ac0a78e50a93b88b3a6b3f3720f3eaf5972461e Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Tue, 24 Sep 2024 21:29:18 +0800
Subject: [PATCH] =?UTF-8?q?2024.9.24=20=E4=B8=80=E3=80=81=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=88=90=E6=9C=AC=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=EF=BC=88=E7=AC=AC=E4=BA=8C=E7=89=88=E4=BF=AE=E6=AD=A3=EF=BC=89?=
 =?UTF-8?q?=20=E4=BA=8C=E3=80=81=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=94=B9=E9=80=A0=20=E4=B8=89=E3=80=81?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E7=89=88=E4=BF=AE=E6=AD=A3=EF=BC=89=20=E5=9B=9B=E3=80=81?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E7=BB=84=20-=20=E6=A0=87=E5=87=86=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=B8=89=E7=89=88=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=EF=BC=89=20=E4=BA=94=E3=80=81=E5=95=86=E5=93=81=E7=BB=84=20-?=
 =?UTF-8?q?=20Process=20Time=20Matrix=EF=BC=88=E7=AC=AC=E4=BA=8C=E7=89=88?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StandardRoutingOperationController.java   | 22 +++++++++++++++++++
 .../data/StandardRoutingOperationData.java    |  4 ++++
 .../part/StandardRoutingOperationMapper.xml   |  2 ++
 3 files changed, 28 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/part/controller/StandardRoutingOperationController.java b/src/main/java/com/xujie/sys/modules/part/controller/StandardRoutingOperationController.java
index 13a75b63..9987a6e0 100644
--- a/src/main/java/com/xujie/sys/modules/part/controller/StandardRoutingOperationController.java
+++ b/src/main/java/com/xujie/sys/modules/part/controller/StandardRoutingOperationController.java
@@ -1,12 +1,19 @@
 package com.xujie.sys.modules.part.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xujie.sys.common.utils.PageUtils;
 import com.xujie.sys.common.utils.R;
+import com.xujie.sys.modules.part.data.PartGroupStdOperationsData;
 import com.xujie.sys.modules.part.data.StandardRoutingOperationData;
+import com.xujie.sys.modules.part.mapper.PartGroupStdOperationsMapper;
+import com.xujie.sys.modules.part.service.PartGroupStdOperationsService;
 import com.xujie.sys.modules.part.service.StandardRoutingOperationService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @description:
  * @author: jiayang_yue
@@ -21,6 +28,12 @@ public class StandardRoutingOperationController {
     @Autowired
     private StandardRoutingOperationService standardRoutingOperationService;
 
+    @Autowired
+    private PartGroupStdOperationsService partGroupStdOperationsService;
+
+    @Autowired
+    private PartGroupStdOperationsMapper partGroupStdOperationsMapper;
+
     @PostMapping("/searchStandardRoutingOperationList")
     @ResponseBody
     public R searchStandardRoutingOperationList(@RequestBody StandardRoutingOperationData data) {
@@ -44,7 +57,16 @@ public class StandardRoutingOperationController {
 
     @PostMapping("/deleteStandardRoutingOperation")
     @ResponseBody
+    @Transactional
     public R deleteStandardRoutingOperation(@RequestBody StandardRoutingOperationData data) {
+        QueryWrapper<PartGroupStdOperationsData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("operation_id", data.getId())
+                .eq("site", data.getSite())
+                .eq("bu_no", data.getBuNo());
+        List<PartGroupStdOperationsData> partGroupStdOperationsData = partGroupStdOperationsMapper.selectList(queryWrapper);
+        if (!partGroupStdOperationsData.isEmpty()) {
+            throw new RuntimeException("该标准工序已被商品组使用，无法删除！");
+        }
         standardRoutingOperationService.removeById(data.getId());
         return R.ok();
     }
diff --git a/src/main/java/com/xujie/sys/modules/part/data/StandardRoutingOperationData.java b/src/main/java/com/xujie/sys/modules/part/data/StandardRoutingOperationData.java
index 2c1e96a1..999ff7b1 100644
--- a/src/main/java/com/xujie/sys/modules/part/data/StandardRoutingOperationData.java
+++ b/src/main/java/com/xujie/sys/modules/part/data/StandardRoutingOperationData.java
@@ -59,6 +59,10 @@ public class StandardRoutingOperationData extends QueryPage implements Serializa
 
     private String setupLaborClassNo;
 
+    private Integer setupCrewSize;
+
+    private Integer crewSize;
+
     @TableField(exist = false)
     private String setupLaborClassDesc;
 
diff --git a/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml b/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml
index c5a194af..a8c31152 100644
--- a/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml
@@ -23,6 +23,8 @@
             update_date,
             update_by,
             setup_labor_class_no,
+            setup_crew_size,
+            crew_size,
             dbo.get_labor_class_desc(site,bu_no, setup_labor_class_no) as setup_labor_class_desc
         from
         standard_routing_operation