生产工序代码-生产工序-查看板件信息修改

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

@@ -3,6 +3,7 @@ package com.cf.imes.module.manage.controller.admin.process;
 
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.pojo.PageResult;
+import com.cf.imes.module.executor.controller.admin.plate.vo.BodyPlateDetailVO;
 import com.cf.imes.module.manage.controller.admin.process.vo.*;
 import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO;
 import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderPlateRespVO;
@@ -38,6 +39,7 @@ public class ProductionProcessController {
 
 
 
+
     @GetMapping("/select")
     @Operation(summary = "查看组织的工序信息")
     //@PreAuthorize("@ss.hasPermission('manage:process:query')")
@@ -99,4 +101,11 @@ public class ProductionProcessController {
 
 
 
+    @GetMapping("/aaabb")
+    @Operation(summary = "查看板件信息")
+    @PreAuthorize("@ss.hasPermission('manage:process:query')")
+    public CommonResult<List<BodyPlateDetailVO> > abc(@Valid ProcessPlateReqVO reqVO){
+        return success(productionProcessService.getOrderPlate(reqVO));
+    }
+
 }

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

@@ -0,0 +1,27 @@
+package com.cf.imes.module.manage.controller.admin.process.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 查询板件")
+@Data
+@ToString(callSuper = true)
+public class ProcessPlateReqVO {
+
+    @Schema(description = "工序类型",requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long processType;
+
+    @Schema(description = "生产单号",requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long orderId;
+
+
+    @Schema(description = "工序明细ID",requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long stepItemId;
+
+
+
+
+}

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

@@ -53,6 +53,8 @@ public class ProcessRespVO {
     @Schema(description = "工序明细ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "123")
     private Long processStepItemId;
 
+    @Schema(description = "工序类型", requiredMode = Schema.RequiredMode.REQUIRED,example = "123")
+    private Long processType;
 
     @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/ProcessStepStatus.java

@@ -3,6 +3,8 @@ package com.cf.imes.module.manage.controller.admin.process.vo;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ProcessStepStatus {
 
@@ -15,4 +17,7 @@ public class ProcessStepStatus {
     //  工序步骤表的类型
     private Long type;
 
+    //  柜体id
+    private List<Long> bodyId;
+
 }

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

@@ -2,6 +2,7 @@ package com.cf.imes.module.manage.service.process;
 
 
 import com.cf.imes.framework.common.pojo.PageResult;
+import com.cf.imes.module.executor.controller.admin.plate.vo.BodyPlateDetailVO;
 import com.cf.imes.module.manage.controller.admin.process.vo.*;
 import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO;
 import com.cf.imes.module.manage.dal.dataobject.process.ProcessDO;
@@ -30,5 +31,5 @@ public interface ProductionProcessService {
     List<OrderModuleVO> selectPlateName(Long stepItemId);
 
 
-
+    List<BodyPlateDetailVO> getOrderPlate(ProcessPlateReqVO reqVO);
 }

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

@@ -5,6 +5,8 @@ import com.cf.imes.framework.common.enums.ProcessingStatusEnum;
 import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
+import com.cf.imes.module.executor.controller.admin.plate.vo.BodyPlateDetailVO;
+import com.cf.imes.module.executor.service.plate.PlateServiceImpl;
 import com.cf.imes.module.manage.config.VocieParameters;
 import com.cf.imes.module.manage.controller.admin.process.vo.*;
 import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO;
@@ -51,6 +53,9 @@ public class ProductionProcessServiceImpl implements ProductionProcessService {
     @Resource
     private ProcessMapper processMapper;
 
+    @Resource
+    private PlateServiceImpl plateService;
+
 
 
     // 查看组织的工序信息
@@ -162,6 +167,19 @@ public class ProductionProcessServiceImpl implements ProductionProcessService {
 
 
 
+    // 查询板件信息
+    @Override
+    public List<BodyPlateDetailVO> getOrderPlate(ProcessPlateReqVO reqVO) {
+
+        if(reqVO.getProcessType() == 7){
+
+        }
+
+//        plateService.getPlateModelByPlateId()
+
+        return null;
+    }
+
 
 }
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusService.java

@@ -3,6 +3,7 @@ package com.cf.imes.module.manage.service.query;
 
 import com.cf.imes.framework.common.pojo.PageResult;
 
+import com.cf.imes.module.executor.controller.admin.plate.vo.BodyPlateDetailVO;
 import com.cf.imes.module.manage.controller.admin.pack.vo.OrderPartsReqVO;
 import com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO;
 import com.cf.imes.module.manage.controller.admin.query.vo.pack.OrderPackagePageReqVO;
@@ -60,8 +61,4 @@ public interface ProductionStatusService {
 
     // 导出缺板
     PageResult<PlateDetailsRespVO> getMissingBoard(OrderPartsReqVO pageReqVO);
-
-
-
-
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/query/ProductionStatusServiceImpl.java

@@ -27,8 +27,6 @@ import javax.annotation.Resource;
 import java.util.List;
 
 
-import static com.sun.xml.bind.WhiteSpaceProcessor.replace;
-
 @Service
 @Validated
 public class ProductionStatusServiceImpl implements ProductionStatusService {
@@ -211,7 +209,4 @@ public class ProductionStatusServiceImpl implements ProductionStatusService {
 
 
 
-
-
-
 }

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

@@ -26,6 +26,7 @@
         <result property="manager" column="manager"/>
         <result property="processStepId" column="processStepId"/>
         <result property="processID" column="processID"/>
+        <result property="processType" column="processType"/>
 
     </resultMap>
 
@@ -43,7 +44,8 @@
         ops.Name as processName,
         ops.manager as manager,
         ops.id as processStepId,
-        ops.processinfo_id as processID
+        ops.processinfo_id as processID,
+        ops.type as processType
         from order_process_step ops
         join `order` o on ops.order_id = o.id
         join order_process_step_item opsi on ops.id = opsi.process_step_id