生产工序代码-生产工序新增查询当前工序信息

2026-08-12 21:02:08 +08:00 · 2024-05-07 17:10:09 +08:00
parent 8788eef90d
commit 10ae0caf1f
8 changed files with 128 additions and 40 deletions
@@ -7,6 +7,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.controller.admin.query.vo.productionStatus.OrderPlateRespVO;
 import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.PlatePageVO;
+import com.cf.imes.module.manage.dal.dataobject.process.ProcessDO;
 import com.cf.imes.module.manage.service.process.ProductionProcessService;
 import com.cf.imes.module.manage.service.query.ProductionStatusService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -36,13 +37,13 @@ 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("/select")
+    @Operation(summary = "查看组织的工序信息")
+    //@PreAuthorize("@ss.hasPermission('manage:process:query')")
+    public CommonResult<List<ProcessDO>> getUserPage() {
+
+        return success(productionProcessService.getProcess());


    }
@@ -0,0 +1,78 @@
+package com.cf.imes.module.manage.dal.dataobject.process;
+
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.cf.imes.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
+
+@TableName("imes_base.process")
+@KeySequence("process_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProcessDO extends BaseDO {
+
+    /**
+     * 工序 ID
+     */
+    @TableId
+    private Long id;
+    /**
+     * 工序名称
+     */
+    private String name;
+    /**
+     * 计件工资
+     */
+    private Double pieceRate;
+    /**
+     * 计件类型：1 数量 2 长度 3 平方 4 宽 5 高 6 体积 7 生产单金额百分比
+     */
+    private Integer pieceType;
+    /**
+     * 工序类型：0 全部加工 1 开料 2 部件加工 3 异形封边 4 分堆 5 打包 6 出库 7 组件加工 8 板材
+     */
+    private Integer type;
+    /**
+     * 是否推送终端客户：0 否 1 是
+     */
+    private Boolean isCustom;
+    /**
+     * 是否推送经销商：0 否 1 是
+     */
+    private Boolean isDealer;
+    /**
+     * 排序优先级
+     */
+    private Short sort;
+    /**
+     * 小时产量
+     */
+    private Double hourCapacity;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 是否启用：0 否 1 是
+     */
+    private Boolean isEnabled;
+    /**
+     * 准备时间
+     */
+    private Double prepareTime;
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 组织id
+     */
+    private Long organId;
+}
@@ -1,26 +0,0 @@
-package com.cf.imes.module.manage.dal.mysql.process;
-
-
-import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
-import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessNDO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
-
-import java.util.List;
-
-/**
- * 生产单工序表 order_process_{N} Mapper
- *
- * @author 晨丰科技
- */
-@Mapper
-public interface OrderProcessMapper extends BaseMapperX<OrderProcessNDO> {
-
-
-
-
-
-
-}
@@ -0,0 +1,31 @@
+package com.cf.imes.module.manage.dal.mysql.process;
+
+
+import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
+import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.cf.imes.module.manage.controller.admin.process.vo.UserProcessRespVO;
+import com.cf.imes.module.manage.dal.dataobject.process.ProcessDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+/**
+ * 生产单工序表 order_process_{N} Mapper
+ *
+ * @author 晨丰科技
+ */
+@Mapper
+public interface ProcessMapper extends BaseMapperX<ProcessDO> {
+
+
+    default List<ProcessDO> selectProcessList(Long organId) {
+        return selectList(new LambdaQueryWrapperX<ProcessDO>()
+                .orderByDesc(ProcessDO::getId)
+                .eqIfPresent(ProcessDO::getOrganId, organId)
+                .eqIfPresent(ProcessDO::getIsEnabled, true));
+    }
+
+
+}
@@ -5,7 +5,6 @@ import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 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.OrderProcessNDO;
 import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepItemNDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -4,14 +4,16 @@ package com.cf.imes.module.manage.service.process;
 import com.cf.imes.framework.common.pojo.PageResult;
 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;

 import java.util.List;

 public interface ProductionProcessService {


-    // 查看登录用户的工序信息
-    List<UserProcessRespVO> getProcess(Long id);
+    // 查看组织的工序信息
+    List<ProcessDO> getProcess();
+

    // 生产工序单分页查询
    PageResult<ProcessRespVO> getProcessPage(ProcessPageReqVO pageReqVO);
@@ -4,11 +4,13 @@ package com.cf.imes.module.manage.service.process;
 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.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;
 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.dataobject.process.ProcessDO;
 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;
@@ -51,13 +53,14 @@ public class ProductionProcessServiceImpl implements ProductionProcessService {



-    // 查看登录用户的工序信息
+    // 查看组织的工序信息
    @Override
-    public List<UserProcessRespVO> getProcess(Long id) {
+    public List<ProcessDO> getProcess() {

-        processMapper.selectProcessByID(id);
+        // 获取组织id
+        Long organId = OrganContextHolder.getOrganId();
+        return processMapper.selectProcessList(organId);

-        return null;
    }


@@ -49,7 +49,7 @@
        join order_process_step_item opsi on ops.id = opsi.process_step_id

        <where>
-            <if test="id != null">
+            <if test="processID != null">
                and ops.processinfo_id = #{processID}
            </if>
            <if test="status != null">