生产工序代码-生产工序参数修改

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

@@ -36,6 +36,18 @@ public class ProductionProcessController {
     private ProductionStatusService productionStatusService;
 
 
+//    @GetMapping("/select")
+//    @Operation(summary = "查看登录用户的工序信息")
+//    @Parameter(name = "id", description = "用户ID", required = true, example = "1")
+    //@PreAuthorize("@ss.hasPermission('manage:process:query')")
+    public CommonResult<List<UserProcessRespVO>> getUserPage(@Valid @RequestParam("id") Long id) {
+
+        return success(productionProcessService.getProcess(id));
+
+
+    }
+
+
 
     @GetMapping("/page")
     @Operation(summary = "查看生产工序分页")
@@ -69,6 +81,7 @@ public class ProductionProcessController {
     @PreAuthorize("@ss.hasPermission('manage:process:query')")
     public CommonResult<List<OrderModuleVO>> selectPlateName(@Valid @RequestParam("stepItemId") Long stepItemId){
 
+
         return success(productionProcessService.selectPlateName(stepItemId));
 
     }

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

@@ -15,7 +15,7 @@ public class ProcessPageReqVO extends PageParam {
 
 
     @Schema(description = "工序 id", requiredMode = Schema.RequiredMode.REQUIRED,example = "11")
-    private Long id;
+    private Long processID;
 
     @Schema(description = "订单状态",requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
     private Boolean status;

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

@@ -42,6 +42,10 @@ public class ProcessRespVO {
     private String phoneNumber;
 
 
+    @Schema(description = "工序ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD")
+    private Long processID;
+
+
     @Schema(description = "生产单工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "123")
     private Long processStepId;
 
@@ -59,6 +63,9 @@ public class ProcessRespVO {
     @Schema(description = "加工人", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD")
     private String manager;
 
+    @Schema(description = "加工状态", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD")
+    private Boolean processStatus;
+
     @Schema(description = "业务员", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD")
     private String salesman;
 

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

@@ -0,0 +1,61 @@
+package com.cf.imes.module.manage.controller.admin.process.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 -  工序信息表 Response VO")
+@Data
+public class UserProcessRespVO {
+
+    @Schema(description = "主键-工序ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private Long id;
+
+    @Schema(description = "组织ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private Long organId;
+
+    @Schema(description = "工序名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private String name;
+
+    @Schema(description = "计件工资", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private Double pieceRate;
+
+    @Schema(description = "计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private Long pieceType;
+
+    @Schema(description = "工序类型：0 全部加工 1 开料 2 部件加工 3 异形封边 4 分堆 5 打包 6 出库 7 组件加工 8 板材", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private Long type;
+
+
+    @Schema(description = "是否推送终端客户：0 否 1 是", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private Boolean isCustom;
+
+
+    @Schema(description = "是否推送经销商：0 否 1 是", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private Boolean isDealer;
+
+
+    @Schema(description = "排序优先级", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private Long sort;
+
+
+    @Schema(description = "小时产量", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private Double hourCapacity;
+
+
+    @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private String unit;
+
+
+    @Schema(description = "是否启用：0 否 1 是", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private Boolean isEnabled;
+
+
+    @Schema(description = "准备时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private String prepareTime;
+
+
+    @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "11")
+    private String description;
+
+}

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

@@ -10,6 +10,9 @@ import java.util.List;
 public interface ProductionProcessService {
 
 
+    // 查看登录用户的工序信息
+    List<UserProcessRespVO> getProcess(Long id);
+
     // 生产工序单分页查询
     PageResult<ProcessRespVO> getProcessPage(ProcessPageReqVO pageReqVO);
 
@@ -25,4 +28,5 @@ public interface ProductionProcessService {
     List<OrderModuleVO> selectPlateName(Long stepItemId);
 
 
+
 }

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

@@ -9,7 +9,7 @@ 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.OrderProcessStepItemNDO;
 import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepNDO;
-import com.cf.imes.module.manage.dal.mysql.process.OrderProcessMapper;
+import com.cf.imes.module.manage.dal.mysql.process.ProcessMapper;
 import com.cf.imes.module.manage.dal.mysql.process.ProcessStepItemMapper;
 import com.cf.imes.module.manage.dal.mysql.process.ProcessStepMapper;
 import com.cf.imes.module.manage.dal.mysql.process.ProductionProcessMapper;
@@ -38,6 +38,7 @@ import static com.baomidou.mybatisplus.core.toolkit.Wrappers.update;
 public class ProductionProcessServiceImpl implements ProductionProcessService {
 
 
+
     @Resource
     private ProcessStepMapper processStepMapper;
 
@@ -45,6 +46,20 @@ public class ProductionProcessServiceImpl implements ProductionProcessService {
     @Resource
     private ProcessStepItemMapper processStepItemMapper;
 
+    @Resource
+    private ProcessMapper processMapper;
+
+
+
+    // 查看登录用户的工序信息
+    @Override
+    public List<UserProcessRespVO> getProcess(Long id) {
+
+        processMapper.selectProcessByID(id);
+
+        return null;
+    }
+
 
 
     // 生产工序单分页查询
@@ -143,6 +158,8 @@ public class ProductionProcessServiceImpl implements ProductionProcessService {
     }
 
 
+
+
 }
 
 

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

@@ -20,11 +20,12 @@
         <result property="customOrderNo" column="customOrderNo"/>
         <result property="customer" column="customer"/>
         <result property="address" column="address"/>
-        <result property="status" column="status"/>
+        <result property="processStatus" column="processStatus"/>
         <result property="stepName" column="processName"/>
         <result property="name" column="name"/>
         <result property="manager" column="manager"/>
         <result property="processStepId" column="processStepId"/>
+        <result property="processID" column="processID"/>
 
     </resultMap>
 
@@ -36,19 +37,20 @@
         o.custom_order_no as customOrderNo,
         o.customer as customer,
         o.address as address,
-        ops.status as status,
+        ops.status as processStatus,
         opsi.name as name,
         opsi.id as stepItemId,
         ops.Name as processName,
         ops.manager as manager,
-        ops.id as processStepId
+        ops.id as processStepId,
+        ops.processinfo_id as processID
         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
 
         <where>
             <if test="id != null">
-                and ops.processinfo_id = #{id}
+                and ops.processinfo_id = #{processID}
             </if>
             <if test="status != null">
                 and opsi.status = #{status}