生产工序接口逻辑，参数修改

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessStepItemVO.java

@@ -13,12 +13,16 @@ import lombok.NoArgsConstructor;
 public class OrderProcessStepItemVO {
 
 
-    @Schema(description = "工序明细ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "11")
+//    @Schema(description = "生产单工序明细ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "11")
-    private Long stepItemId;
+//    private Long processStepItemId;
 
 
-    @Schema(description = "工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "11")
+    @Schema(description = "生产单工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "11")
-    private Long stepId;
+    private Long processStepId;
+
+
+    @Schema(description = "加工项名称", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD")
+    private String name;
 
 
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPageReqVO.java

@@ -17,11 +17,11 @@ public class ProcessPageReqVO extends PageParam {
     @Schema(description = "工序 id", requiredMode = Schema.RequiredMode.REQUIRED,example = "11")
     private Long processID;
 
-    @Schema(description = "订单状态",requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
+    @Schema(description = "加工状态",requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
-    private Boolean status;
+    private Boolean processStatus;
 
     @Schema(description = "生产单号")
-    private Long orderNo;
+    private Long orderId;
 
     @Schema(description = "自定义单号")
     private String customOrderNo;

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPlateReqVO.java

@@ -19,8 +19,16 @@ public class ProcessPlateReqVO {
     private Long orderId;
 
 
-    @Schema(description = "工序明细ID",requiredMode = Schema.RequiredMode.REQUIRED)
+//    @Schema(description = "工序明细ID",requiredMode = Schema.RequiredMode.REQUIRED)
-    private Long stepItemId;
+//    private Long stepItemId;
+
+
+    @Schema(description = "生产单工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "11")
+    private Long processStepId;
+
+
+    @Schema(description = "加工项名称", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD")
+    private String name;
 
 
     @Schema(description = "柜体ID")

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessRespVO.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 public class ProcessRespVO {
 
     @Schema(description = "主键-生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
-    private Long id;
+    private Long orderId;
 
     @Schema(description = "自定义单号", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD")
     private String customOrderNo;
@@ -50,8 +50,8 @@ public class ProcessRespVO {
     private Long processStepId;
 
 
-    @Schema(description = "工序明细ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "123")
+//    @Schema(description = "生产单工序明细ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "123")
-    private Long processStepItemId;
+//    private Long processStepItemId;
 
     @Schema(description = "工序类型", requiredMode = Schema.RequiredMode.REQUIRED,example = "123")
     private Long processType;

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java

@@ -27,10 +27,10 @@ public interface ProcessStepItemMapper extends BaseMapperX<OrderProcessStepItemN
     void updateStatus(@Param("id") Long id);
 
 
-    ProcessStepStatus selectStatusById(@Param("id") Long id);
+    ProcessStepStatus selectStatusById(@Param("id") Long id,@Param("name") String name);
 
-    @Update("update order_process_step_item set status = true where id = #{stepItemId}")
+    @Update("update order_process_step_item set status = true where process_step_id = #{stepItemId} and name = #{name}")
-    void updateStemStatus(Long stepItemId);
+    void updateStemStatus(@Param("stepItemId")  Long stepItemId,@Param("name") String name);
 
 
 
@@ -43,6 +43,6 @@ public interface ProcessStepItemMapper extends BaseMapperX<OrderProcessStepItemN
 
 
 
-    List<OrderPlateReqVO> selectBodyIds(@Param("stepItemId") Long stepItemId);
+    List<OrderPlateReqVO> selectBodyIds(@Param("processStepId") Long processStepId,@Param("name") String name);
 
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java

@@ -27,13 +27,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collection;
-import java.util.List;
 import java.util.stream.Collectors;
 
 import static com.baomidou.mybatisplus.core.toolkit.Wrappers.update;
@@ -109,10 +108,11 @@ public class ProductionProcessServiceImpl implements ProductionProcessService {
 
     // 修改工序明细表的工序状态
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateProcessStatus(OrderProcessStepItemVO reqVo) {
 
         // 根据工序明细 id 查询当前生产单步骤和明细的生产状态
-        ProcessStepStatus processStepStatuses = processStepItemMapper.selectStatusById(reqVo.getStepItemId());
+        ProcessStepStatus processStepStatuses = processStepItemMapper.selectStatusById(reqVo.getProcessStepId(),reqVo.getName());
 
 
         // 判断生产明细表的状态查询后是否为空
@@ -129,12 +129,12 @@ public class ProductionProcessServiceImpl implements ProductionProcessService {
         // 判断生产单工序的状态是否为组件加工
         if(processStepStatuses.getType() == 7){
 
-            processStepItemMapper.updateStemStatus(reqVo.getStepItemId());
+            processStepItemMapper.updateStemStatus(reqVo.getProcessStepId(),reqVo.getName());
 
-            List<OrderProcessStepItemNDO> orderProcessStepItemNDOS = processStepItemMapper.selectStemById(reqVo.getStepId(),ProcessingStatusEnum.RAW.getStatus());
+            List<OrderProcessStepItemNDO> orderProcessStepItemNDOS = processStepItemMapper.selectStemById(reqVo.getProcessStepId(),ProcessingStatusEnum.RAW.getStatus());
             if(orderProcessStepItemNDOS.isEmpty()){
                 // 修改生产单工序步骤表的状态
-                processStepMapper.updateStatusById(reqVo.getStepId());
+                processStepMapper.updateStatusById(reqVo.getProcessStepId());
 
             }
 
@@ -145,7 +145,7 @@ public class ProductionProcessServiceImpl implements ProductionProcessService {
         try {
 
             // 修改生产明细表和步骤表的工序状态
-            processStepItemMapper.updateStatus(reqVo.getStepItemId());
+            processStepItemMapper.updateStatus(reqVo.getProcessStepId());
         }catch (Exception e){
             throw  ServiceExceptionUtil.exception(ErrorCodeConstants.UNPROCESSED_BEFORE_PROCESSING);
         }
@@ -205,7 +205,7 @@ public class ProductionProcessServiceImpl implements ProductionProcessService {
 
         if(reqVO.getProcessType() == 7){
             // 等于 7(组件加工) ，根据明细ID查询对应的柜体ID，再传入方法查询对应的板材信息
-            List<OrderPlateReqVO> plateDetails = processStepItemMapper.selectBodyIds(reqVO.getStepItemId());
+            List<OrderPlateReqVO> plateDetails = processStepItemMapper.selectBodyIds(reqVO.getProcessStepId(),reqVO.getName());
 
             return plateDetails;
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml

@@ -26,7 +26,7 @@
             JOIN order_process_step  ops ON opsi.process_step_id = ops.id
             SET opsi.status = TRUE,
                 ops.status = TRUE
-        WHERE opsi.id = #{id};
+        WHERE ops.id = #{id};
 
 
 
@@ -34,14 +34,15 @@
 
 
     <select id="selectStatusById" resultType="com.cf.imes.module.manage.controller.admin.process.vo.ProcessStepStatus"
-            parameterType="java.lang.Long">
+            parameterType="java.lang.Object">
 
-        select opsi.status as processStepItemStatus,
+        select distinct
+               opsi.status as processStepItemStatus,
                ops.status as processStepStatus,
                ops.type as type
         from order_process_step_item opsi
                  join order_process_step ops on opsi.process_step_id = ops.id
-        where opsi.id = #{id};
+        where opsi.process_step_id = #{id} and opsi.name = #{name};
 
 
     </select>
@@ -68,7 +69,7 @@
     </resultMap>
     <select id="selectBodyIds"
             resultMap="PlateMap"
-            parameterType="java.lang.Long">
+            parameterType="java.lang.Object">
 
 
         select
@@ -83,7 +84,7 @@
                  join order_item oi on opsi.body_id = oi.body_id
                  join order_body ob on oi.body_id = ob.id
                  join order_plate op on oi.plate_id = op.id
-        where opsi.id = #{stepItemId}
+        where opsi.process_step_id = #{processStepId} and opsi.name = #{name}
 
 
     </select>

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml

@@ -15,8 +15,8 @@
 
     <resultMap id="OrderMap" type="com.cf.imes.module.manage.controller.admin.process.vo.ProcessRespVO">
 
-        <result property="id" column="orderId"/>
+        <result property="orderId" column="orderId"/>
-        <result property="processStepItemId" column="stepItemId"/>
+<!--        <result property="processStepItemId" column="stepItemId"/>-->
         <result property="customOrderNo" column="customOrderNo"/>
         <result property="customer" column="customer"/>
         <result property="address" column="address"/>
@@ -40,7 +40,7 @@
         o.address as address,
         ops.status as processStatus,
         opsi.name as name,
-        opsi.id as stepItemId,
+--         opsi.id as stepItemId,
         ops.Name as processName,
         ops.manager as manager,
         ops.id as processStepId,
@@ -54,11 +54,11 @@
             <if test="processID != null">
                 and ops.processinfo_id = #{processID}
             </if>
-            <if test="status != null">
+            <if test="processStatus != null">
-                and opsi.status = #{status}
+                and opsi.status = #{processStatus}
             </if>
-            <if test="orderNo != null">
+            <if test="orderId != null">
-                and o.id = #{orderNo}
+                and o.id = #{orderId}
             </if>
             <if test="customOrderNo != null">
                 and o.custom_order_no = #{customOrderNo}