自定义工序添加图

hx-mes/src/main/java/com/fjhx/mes/controller/work/WorkOrderProcessLineController.java

@@ -0,0 +1,19 @@
+package com.fjhx.mes.controller.work;
+
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * <p>
+ * 工单定制工艺线路 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-11
+ */
+@RestController
+@RequestMapping("/workOrderProcessLine")
+public class WorkOrderProcessLineController {
+
+
+}

hx-mes/src/main/java/com/fjhx/mes/controller/work/WorkOrderProductionProcessesController.java

@@ -1,14 +1,12 @@
 package com.fjhx.mes.controller.work;
 
 import com.fjhx.mes.entity.work.po.WorkOrderProductionProcesses;
+import com.fjhx.mes.entity.work.vo.WorkOrderVo;
 import org.springframework.web.bind.annotation.*;
-import com.fjhx.mes.entity.work.vo.WorkOrderProductionProcessesVo;
 import com.fjhx.mes.entity.work.dto.WorkOrderProductionProcessesDto;
 import com.fjhx.mes.service.work.WorkOrderProductionProcessesService;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.List;
-
 /**
  * <p>
  * 工单工序 前端控制器
@@ -25,11 +23,11 @@ public class WorkOrderProductionProcessesController {
     private WorkOrderProductionProcessesService workOrderProductionProcessesService;
 
     /**
-     * 工单工序列表
+     * 工单工序明细
      */
