From e8956d78ebafca16794fd88a214aafbf4c94a1b8 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Thu, 28 Nov 2024 14:32:33 +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=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

---
 .../service/ProcessRouteTaskService.java      | 30 +++++++++++++++++--
 .../mapper/master/ProcessRouteTaskMapper.xml  |  2 +-
 2 files changed, 29 insertions(+), 3 deletions(-)

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 14040321..cce7c564 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
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -107,9 +108,26 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
             }
             if (CollUtil.isEmpty(processRouteTaskVO.getProcessesVOList())) {
                 throw new NflgBusinessException(STATE.ParamErr, "工序列表不能为空");
+            } else {
+                for (int i = 0; i < processRouteTaskVO.getProcessesVOList().size(); i++) {
+                    ProcessRouteTaskProcessesVO item = processRouteTaskVO.getProcessesVOList().get(i);
+                    if (ObjectUtil.isEmpty(item.getProcesse())) {
+                        throw new NflgBusinessException(STATE.ParamErr, "工序列表第" + (i + 1) + "行工序号不能为空");
+                    }
+                    if (ObjectUtil.isEmpty(item.getWorkCenter())) {
+                        throw new NflgBusinessException(STATE.ParamErr, "工序列表第" + (i + 1) + "行工作中心不能为空");
+                    }
+                }
             }
             if (CollUtil.isEmpty(processRouteTaskVO.getAssemblyVOList())) {
                 throw new NflgBusinessException(STATE.ParamErr, "组件分配列表不能为空");
+            } else {
+                for (int i = 0; i < processRouteTaskVO.getAssemblyVOList().size(); i++) {
+                    ProcessRouteTaskAssemblyVO item = processRouteTaskVO.getAssemblyVOList().get(i);
+                    if (ObjectUtil.isEmpty(item.getProcesse())) {
+                        throw new NflgBusinessException(STATE.ParamErr, "组件分配列表第" + (i + 1) + "行操作/活动不能为空");
+                    }
+                }
             }
         }
         List<ProcessRouteTaskEntity> existsTaskList = this.lambdaQuery().eq(ProcessRouteTaskEntity::getFactory, processRouteTaskVO.getFactory())
@@ -124,12 +142,20 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
         // 新增
         if (ObjectUtil.isEmpty(processRouteTaskVO.getRowId())) {
             taskEntity.setRowId(IdWorker.getId());
-            taskEntity.setHandleState(HandleStateEnum.HANDLER_TEMPSAVING.getValue());
-            taskEntity.setSapState(SapStateEnum.STATE_UPDATED.getValue());
+            taskEntity.setTaskCode(RandomUtil.randomString(8));
         } else {
             // 修改
 
         }
+        // 保存
+        if (!"tempSave".equals(processRouteTaskVO.getSaveType())) {
+            taskEntity.setHandleState(HandleStateEnum.HANDLER_UPDATING.getValue());
+            taskEntity.setSapState(SapStateEnum.STATE_UPDATED.getValue());
+        } else {
+            // 暂存
+            taskEntity.setHandleState(HandleStateEnum.HANDLER_TEMPSAVING.getValue());
+            taskEntity.setSapState(SapStateEnum.STATE_UNIMPORT.getValue());
+        }
         this.saveOrUpdate(taskEntity);
         // 工序列表
         List<ProcessRouteTaskProcessesVO> processesVOList = processRouteTaskVO.getProcessesVOList();
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 a07bb47d..4b3a01fe 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
@@ -5,7 +5,7 @@
     <sql id="base_column_list">
         row_id,task_code, factory, material_no, description, usefulness, status, from_batch,
         to_batch, expire_start_time, expire_end_time, del_flag, created_by, created_time, updated_by,
-        updated_time, handle_status, sap_state
+        updated_time, handle_state, sap_state
     </sql>
 
     <select id="selectPageByCondition" resultType="com.nflg.product.technology.pojo.vo.ProcessRouteTaskVO">