Merge remote-tracking branch 'origin/master'

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/NewSysMindMappingDao.java

@@ -0,0 +1,30 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.NewSysMindMappingDo;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+public interface NewSysMindMappingDao extends BaseMapper<NewSysMindMappingDo> {
+
+    @Select("SELECT * FROM sys_mind_mapping WHERE DELETED = 0 AND BSID = #{bsid}")
+    List<NewSysMindMappingDo> getSysMindMappingByMainId(@Param("bsid") String bsid);
+
+    @Select("SELECT\n" +
+            "\t* \n" +
+            "FROM\n" +
+            "\tsys_mind_mapping \n" +
+            "WHERE\n" +
+            "\tDELETED = 0 \n" +
+            "\tAND BSID = #{bsid} \n" +
+            "\tAND LEVEL = #{level}\n" +
+            "\tAND ROPTION LIKE CONCAT('%',#{roption},'%')")
+    NewSysMindMappingDo getDataInfo(@Param("bsid") String bsid,@Param("roption")String roption,@Param("level")Integer level);
+
+
+    @Update("UPDATE sys_mind_mapping SET ID = #{newid} WHERE ID = #{id}")
+    void updateDataInfo(@Param("id") String id, @Param("newid") String newid);
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/NewSysMindMappingService.java

@@ -0,0 +1,14 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.NewSysMindMappingDo;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface NewSysMindMappingService extends IService<NewSysMindMappingDo> {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -17,6 +17,8 @@ import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommon.vo.MailDo;
+import com.rongwei.rwcommonentity.commonservers.domain.SysMindMappingDo;
+
 import com.rongwei.safecommon.fegin.CXCommonFeginClient;
 import com.rongwei.safecommon.utils.CXCommonUtils;
 import com.rongwei.safecommon.utils.SaveConstans;
@@ -96,9 +98,14 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
     private ApsProcessOperationOutMaterDao apsProcessOperationOutMaterDao;
     @Autowired
     private ApsProcessOperationEquDao apsProcessOperationEquDao;
-
     @Autowired
     private ApsProductionOrderHistoryService apsProductionOrderHistoryService;
+    @Autowired
+    private NewSysMindMappingService newSysMindMappingService;
+    @Autowired
+    private NewSysMindMappingDao newSysMindMappingDao;
+
+
     public static final String ERROR_MSG = "%s上诉订单的排程交货期大于承诺交货期";
 
     /**
@@ -537,7 +544,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
             //创建一个map集合
             Map<String, String> ApsProductDetailMap = new HashMap<>();
 
-            ApsProductionOrderHistoryDo  apsProductionOrderHistoryDo = new ApsProductionOrderHistoryDo();
+            ApsProductionOrderHistoryDo apsProductionOrderHistoryDo = new ApsProductionOrderHistoryDo();
             BeanUtils.copyProperties(apsProductionOrderDo, apsProductionOrderHistoryDo);
             apsProductionOrderHistoryDo.setHistorytableid(apsProductionOrderDo.getId());
             apsProductionOrderHistoryDo.setId(SecurityUtil.getUUID());
@@ -546,7 +553,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
             //获取合并订单列表
             List<ApsProductionMergeOrderDo> apsProductionMergeOrderDoList = apsProductionMergeOrderDao.selectApsProductionMergeOrderDoByMainId(apsProductionOrderDo.getId());
             if (apsProductionMergeOrderDoList != null && apsProductionMergeOrderDoList.size() > 0) {
-                for (ApsProductionMergeOrderDo apsProductionMergeOrderDo: apsProductionMergeOrderDoList) {
+                for (ApsProductionMergeOrderDo apsProductionMergeOrderDo : apsProductionMergeOrderDoList) {
                     //将apsProductionMergeOrderDo的数据复制到apsProductionMergeOrderHistoryDo
                     ApsProductionMergeOrderHistoryDo apsProductionMergeOrderHistoryDo = new ApsProductionMergeOrderHistoryDo();
                     BeanUtils.copyProperties(apsProductionMergeOrderDo, apsProductionMergeOrderHistoryDo);
@@ -640,6 +647,19 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                         }
                     }
 
+                    //根据工序作业 id 获取工艺路线图数据 赋值历史表的坯料计划 id
+                    List<NewSysMindMappingDo> sysMindMappingDoList = newSysMindMappingDao.getSysMindMappingByMainId(apsBlankOrderDo.getId());
+
+                    if (sysMindMappingDoList != null && sysMindMappingDoList.size() > 0) {
+                        for (NewSysMindMappingDo sysMindMappingDo : sysMindMappingDoList) {
+                            NewSysMindMappingDo newSysMindMappingDo = new NewSysMindMappingDo();
+                            BeanUtils.copyProperties(sysMindMappingDo, newSysMindMappingDo);
+                            newSysMindMappingDo.setBsid(apsBlankOrderHistoryDo.getId());
+                            newSysMindMappingDo.setId(SecurityUtil.getUUID());
+                            newSysMindMappingService.save(newSysMindMappingDo);
+                        }
+                    }
+
                     //根据坯料计划id获取 工序作业  aps_process_operation 子表数据
                     List<ApsProcessOperationDo> apsProcessOperationDoList = apsProcessOperationDao.getProcessOperationByBlankId(apsBlankOrderDo.getId());
 
@@ -651,9 +671,13 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                             apsProcessOperationHistoryDo.setId(SecurityUtil.getUUID());
                             apsProcessOperationHistoryService.save(apsProcessOperationHistoryDo);
 
+                            NewSysMindMappingDo newSysMindMappingDo = newSysMindMappingDao.getDataInfo(apsBlankOrderHistoryDo.getId(),apsProcessOperationHistoryDo.getCraftstepid(),apsProcessOperationHistoryDo.getLevel());
+                            if (newSysMindMappingDo != null) {
+                                //更改newSysMindMappingDo 中的 id 为apsProcessOperationHistoryDo.getId()
+                                newSysMindMappingDao.updateDataInfo(newSysMindMappingDo.getId(),apsProcessOperationHistoryDo.getId());
+                            }
                             //根据工序作业 id 获取 输出物料 aps_process_operation_out_mater
                             List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList = apsProcessOperationOutMaterDao.getProcessOperationOutMaterByMainId(apsProcessOperationDo.getId());
-
                             if (apsProcessOperationOutMaterDoList != null && apsProcessOperationOutMaterDoList.size() > 0) {
                                 for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDoList) {
                                     ApsProcessOperationOutMaterHistoryDo apsProcessOperationOutMaterHistoryDo = new ApsProcessOperationOutMaterHistoryDo();
@@ -679,12 +703,55 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
 
                         }
                     }
+
+                    //获取 以上新增的工艺路线图数据
+                    List<NewSysMindMappingDo> newSysMindMappingDoList = newSysMindMappingDao.getSysMindMappingByMainId(apsBlankOrderHistoryDo.getId());
+                    if (newSysMindMappingDoList != null && newSysMindMappingDoList.size() > 0) {
+                        // 获取列表中level的最大值
+                        int maxLevel = 0;
+                        for (NewSysMindMappingDo mapping : newSysMindMappingDoList) {
+                            if (mapping.getLevel() > maxLevel) {
+                                maxLevel = mapping.getLevel();
+                            }
+                        }
+                        // 遍历列表，根据不同的level设置parentid
+                        for (NewSysMindMappingDo mapping : newSysMindMappingDoList) {
+                            int currentLevel = mapping.getLevel();
+                            if (currentLevel == 2) {
+                                String parentId = getIdByLevel(newSysMindMappingDoList, 0);
+                                mapping.setParentid(parentId);
+                                newSysMindMappingService.updateById(mapping);
+                            } else if (currentLevel == 3) {
+                                String parentId = getIdByLevel(newSysMindMappingDoList, 2);
+                                mapping.setParentid(parentId);
+                                newSysMindMappingService.updateById(mapping);
+                            } else if (currentLevel == 4) {
+                                String parentId = getIdByLevel(newSysMindMappingDoList, 3);
+                                mapping.setParentid(parentId);
+                                newSysMindMappingService.updateById(mapping);
+                            } else if (currentLevel > 4 && currentLevel <= maxLevel) {
+                                String parentId = getIdByLevel(newSysMindMappingDoList, currentLevel - 1);
+                                mapping.setParentid(parentId);
+                                newSysMindMappingService.updateById(mapping);
+                            }
+                        }
+                    }
                 }
             }
         }
         return R.ok();
     }
 
+    // 根据level获取对应的id
+    private String getIdByLevel(List<NewSysMindMappingDo> mappingList, int level) {
+        for (NewSysMindMappingDo mapping : mappingList) {
+            if (mapping.getLevel() == level) {
+                return mapping.getId();
+            }
+        }
+        return null;
+    }
+
 }
 
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/NewSysMindMappingServiceImpl.java

@@ -0,0 +1,19 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.NewSysMindMappingDao;
+import com.rongwei.bscommon.sys.service.NewSysMindMappingService;
+import com.rongwei.bsentity.domain.NewSysMindMappingDo;
+import org.springframework.stereotype.Service;
+/**
+ *
+ */
+@Service
+public class NewSysMindMappingServiceImpl extends ServiceImpl<NewSysMindMappingDao, NewSysMindMappingDo>
+        implements NewSysMindMappingService {
+
+}
+
+
+
+

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/NewSysMindMappingDo.java

@@ -0,0 +1,110 @@
+package com.rongwei.bsentity.domain;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 思维导图
+ * </p>
+ *
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_mind_mapping")
+public class NewSysMindMappingDo extends BaseDo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId("ID")
+    private String id;
+
+    /**
+     * 父级ID
+     */
+    @TableField("PARENTID")
+    private String parentid;
+
+    /**
+     * 业务表ID
+     */
+    @TableField("BSID")
+    private String bsid;
+
+    /**
+     * 业务表表名
+     */
+    @TableField("BSTABLE")
+    private String bstable;
+
+    /**
+     * 节点类型
+     */
+    @TableField("MINDTYPE")
+    private String mindtype;
+
+    /**
+     * 节点标签名
+     */
+    @TableField("MINDLABEL")
+    private String mindlabel;
+
+    /**
+     * 节点编码
+     */
+    @TableField("MINDCODE")
+    private String mindcode;
+
+    /**
+     * 父级全路径
+     */
+    @TableField("FULLPID")
+    private String fullpid;
+
+    /**
+     * 树表结构
+     */
+    @TableField("TREECODE")
+    private String treecode;
+
+    /**
+     * 等级
+     */
+    @TableField("LEVEL")
+    private Integer level;
+
+    /**
+     * 是否叶子节点
+     */
+    @TableField("ISLEAF")
+    private String isleaf;
+
+    /**
+     * 图片URL
+     */
+    @TableField("MINDIMG")
+    private String mindimg;
+
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+
+}