-    @PostMapping("/list")
-    public List<WorkOrderProductionProcessesVo> list(@RequestBody WorkOrderProductionProcesses dto) {
-        return workOrderProductionProcessesService.getList(dto);
+    @PostMapping("/detail")
+    public WorkOrderVo list(@RequestBody WorkOrderProductionProcesses dto) {
+        return workOrderProductionProcessesService.detail(dto);
     }
 
     /**

hx-mes/src/main/java/com/fjhx/mes/entity/work/dto/WorkOrderProcessLineDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.work.dto;
+
+import com.fjhx.mes.entity.work.po.WorkOrderProcessLine;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 工单定制工艺线路新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-12-11
+ */
+@Getter
+@Setter
+public class WorkOrderProcessLineDto extends WorkOrderProcessLine {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/work/dto/WorkOrderProcessLineSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.work.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 工单定制工艺线路列表查询入参实体
+ *
+ * @author 
+ * @since 2023-12-11
+ */
+@Getter
+@Setter
+public class WorkOrderProcessLineSelectDto extends BaseSelectDto {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/work/dto/WorkOrderProductionProcessesDto.java

@@ -33,4 +33,9 @@ public class WorkOrderProductionProcessesDto extends WorkOrderProductionProcesse
      */
     private List<ObsFile> fileList;
 
+    /**
+     * 定制工序流程图数据
+     */
+    private String customizedNodeObject;
+
 }

hx-mes/src/main/java/com/fjhx/mes/entity/work/po/WorkOrder.java

@@ -101,4 +101,9 @@ public class WorkOrder extends BasePo {
      */
     private Integer electricianBomStatus;
 
+    /**
+     * 定制工序流程图数据
+     */
+    private String customizedNodeObject;
+
 }

hx-mes/src/main/java/com/fjhx/mes/entity/work/po/WorkOrderProcessLine.java

@@ -0,0 +1,37 @@
+package com.fjhx.mes.entity.work.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 工单定制工艺线路
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-11
+ */
+@Getter
+@Setter
+@TableName("work_order_process_line")
+public class WorkOrderProcessLine extends BasePo {
+
+    /**
+     * 工单id
+     */
+    private Long workOrderId;
+
+    /**
+     * 来源工序id
+     */
+    private Long sourceProcessesId;
+
+    /**
+     * 目标工序id
+     */
+    private Long targetProcessesId;
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/work/vo/WorkOrderProcessLineVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.entity.work.vo;
+
+import com.fjhx.mes.entity.work.po.WorkOrderProcessLine;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 工单定制工艺线路列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-12-11
+ */
+@Getter
+@Setter
+public class WorkOrderProcessLineVo extends WorkOrderProcessLine {
+
+}

hx-mes/src/main/java/com/fjhx/mes/entity/work/vo/WorkOrderVo.java

@@ -121,4 +121,9 @@ public class WorkOrderVo extends WorkOrder {
      */
     private Long devUserId;
 
+    /**
+     * 定制工序列表
+     */
+    List<WorkOrderProductionProcessesVo> workOrderProductionProcessesList;
+
 }

hx-mes/src/main/java/com/fjhx/mes/mapper/work/WorkOrderProcessLineMapper.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.mapper.work;
+
+import com.fjhx.mes.entity.work.po.WorkOrderProcessLine;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * <p>
+ * 工单定制工艺线路 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-11
+ */
+public interface WorkOrderProcessLineMapper extends BaseMapper<WorkOrderProcessLine> {
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/work/WorkOrderProcessLineService.java

@@ -0,0 +1,17 @@
+package com.fjhx.mes.service.work;
+
+import com.fjhx.mes.entity.work.po.WorkOrderProcessLine;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 工单定制工艺线路 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-11
+ */
+public interface WorkOrderProcessLineService extends BaseService<WorkOrderProcessLine> {
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/work/WorkOrderProductionProcessesService.java

@@ -1,12 +1,10 @@
 package com.fjhx.mes.service.work;
 
 import com.fjhx.mes.entity.work.po.WorkOrderProductionProcesses;
+import com.fjhx.mes.entity.work.vo.WorkOrderVo;
 import com.ruoyi.common.core.service.BaseService;
-import com.fjhx.mes.entity.work.vo.WorkOrderProductionProcessesVo;
 import com.fjhx.mes.entity.work.dto.WorkOrderProductionProcessesDto;
 
-import java.util.List;
-
 /**
  * <p>
  * 工单工序 服务类
@@ -20,7 +18,7 @@ public interface WorkOrderProductionProcessesService extends BaseService<WorkOrd
     /**
      * 工单工序列表
      */
-    List<WorkOrderProductionProcessesVo> getList(WorkOrderProductionProcesses dto);
+    WorkOrderVo detail(WorkOrderProductionProcesses dto);
 
     /**
      * 工单工序编辑

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderProcessLineServiceImpl.java

@@ -0,0 +1,21 @@
+package com.fjhx.mes.service.work.impl;
+
+import com.fjhx.mes.entity.work.po.WorkOrderProcessLine;
+import com.fjhx.mes.mapper.work.WorkOrderProcessLineMapper;
+import com.fjhx.mes.service.work.WorkOrderProcessLineService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 工单定制工艺线路 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-12-11
+ */
+@Service
+public class WorkOrderProcessLineServiceImpl extends ServiceImpl<WorkOrderProcessLineMapper, WorkOrderProcessLine> implements WorkOrderProcessLineService {
+
+}

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderProductionProcessesServiceImpl.java

@@ -2,19 +2,23 @@ package com.fjhx.mes.service.work.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.utils.Assert;
 import com.fjhx.file.entity.ObsFile;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.mes.entity.production.po.ProductionProcesses;
 import com.fjhx.mes.entity.work.dto.WorkOrderProductionProcessesDto;
 import com.fjhx.mes.entity.work.po.WorkOrder;
+import com.fjhx.mes.entity.work.po.WorkOrderProcessLine;
 import com.fjhx.mes.entity.work.po.WorkOrderProductionProcesses;
 import com.fjhx.mes.entity.work.vo.WorkOrderProductionProcessesVo;
+import com.fjhx.mes.entity.work.vo.WorkOrderVo;
 import com.fjhx.mes.mapper.work.WorkOrderProductionProcessesMapper;
-import com.fjhx.mes.service.applicable.ApplicableProductsService;
 import com.fjhx.mes.service.production.ProductionProcessesService;
-import com.fjhx.mes.service.technology.TechnologyService;
+import com.fjhx.mes.service.work.WorkOrderProcessLineService;
 import com.fjhx.mes.service.work.WorkOrderProductionProcessesService;
 import com.fjhx.mes.service.work.WorkOrderService;
 import com.ruoyi.common.core.domain.BasePo;
@@ -23,8 +27,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -38,20 +41,20 @@ import java.util.List;
 public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrderProductionProcessesMapper, WorkOrderProductionProcesses> implements WorkOrderProductionProcessesService {
 
     @Autowired
-    private TechnologyService technologyService;
-    @Autowired
-    private ApplicableProductsService applicableProductsService;
-    @Autowired
     private WorkOrderService workOrderService;
     @Autowired
     private ProductionProcessesService productionProcessesService;
+    @Autowired
+    private WorkOrderProcessLineService workOrderProcessLineService;
 
     @Override
-    public List<WorkOrderProductionProcessesVo> getList(WorkOrderProductionProcesses dto) {
+    public WorkOrderVo detail(WorkOrderProductionProcesses dto) {
         WorkOrder workOrder = workOrderService.getById(dto.getWorkOrderId());
         if (ObjectUtil.isEmpty(workOrder)) {
             throw new ServiceException("查询不到工单信息");
         }
+        WorkOrderVo workOrderVo = BeanUtil.copyProperties(workOrder, WorkOrderVo.class);
+
         List<WorkOrderProductionProcesses> workOrderProductionProcessesList = list(q -> q
                 .eq(WorkOrderProductionProcesses::getWorkOrderId, dto.getWorkOrderId())
                 .orderByAsc(WorkOrderProductionProcesses::getSort));
@@ -66,10 +69,14 @@ public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrd
                 workOrderProductionProcesses.setSort(i);
                 i++;
             }
-            return workOrderProductionProcessesList0;
+            workOrderVo.setWorkOrderProductionProcessesList(workOrderProductionProcessesList0);
+            return workOrderVo;
         }
         List<WorkOrderProductionProcessesVo> workOrderProductionProcessesVos = BeanUtil.copyToList(workOrderProductionProcessesList, WorkOrderProductionProcessesVo.class);
-        return workOrderProductionProcessesVos;
+
+        workOrderVo.setWorkOrderProductionProcessesList(workOrderProductionProcessesVos);
+
+        return workOrderVo;
     }
 
     @DSTransactional
@@ -78,6 +85,7 @@ public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrd
         workOrderService.update(q -> q
                 .eq(WorkOrder::getId, dto.getWorkOrderId())
                 .set(ObjectUtil.isNotEmpty(dto.getTechnologyStatus()),WorkOrder::getTechnologyStatus, dto.getTechnologyStatus())
+                .set(WorkOrder::getCustomizedNodeObject, dto.getCustomizedNodeObject())
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );
@@ -101,6 +109,16 @@ public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrd
         List<WorkOrderProductionProcesses> workOrderProductionProcessesList1 = BeanUtil.copyToList(workOrderProductionProcessesList, WorkOrderProductionProcesses.class);
         this.editLinked(workOrderProductionProcessesList1, WorkOrderProductionProcesses::getWorkOrderId, dto.getWorkOrderId());
 
+
+        //保存图信息
+        WorkOrder workOrder = workOrderService.getById(dto.getWorkOrderId());
+        //先删除图信息再保存
+        workOrderProcessLineService.remove(q->q.eq(WorkOrderProcessLine::getWorkOrderId,workOrder.getId()));
+        List<WorkOrderProcessLine> workOrderProcessLines = analysisJsonData(workOrder);
+        if(ObjectUtil.isNotEmpty(workOrderProcessLines)){
+            workOrderProcessLineService.saveBatch(workOrderProcessLines);
+        }
+
         //检查定制工单是否配置BOM、工艺 配置完成发消息
         workOrderService.checkWorkOrderStatus(dto.getWorkOrderId());
 
@@ -108,4 +126,60 @@ public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrd
         ObsFileUtil.editFile(dto.getFileList(),dto.getWorkOrderId(),1);
     }
 
+    /**
+     * 处理流程图JSON
+     */
+    private List<WorkOrderProcessLine> analysisJsonData(WorkOrder workOrder) {
+        //读取流程图json信息
+        JSONArray nodeObject = JSONArray.parseArray(workOrder.getCustomizedNodeObject());
+        //遍历信息
+        Map<String, JSONObject> nodeMap = new HashMap<>();
+        List<JSONObject> lineList = new ArrayList<>();
+        for (int i = 0; i < nodeObject.size(); i++) {
+            JSONObject json = nodeObject.getJSONObject(i);
+            String shape = json.getString("shape");
+            //节点
+            if (shape.equals("handle-btn")) {
+                nodeMap.put(json.getString("id"), json);
+            }
+            //线
+            if (shape.equals("edge")) {
+                lineList.add(json);
+            }
+        }
+
+        List<WorkOrderProcessLine> technologyProcessLineList = new ArrayList<>();
+
+        for (JSONObject jsonObject : lineList) {
+            JSONObject source = jsonObject.getJSONObject("source");
+            String sourceCell = source.getString("cell");
+            JSONObject target = jsonObject.getJSONObject("target");
+            String targetCell = target.getString("cell");
+
+            WorkOrderProcessLine technologyProcessLine = new WorkOrderProcessLine();
+            //读取源节点信息
+            if (sourceCell.equals("1") || sourceCell.equals("99")) {
+                technologyProcessLine.setSourceProcessesId(Long.parseLong(sourceCell));
+            } else {
+                JSONObject from = nodeMap.get(sourceCell);
+                Assert.notEmpty(from, "查询不到节点信息：" + sourceCell);
+                technologyProcessLine.setSourceProcessesId(from.getLong("productionId"));
+            }
+            //读取目标节点信息
+            if (targetCell.equals("1") || targetCell.equals("99")) {
+                technologyProcessLine.setTargetProcessesId(Long.parseLong(targetCell));
+            } else {
+                JSONObject to = nodeMap.get(targetCell);
+                Assert.notEmpty(to, "查询不到节点信息：" + targetCell);
+                technologyProcessLine.setTargetProcessesId(to.getLong("productionId"));
+            }
+
+            technologyProcessLine.setWorkOrderId(workOrder.getId());
+
+            technologyProcessLineList.add(technologyProcessLine);
+        }
+
+        return technologyProcessLineList;
+    }
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -362,98 +362,6 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     }
 
     /**
-     * 获取bom信息
-     *
-     * @return
-     */
-//    @Override
-//    public List<BomDetail> getBomInfo(WorkOrder workOrder) {
-//        //获取产品信息
-//        ProductInfo productInfo = productInfoService.getById(workOrder.getProductId());
-//        if (ObjectUtil.isEmpty(productInfo)) {
-//            throw new ServiceException("查询不到产品信息 产品id->" + workOrder.getProductId());
-//        }
-//
-//        //搜索BOM明细
-//        List<BomDetail> bomDetailList = new ArrayList<>();
-//        //非定制
-//        BomInfo bomInfo = bomInfoService.getOne(q -> q.eq(BomInfo::getProductId, workOrder.getProductId()).eq(BomInfo::getCurrentVersion, 1));
-//        if (ObjectUtil.isEmpty(bomInfo)) {
-//            throw new ServiceException("查询不到产品的BOM信息 产品名称->" + productInfo.getName());
-//        }
-//        bomDetailList = bomDetailService.list(q -> q.eq(BomDetail::getBomInfoId, bomInfo.getId()));
-//        if (ObjectUtil.isEmpty(bomDetailList)) {
-//            throw new ServiceException("查询不到产品BOM明细 产品名称->" + productInfo.getName());
-//        }
-//
-//        //如果是定制就获取定制的BOM
-//        if ("1".equals(workOrder.getIsCustomized())) {
-//            //定制
-//            List<WorkOrderBom> workOrderBoms = workOrderBomService.list(q -> q.eq(WorkOrderBom::getWorkOrderId, workOrder.getId()));
-//            bomDetailList = BeanUtil.copyToList(workOrderBoms, BomDetail.class);
-//        }
-//        return bomDetailList;
-//    }
-
-//    /**
-//     * 冻结工单BOM
-//     */
-//    @DSTransactional
-//    @Override
-//    public void freezeMaterial(WorkOrder workOrderDto){
-//        WorkOrder workOrder = this.getById(workOrderDto.getId());
-//
-//        //如果定制且BOM未定制直接跳出
-//        if ("1".equals(workOrder.getIsCustomized())){
-//            //如果BOM未定制
-//            if (ObjectUtil.isEmpty(workOrder.getBomStatus())||workOrder.getBomStatus()!=1) {
-//                return;
-//            }
-//        }
-//        //如果待生产数量为空(需要如果干预)直接跳过
-//        if (ObjectUtil.isEmpty(workOrder.getProductionQuantity())){
-//            return;
-//        }
-//
-//        //获取Bom明细
-//        List<BomDetail> bomDetailList = getBomInfo(workOrder);
-//
-//        //根据BOM明细冻结库存
-//        List<Long> productIds = bomDetailList.stream().map(BomDetail::getProductId).collect(Collectors.toList());
-//        Map<Long, List<Stock>> productMap = stockService.mapKGroup(Stock::getProductId, q -> q.in(Stock::getProductId, productIds));
-//        List<StockFrozen> stockFrozenList = new ArrayList<>();
-//        for (BomDetail bomDetail : bomDetailList) {
-//            Long productId = bomDetail.getProductId();
-//            //计算总数量 需要的物料数量*工单生产数量
-//            BigDecimal multiply = bomDetail.getQuantity().multiply(workOrder.getProductionQuantity());
-//            //添加冻结库存
-//            List<Stock> stocks = productMap.get(productId);
-//            if (ObjectUtil.isEmpty(stocks)) {
-//                throw new ServiceException("物料库存不存在");
-//            }
-//            //计算库存是否充足（可用库存 - 冻结库存 - 所需的数量）是否大等于0
-//            BigDecimal quantity = stocks.stream().map(Stock::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
-//            Map<Long, StockFrozen> stockFrozenMap = stockFrozenService.mapKEntity(StockFrozen::getProductId, q -> q.in(StockFrozen::getProductId, productIds));
-//            StockFrozen stockFrozen = stockFrozenMap.get(bomDetail.getProductId());
-//            if (ObjectUtil.isEmpty(stockFrozen)) {
-//                stockFrozen = new StockFrozen();
-//                stockFrozen.setProductId(bomDetail.getProductId());
-//                stockFrozen.setFrozenQuantity(BigDecimal.ZERO);
-//            }
-//            BigDecimal subtract = quantity.subtract(stockFrozen.getFrozenQuantity()).subtract(multiply);
-//            if (subtract.compareTo(BigDecimal.ZERO) < 0) {
-//                throw new ServiceException("物料库存不足");
-//            }
-//            //存在库存
-//            BigDecimal add = stockFrozen.getFrozenQuantity().add(multiply);
-//            stockFrozen.setFrozenQuantity(add);
-//
-//            stockFrozenList.add(stockFrozen);
-//        }
-//        stockFrozenService.saveOrUpdateBatch(stockFrozenList);
-//    }
-
-    /**
      * 研发上传附件
      */
     @Override

hx-mes/src/main/resources/mapper/work/WorkOrderProcessLineMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.mes.mapper.work.WorkOrderProcessLineMapper">
+</mapper>