From 67b8c5fe65107f9caa9bf5da82c7ff43cecabb24 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Tue, 28 May 2024 09:56:06 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E5=BC=82=E6=AD=A5=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/behavior/impl/ServerTaskActivityBehavior.java    | 1 -
 .../process/nodeType/excess/impl/DecisionHandler.java       | 6 ++++--
 .../group_dick/service/impl/MdGruopDickServiceImpl.java     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java
index 6706f5cf..b29f93ef 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ServerTaskActivityBehavior.java
@@ -26,7 +26,6 @@ public class ServerTaskActivityBehavior extends FlowNodeActivityBehavior<JSONObj
 
 
     @Override
-    @Transactional
     public void execute(ExecutionEntity<JSONObject> entity) {
 
         FlowElement element = entity.getCurrentFlowElement();
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/DecisionHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/DecisionHandler.java
index 65a1baf9..527d8c78 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/DecisionHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/DecisionHandler.java
@@ -7,6 +7,7 @@ import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.enums.StatusEnum;
 import org.nl.common.utils.ListOf;
 import org.nl.common.utils.RedissonUtils;
+import org.nl.common.utils.SpringContextHolder;
 import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
 import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
 import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc;
@@ -57,9 +58,10 @@ public class DecisionHandler extends TypeHandler<JSONObject,ExecutionEntity<JSON
         JSONObject t = entity.getT();
         JSONObject item_json = t.getJSONObject("t");
         StIvtIostorinvdtl iostorinvdtl = item_json.toJavaObject(StIvtIostorinvdtl.class);
-        List<StIvtStructattr> list = dispense(params, iostorinvdtl);
+        List<StIvtStructattr> list = SpringContextHolder.getBean(DecisionHandler.class).dispense(params, iostorinvdtl);
         //更新仓位，更新数据
         String collect = list.stream().map(StIvtStructattr::getStruct_code).collect(Collectors.joining(","));
+        System.out.println("更新明细id"+iostorinvdtl.getId());
         stIvtIostorinvdtlInService.update(new UpdateWrapper<StIvtIostorinvdtl>()
                 .set("struct_code",collect)
                 .eq("id",iostorinvdtl.getId()));
@@ -99,7 +101,7 @@ public class DecisionHandler extends TypeHandler<JSONObject,ExecutionEntity<JSON
                 list= ListOf.of(list.get(0));
             }
             structCode.set(list);
-            System.out.println("分配的货位"+list.toString());
+            System.out.println("分配的货位"+list.stream().map(StIvtStructattr::getStruct_code).collect(Collectors.joining(",")));
             iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
 //                    .set("vehicle_code", iostorinvdtl.getVehicle_code())
                     .set("lock_type", StatusEnum.LOCK.code(iostorinvdtl.getIn_storage()?"入":"出"))
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 760c603b..10c0778a 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
@@ -112,7 +112,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
                             .set("proc_inst_id",proc_inst_id).eq("id",mdGroupMst.getId())); })
                 .build("md_group_dick",mdGroupMst.getId(),mdGroupMst.getSource_form_type(),mdGroupMst.getSource_form_id(),forms)
                 .build("md_group_dtl",dtlJson)
-                ,true);
+                ,false);
     }
 
     @Override