From 587a3d6edafd1eae73c4a55a714e3caad3592c2f Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Tue, 26 Nov 2024 16:36:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?=
 =?UTF-8?q?=E3=80=91=E8=8E=B7=E5=8F=96PBOM=E6=89=80=E6=9C=89=E5=AD=90?=
 =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../technology/pojo/vo/BomNewPBomVO.java      |  5 ++-
 .../pojo/vo/ProcessRouteTaskVO.java           |  3 ++
 .../service/ProcessRouteTaskService.java      | 42 +++++++++++++------
 .../mapper/master/ProcessRouteTaskMapper.xml  |  8 +++-
 4 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java
index 56851e67..793a59f2 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java
@@ -107,7 +107,10 @@ public class BomNewPBomVO extends BaseMaterialVO  {
         }else {
             return  expireEndTime;
         }
-        }
+    }
 
+    private String parentMaterialNo;
+
+    private String parentMaterialDesc;
 
 }
diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java
index 15daa51e..6fed3dd8 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/ProcessRouteTaskVO.java
@@ -85,4 +85,7 @@ public class ProcessRouteTaskVO extends BaseMaterialVO implements Serializable {
 
     // 组件分配列表
     private List<ProcessRouteTaskAssemblyVO> assemblyVOList;
+
+    // 保存类型 tempSave 不校验， validSave 校验
+    private String saveType;
 }
diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
index a94af7e7..14040321 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
@@ -92,11 +92,25 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
 
     @Transactional(rollbackFor = Exception.class)
     public void save(ProcessRouteTaskVO processRouteTaskVO) {
-        if (ObjectUtil.isEmpty(processRouteTaskVO.getFactory())) {
-            throw new NflgBusinessException(STATE.ParamErr, "工厂不能为空");
-        }
-        if (ObjectUtil.isEmpty(processRouteTaskVO.getMaterialNo())) {
-            throw new NflgBusinessException(STATE.ParamErr, "物料号不能为空");
+        if (!"tempSave".equals(processRouteTaskVO.getSaveType())) {
+            if (ObjectUtil.isEmpty(processRouteTaskVO.getFactory())) {
+                throw new NflgBusinessException(STATE.ParamErr, "工厂不能为空");
+            }
+            if (ObjectUtil.isEmpty(processRouteTaskVO.getMaterialNo())) {
+                throw new NflgBusinessException(STATE.ParamErr, "物料号不能为空");
+            }
+            if (ObjectUtil.isEmpty(processRouteTaskVO.getUsefulness())) {
+                throw new NflgBusinessException(STATE.ParamErr, "用途不能为空");
+            }
+            if (ObjectUtil.isEmpty(processRouteTaskVO.getStatus())) {
+                throw new NflgBusinessException(STATE.ParamErr, "状态不能为空");
+            }
+            if (CollUtil.isEmpty(processRouteTaskVO.getProcessesVOList())) {
+                throw new NflgBusinessException(STATE.ParamErr, "工序列表不能为空");
+            }
+            if (CollUtil.isEmpty(processRouteTaskVO.getAssemblyVOList())) {
+                throw new NflgBusinessException(STATE.ParamErr, "组件分配列表不能为空");
+            }
         }
         List<ProcessRouteTaskEntity> existsTaskList = this.lambdaQuery().eq(ProcessRouteTaskEntity::getFactory, processRouteTaskVO.getFactory())
                 .eq(ProcessRouteTaskEntity::getMaterialNo, processRouteTaskVO.getMaterialNo())
@@ -178,15 +192,19 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
         List<BomNewPBomVO> nodeList = showDataStyle(convertBomList, rootParent.getRowId());
         for (BomNewPBomVO vo: nodeList) {
             vo.setBomVersion(rootParent.getCurrentVersion());
-            // vo.setDeviseName(parentFormal.getDeviseName());
-            //  vo.setCreatedTime(parentFormal.getCreatedTime());
-            // vo.setExpireEndTime(parentFormal.getReleaseTime());
-            // 10、40、50、60、70大类以及200201小类这些不需要BOM的物料，版本号显示B00 by 10002327 241101
-//            if(MaterialshouldBomExistUtil.checkNoNeedBom(vo) || Objects.equals("T",vo.getProjectType())){
-//                vo.setCurrentVersion(OriginalConstant.NO_NEED_BOM);
-//            }
         }
         nodesList.addAll(nodeList);
+        if (CollUtil.isNotEmpty(nodesList)) {
+            nodesList.forEach(item -> {
+                List<BomNewPBomVO> parents = nodesList.stream().filter(parent -> item.getParentRowId().equals(parent.getRowId())).collect(Collectors.toList());
+                if (CollUtil.isNotEmpty(parents)) {
+                    item.setParentMaterialNo(parents.get(0).getMaterialNo());
+                    item.setParentMaterialDesc(parents.get(0).getMaterialDesc());
+                }
+            });
+            // 最顶级不返回
+            nodesList.remove(0);
+        }
         return nodesList;
     }
 
diff --git a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml
index 64398f36..a07bb47d 100644
--- a/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml
+++ b/nflg_project_dev/nflg-technology/src/main/resources/mapper/master/ProcessRouteTaskMapper.xml
@@ -48,7 +48,13 @@
                 AND updated_by LIKE concat('%', #{query.updatedBy}, '%')
             </if>
             <if test="query.delFlag != null">
-                AND del_flag = #{delFlag}
+                AND del_flag = #{query.delFlag}
+            </if>
+            <if test="query.status != null">
+                AND `status` = #{query.status}
+            </if>
+            <if test="query.usefulness != null">
+                AND usefulness = #{query.usefulness}
             </if>
         </where>
     </sql>