fix：委外计划

easydo-mes/src/main/java/easydo/technology/controller/OutsourcingPlanController.java

@@ -0,0 +1,41 @@
+package easydo.technology.controller;
+
+import easydo.technology.model.OutsourcingPlan;
+import easydo.technology.service.OutsourcingPlanService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/outsourcingPlan")
+public class OutsourcingPlanController {
+
+    @Resource
+    private OutsourcingPlanService outsourcingPlanService;
+
+    @RequestMapping(value = "/getPage")
+    public Object getPage(@RequestBody Map<String, Object> map) throws Exception {
+        Map<String, Object> result = outsourcingPlanService.getPage(map);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @RequestMapping(value = "/save")
+    public Object save(@RequestBody OutsourcingPlan model) throws Exception {
+        return new ResponseEntity<>(outsourcingPlanService.save(model), HttpStatus.OK);
+    }
+
+    @RequestMapping(value = "/update")
+    public Object update(@RequestBody OutsourcingPlan model) throws Exception {
+        return new ResponseEntity<>(outsourcingPlanService.update(model), HttpStatus.OK);
+    }
+
+    @RequestMapping(value = "/remove")
+    public Object remove(@RequestBody OutsourcingPlan model) throws Exception {
+        return new ResponseEntity<>(outsourcingPlanService.remove(model), HttpStatus.OK);
+    }
+}

easydo-mes/src/main/java/easydo/technology/enums/MESEnum.java

@@ -17,6 +17,7 @@ public enum MESEnum {
     FLOW_NO_TYPE_SALE_ORDER("sale_order", "销售订单"),
     FLOW_NO_TYPE_WAREHOUSE("warehouse", "仓库管理"),
     FLOW_NO_TYPE_PURCHASE_PLAN("purchase_plan", "采购计划"),
+    FLOW_NO_TYPE_OUTSOURCING_PLAN("outsourcing_plan", "委外计划"),
 
     PROCESS_STAGE_OF_CATEGORY_PREPARATION("preparation","准备工序"),
     PROCESS_STAGE_OF_CATEGORY_PROCESSING("processing","加工工序"),

easydo-mes/src/main/java/easydo/technology/model/OutsourcingPlan.java

@@ -0,0 +1,29 @@
+package easydo.technology.model;
+
+import easydo.technology.annotation.Minio;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@Minio
+@EqualsAndHashCode(callSuper = true)
+public class OutsourcingPlan extends CommonModel {
+    private String id;
+    private String code;
+    private String name;
+    private String saleOrderId;
+    private String createTime;
+    private Long createId;
+    private Long updateId;
+    private String status;
+    private String tenantId;
+    private String updateTime;
+    private String beginDate;
+    private String endDate;
+
+    // 非数据库字段
+    private List<OutsourcingPlanDetail> childrenList;
+    private SaleOrder saleOrder;
+}

easydo-mes/src/main/java/easydo/technology/model/OutsourcingPlanDetail.java

@@ -0,0 +1,16 @@
+package easydo.technology.model;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class OutsourcingPlanDetail {
+    private String id;
+    private String planId;
+    private String materialCode;
+    private BigDecimal number;
+
+    // 非数据库字段
+    private ProductMaterial material;
+}

easydo-mes/src/main/java/easydo/technology/service/FlowNoService.java

@@ -35,6 +35,7 @@ public class FlowNoService {
     private final Object productBomLock = new Object();
     private final Object salePlanLock = new Object();
     private final Object purchasePlanLock = new Object();
+    private final Object outsourcingPlanLock = new Object();
 
 
     /**
@@ -533,6 +534,62 @@ public class FlowNoService {
         }
     }
 
+    /**
+     * 生成委外计划编码 (OutsourcingPlan) - 独立解耦实现
+     */
+    public String generateOutsourcingPlanCode(OutsourcingPlan model, Connection connection) throws Exception {
+        synchronized (outsourcingPlanLock) {
+            String manualCode = model.getCode();
+            String tenantId = model.getTenantId();
+            if (StringUtil.isNotEmpty(manualCode)) {
+                Map<String, Object> checkMap = new HashMap<>();
+                checkMap.put("code", manualCode);
+                checkMap.put("tenantId", tenantId);
+                int count = (int) jdbcClient.getJdbcCountByMap(checkMap, OutsourcingPlan.class, connection);
+                if (count > 0) {
+                    throw new BizException("委外计划编号已存在: " + manualCode);
+                }
+                return manualCode;
+            }
+
+            while (true) {
+                FlowNo flowNo = new FlowNo();
+                flowNo.setType(MESEnum.FLOW_NO_TYPE_OUTSOURCING_PLAN.getValue());
+                flowNo.setTenantId(tenantId);
+                flowNo = jdbcClient.getJdbcModel(flowNo, connection);
+                if (flowNo == null) throw new BizException("未配置委外计划流水号规则");
+
+                String currDate = DFY_MD.format(LocalDateTime.now());
+                String currDate2 = DFY_MD_2.format(LocalDateTime.now());
+                if (StringUtil.isEmpty(flowNo.getCurrDate()) || !flowNo.getCurrDate().equals(currDate)) {
+                    flowNo.setCurrDate(currDate);
+                    flowNo.setCurrSeq(1);
+                } else {
+                    flowNo.setCurrSeq(flowNo.getCurrSeq() + 1);
+                }
+
+                String no;
+                if (StringUtil.isEmpty(flowNo.getCurrDate())) {
+                    no = (flowNo.getPrefix() != null ? flowNo.getPrefix() : "") + String.format("%06d", flowNo.getCurrSeq());
+                } else {
+                    no = (flowNo.getPrefix() != null ? flowNo.getPrefix() : "") + currDate2 + String.format("%05d", flowNo.getCurrSeq());
+                }
+                flowNo.setCurrNo(no);
+
+                Map<String, Object> updateMap = new HashMap<>();
+                updateMap.put("type", MESEnum.FLOW_NO_TYPE_OUTSOURCING_PLAN.getValue());
+                updateMap.put("tenantId", tenantId);
+                jdbcClient.jdbcUpdate(flowNo, updateMap, connection);
+
+                Map<String, Object> checkMap = new HashMap<>();
+                checkMap.put("code", no);
+                checkMap.put("tenantId", tenantId);
+                int count = (int) jdbcClient.getJdbcCountByMap(checkMap, OutsourcingPlan.class, connection);
+                if (count == 0) return no;
+            }
+        }
+    }
+
     /**
      * 原始流水号生成方法
      */

easydo-mes/src/main/java/easydo/technology/service/OutsourcingPlanService.java

@@ -0,0 +1,27 @@
+package easydo.technology.service;
+
+import easydo.technology.model.OutsourcingPlan;
+
+import java.util.Map;
+
+public interface OutsourcingPlanService {
+    /**
+     * 分页查询委外计划
+     */
+    Map<String, Object> getPage(Map<String, Object> map) throws Exception;
+
+    /**
+     * 保存委外计划
+     */
+    OutsourcingPlan save(OutsourcingPlan model) throws Exception;
+
+    /**
+     * 更新委外计划
+     */
+    OutsourcingPlan update(OutsourcingPlan model) throws Exception;
+
+    /**
+     * 删除委外计划
+     */
+    OutsourcingPlan remove(OutsourcingPlan model) throws Exception;
+}

easydo-mes/src/main/java/easydo/technology/service/impl/OutsourcingPlanServiceImpl.java

@@ -0,0 +1,177 @@
+package easydo.technology.service.impl;
+
+import easydo.technology.components.JdbcClient;
+import easydo.technology.exception.BizException;
+import easydo.technology.model.OutsourcingPlan;
+import easydo.technology.model.OutsourcingPlanDetail;
+import easydo.technology.model.ProductMaterial;
+import easydo.technology.model.SaleOrder;
+import easydo.technology.service.FlowNoService;
+import easydo.technology.service.OutsourcingPlanService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class OutsourcingPlanServiceImpl implements OutsourcingPlanService {
+
+    @Resource
+    private JdbcClient jdbcClient;
+
+    @Resource
+    private DataSource dataSource;
+
+    @Resource
+    private FlowNoService flowNoService;
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Map<String, Object> getPage(Map<String, Object> map) throws Exception {
+        Connection connection = dataSource.getConnection();
+        try {
+            // 1. 分页查询委外计划主表
+            Map<String, Object> result = jdbcClient.getJdbcPage(map, OutsourcingPlan.class, connection);
+            List<OutsourcingPlan> list = (List<OutsourcingPlan>) result.get("records");
+            if (list == null || list.isEmpty()) {
+                if (result != null) {
+                    result.put("records", new ArrayList<>());
+                }
+                return result;
+            }
+
+            for (OutsourcingPlan model : list) {
+                // 2. 补全文件列表 (JdbcClient 会根据 @Minio 注解自动处理)
+                try {
+                    jdbcClient.getMinioFile(model, connection);
+                } catch (Exception e) {}
+
+                // 3. 补全销售订单信息
+                if (model.getSaleOrderId() != null) {
+                    SaleOrder saleOrderParam = new SaleOrder();
+                    saleOrderParam.setId(model.getSaleOrderId());
+                    model.setSaleOrder(jdbcClient.getJdbcModelById(saleOrderParam, connection));
+                }
+
+                // 4. 补全明细列表及物料信息
+                OutsourcingPlanDetail detailParam = new OutsourcingPlanDetail();
+                detailParam.setPlanId(model.getId());
+                List<OutsourcingPlanDetail> detailList = jdbcClient.getJdbcList(detailParam, connection);
+                if (detailList != null) {
+                    for (OutsourcingPlanDetail detail : detailList) {
+                        if (detail.getMaterialCode() != null) {
+                            ProductMaterial materialParam = new ProductMaterial();
+                            materialParam.setCode(detail.getMaterialCode());
+                            detail.setMaterial(jdbcClient.getJdbcModel(materialParam, connection));
+                        }
+                    }
+                    model.setChildrenList(detailList);
+                } else {
+                    model.setChildrenList(new ArrayList<>());
+                }
+            }
+
+            result.put("records", list);
+            return result;
+        } catch (Exception e) {
+            throw new BizException(e.getMessage());
+        } finally {
+            if (connection != null) {
+                connection.close();
+            }
+        }
+    }
+
+    @Override
+    public OutsourcingPlan save(OutsourcingPlan model) throws Exception {
+        Connection connection = dataSource.getConnection();
+        connection.setAutoCommit(false);
+        try {
+            // 1. 生成委外计划流水号 (支持手动编号校验与自动生成)
+            String code = flowNoService.generateOutsourcingPlanCode(model, connection);
+            model.setCode(code);
+            
+            // 2. 设置初始状态为待处理 (pending)
+            model.setStatus("pending");
+
+            // 3. 插入主表 (JdbcClient 会自动处理 model 继承自 CommonModel 的 fileList 附件)
+            jdbcClient.jdbcInsert(model, connection);
+
+            // 4. 插入委外计划明细
+            List<OutsourcingPlanDetail> detailList = model.getChildrenList();
+            if (detailList != null) {
+                for (OutsourcingPlanDetail detail : detailList) {
+                    detail.setPlanId(model.getId());
+                    jdbcClient.jdbcInsert(detail, connection);
+                }
+            }
+
+            connection.commit();
+            return model;
+        } catch (Exception e) {
+            connection.rollback();
+            throw new BizException(e.getMessage());
+        } finally {
+            connection.close();
+        }
+    }
+
+    @Override
+    public OutsourcingPlan update(OutsourcingPlan model) throws Exception {
+        Connection connection = dataSource.getConnection();
+        connection.setAutoCommit(false);
+        try {
+            // 1. 更新主表 (JdbcClient 自动同步 fileList 附件)
+            jdbcClient.jdbcUpdateById(model, connection);
+
+            // 2. 级联更新明细：先按 planId 物理删除旧明细
+            OutsourcingPlanDetail removeParam = new OutsourcingPlanDetail();
+            removeParam.setPlanId(model.getId());
+            jdbcClient.jdbcRemove(removeParam, connection);
+
+            // 3. 重新插入新明细列表
+            List<OutsourcingPlanDetail> detailList = model.getChildrenList();
+            if (detailList != null) {
+                for (OutsourcingPlanDetail detail : detailList) {
+                    detail.setPlanId(model.getId());
+                    jdbcClient.jdbcInsert(detail, connection);
+                }
+            }
+
+            connection.commit();
+            return model;
+        } catch (Exception e) {
+            connection.rollback();
+            throw new BizException(e.getMessage());
+        } finally {
+            connection.close();
+        }
+    }
+
+    @Override
+    public OutsourcingPlan remove(OutsourcingPlan model) throws Exception {
+        Connection connection = dataSource.getConnection();
+        connection.setAutoCommit(false);
+        try {
+            // 1. 删除主表 (JdbcClient 自动删除关联的 MinioFile)
+            jdbcClient.jdbcRemoveById(model, connection);
+
+            // 2. 删除关联的明细记录
+            OutsourcingPlanDetail removeParam = new OutsourcingPlanDetail();
+            removeParam.setPlanId(model.getId());
+            jdbcClient.jdbcRemove(removeParam, connection);
+
+            connection.commit();
+            return model;
+        } catch (Exception e) {
+            connection.rollback();
+            throw new BizException(e.getMessage());
+        } finally {
+            connection.close();
+        }
+    }
+}