From e2bb847d9b751ff346f5abda1d29189b386765e2 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Fri, 23 Aug 2024 10:37:31 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E6=9B=B4=E6=96=B0=E7=BB=84=E7=9B=98?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/handler/impl/GroupDickInStorageTask.java      | 10 ++++++----
 .../service/impl/MdGruopDickServiceImpl.java           |  5 +++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java
index a9f630b9..fa80e19d 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java
@@ -1,6 +1,7 @@
 package org.nl.wms.dispatch_manage.task.handler.impl;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -90,6 +91,11 @@ public  class GroupDickInStorageTask extends AbstractTask {
                 }
                 FlowContinueEvent continueEvent = new FlowContinueEvent(currentInstId, null, new JSONObject(MapOf.of("start_point", point_code1)));
                 BussEventMulticaster.Publish(continueEvent);
+                //流程创建完毕，更新组盘信息为完成
+                iMdGruopDickService.update(new UpdateWrapper<MdGruopDick>()
+                        .set("status", StatusEnum.FORM_STATUS.code("完成"))
+                        .set("update_time", DateUtil.now())
+                        .eq("vehicle_code", vehicle_code));
             }else {
                 BussEventMulticaster.Publish(
                         new FlowStartEvent("md_group",
@@ -102,10 +108,6 @@ public  class GroupDickInStorageTask extends AbstractTask {
                                 .build("md_pb_vehicleMater",item)
                 );
             }
-            //流程创建完毕，更新组盘信息为完成
-            iMdGruopDickService.update(new UpdateWrapper<MdGruopDick>()
-                    .set("status", StatusEnum.FORM_STATUS.code("完成"))
-                    .eq("vehicle_code", vehicle_code));
         }
         return null;
     }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
index 1f74011e..ad4b94f5 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
@@ -109,10 +109,15 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
                     dick.setCode(CodeUtil.getNewCode("md_group_dick"));
                     dick.setId(IdUtil.getStringId());
                     dick.setStatus(StatusEnum.FORM_STATUS.code("执行中"));
+                    dick.setCreate_name(SecurityUtils.getCurrentNickName());
+                    dick.setCreate_time(now);
                     map.put(vehicle_code,dick);
                     vehicleMater.setGroup_id(dick.getId());
                 }else {
                     vehicleMater.setGroup_id(mdGruopDick.getId());
+                    mdGruopDick.setStatus(StatusEnum.FORM_STATUS.code("执行中"));
+                    mdGruopDick.setUpdate_name(SecurityUtils.getCurrentNickName());
+                    mdGruopDick.setUpdate_time(now);
                 }
                 vehicleMater.setId(IdUtil.getStringId());
                 vehicleMater.setCreate_time(now);