From 403065e55e378d07eafa9ace1e57f733f50d54ad Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 10 May 2024 13:47:09 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/enums/StatusEnum.java | 7 ++- .../StStrategyConfigController.java | 17 ++++++ .../node/impl/EndEventConverter.java | 3 +- .../converter/node/impl/FormConverter.java | 4 +- .../converter/node/impl/GatewayConverter.java | 3 +- .../converter/node/impl/SendMsgConverter.java | 3 +- .../node/impl/ServerTaskConverter.java | 5 +- .../node/impl/StartEventConverter.java | 2 - .../node/impl/SubProcessConverter.java | 7 ++- .../behavior/FlowNodeActivityBehavior.java | 17 ++++-- .../behavior/impl/FormActivityBehavior.java | 2 +- .../impl/ServerTaskActivityBehavior.java | 6 +-- .../impl/SubProcessActivityBehavior.java | 3 +- .../engine/cmd/unify/impl/ExeInstanceCmd.java | 6 +-- .../entity/node/base/impl/FlowNode.java | 1 - .../node/impl/SubProcess/SubProcess.java | 1 + .../node/impl/task/impl/ServerTask.java | 3 +- .../nodeType/excess/impl/DecisionHandler.java | 52 ++++++++++--------- .../excess/impl/ExpressionHandler.java | 2 +- .../flow/service/model/dao/ActDeModel.java | 5 ++ 20 files changed, 89 insertions(+), 60 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java index d7179648..848fa1da 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java @@ -16,9 +16,12 @@ import java.util.Map; @AllArgsConstructor public enum StatusEnum { //单据状态库类型 - FORM_STATUS(MapOf.of("生成", "10", "执行中", "20","完成", "99")), - FLOW_STATUS(MapOf.of("启动", "10", "执行中", "20","暂停", "30","完成", "99")); + MODEL_STATUS(MapOf.of("发布", "10", "未发布", "30")), + FORM_STATUS(MapOf.of("生成", "10", "执行中", "20","完成", "99")), + FLOW_STATUS(MapOf.of("启动", "10", "执行中", "20","暂停", "30","完成", "99")), + + ; private Map code; public String code(String desc) { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/controller/StStrategyConfigController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/controller/StStrategyConfigController.java index fe9e2d45..99de2369 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/controller/StStrategyConfigController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/controller/StStrategyConfigController.java @@ -1,9 +1,12 @@ package org.nl.wms.decision_manage.controller; +import cn.dev33.satoken.annotation.SaIgnore; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.entity.PageQuery; +import org.nl.common.utils.MapOf; import org.nl.wms.decision_manage.service.IStStrategyConfigService; import org.nl.wms.decision_manage.service.dao.StStrategyConfig; import org.nl.wms.decision_manage.service.dto.StrategyQuery; @@ -13,6 +16,10 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** *

* 仓储策略配置表 前端控制器 @@ -33,6 +40,16 @@ public class StStrategyConfigController { public ResponseEntity query(StrategyQuery query, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(iStStrategyConfigService.page(page.build(),query.build())), HttpStatus.OK); } + @GetMapping("/decisionColumns") + @SaIgnore + public ResponseEntity decisionColumns() { + List list = iStStrategyConfigService.list(new QueryWrapper().select("strategy_code", "strategy_name")); + List result = new ArrayList<>(); + for (StStrategyConfig config : list) { + result.add(MapOf.of("label",config.getStrategy_name(),"value",config.getStrategy_code())); + } + return new ResponseEntity<>(result, HttpStatus.OK); + } @PostMapping @Log("新增") diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/EndEventConverter.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/EndEventConverter.java index 3e0ee615..56910eb9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/EndEventConverter.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/EndEventConverter.java @@ -17,11 +17,10 @@ public class EndEventConverter extends BaseNodeConverter { public FlowNode convertToBpmnModel(Iterator iterator, JSONObject node, BpmnModel model) { JSONObject properties = node.getJSONObject("properties"); String type = node.getString("type"); - Boolean pass = properties.getBoolean("pass"); + Boolean pass = properties.getBoolean("passNode"); EndEvent end = new EndEvent(); end.setId(node.getString("id")); end.setType(node.getString("type")); - end.setParentNode(properties.getString("parentNode")); end.setName(properties.getString("name")); end.setDocumentation(properties.getString("documentation")); //设置触发事件 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/FormConverter.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/FormConverter.java index 1b4e03d8..777affe4 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/FormConverter.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/FormConverter.java @@ -18,12 +18,12 @@ public class FormConverter extends BaseNodeConverter { public FlowNode convertToBpmnModel(Iterator iterator, JSONObject node, BpmnModel model) { JSONObject properties = node.getJSONObject("properties"); String type = node.getString("type"); - Boolean pass = properties.getBoolean("pass"); + Boolean pass = properties.getBoolean("passNode"); Form form = new Form(); form.setPassNode(pass); form.setId(node.getString("id")); form.setType(node.getString("type")); - form.setParentNode(properties.getString("parentNode")); + form.setForm_type(node.getString("form_type")); form.setName(properties.getString("name")); form.setCategory(properties.getString("category")); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/GatewayConverter.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/GatewayConverter.java index 8fb6799a..6c86eb60 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/GatewayConverter.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/GatewayConverter.java @@ -17,10 +17,9 @@ public class GatewayConverter extends BaseNodeConverter { public FlowNode convertToBpmnModel(Iterator iterator, JSONObject node, BpmnModel model) { JSONObject properties = node.getJSONObject("properties"); String type = node.getString("type"); - Boolean pass = properties.getBoolean("pass"); + Boolean pass = properties.getBoolean("passNode"); GateWay gateWay = new GateWay(); gateWay.setPassNode(pass); - gateWay.setParentNode(properties.getString("parentNode")); gateWay.setId(node.getString("id")); gateWay.setType(node.getString("type")); gateWay.setName(properties.getString("name")); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/SendMsgConverter.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/SendMsgConverter.java index 33c791f9..3192c620 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/SendMsgConverter.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/SendMsgConverter.java @@ -17,13 +17,12 @@ public class SendMsgConverter extends BaseNodeConverter { public FlowNode convertToBpmnModel(Iterator iterator, JSONObject node, BpmnModel model) { JSONObject properties = node.getJSONObject("properties"); String type = node.getString("type"); - Boolean pass = properties.getBoolean("pass"); + Boolean pass = properties.getBoolean("passNode"); SendMsg msg = new SendMsg(); msg.setPassNode(pass); msg.setId(node.getString("id")); msg.setType(node.getString("type")); msg.setName(properties.getString("name")); - msg.setParentNode(properties.getString("parentNode")); msg.setDocumentation(properties.getString("documentation")); //设置触发事件 msg.setExecutionListeners(null); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/ServerTaskConverter.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/ServerTaskConverter.java index 8e22b5a1..323f6ad3 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/ServerTaskConverter.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/ServerTaskConverter.java @@ -18,11 +18,12 @@ public class ServerTaskConverter extends BaseNodeConverter { public FlowNode convertToBpmnModel(Iterator iterator, JSONObject node, BpmnModel model) { JSONObject properties = node.getJSONObject("properties"); String type = node.getString("type"); - Boolean pass = properties.getBoolean("pass"); + Boolean pass = properties.getBoolean("passNode"); ServerTask form = new ServerTask(); form.setId(node.getString("id")); form.setType(node.getString("type")); - form.setParentNode(properties.getString("parentNode")); + form.setCategory(properties.getString("category")); + form.setName(properties.getString("name")); form.setDocumentation(properties.getString("documentation")); //设置触发事件 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/StartEventConverter.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/StartEventConverter.java index adbd228a..dee9f378 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/StartEventConverter.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/StartEventConverter.java @@ -21,8 +21,6 @@ public class StartEventConverter extends BaseNodeConverter { start.setId(node.getString("id")); start.setType(node.getString("type")); start.setName(properties.getString("name")); - start.setParentNode(properties.getString("parentNode")); - start.setDocumentation(properties.getString("documentation")); //设置触发事件 start.setPassNode(true); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/SubProcessConverter.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/SubProcessConverter.java index 75cd25c6..3254527a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/SubProcessConverter.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/SubProcessConverter.java @@ -19,12 +19,12 @@ public class SubProcessConverter extends BaseNodeConverter { public FlowNode convertToBpmnModel(Iterator iterator, JSONObject node, BpmnModel model) { JSONObject properties = node.getJSONObject("properties"); String type = node.getString("type"); - Boolean pass = properties.getBoolean("pass"); + Boolean pass = properties.getBoolean("passNode"); SubProcess subProcess = new SubProcess(); subProcess.setPassNode(pass); subProcess.setId(node.getString("id")); subProcess.setType(node.getString("type")); - subProcess.setParentNode(properties.getString("parentNode")); + subProcess.setChildren(node.getJSONArray("children").toJavaList(String.class)); subProcess.setName(properties.getString("name")); subProcess.setDocumentation(properties.getString("documentation")); //设置触发事件 @@ -40,8 +40,7 @@ public class SubProcessConverter extends BaseNodeConverter { JSONObject next = iterator.next(); iterator.remove(); FlowNode flowNode = BpmnJSONConverter.Node_Converter.get(next.getString("type")).convertToBpmnModel(iterator, next, model); - String parentNode = flowNode.getParentNode(); - if (StringUtils.isNotEmpty(parentNode) && subProcess.getId().equals(parentNode)){ + if (subProcess.getChildren().contains(flowNode.getId())){ subProcess.getFlowElementMap().put(flowNode.getId(),flowNode); subProcess.getFlowElementList().add(flowNode); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java index d6297266..e91d87e4 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java @@ -37,14 +37,21 @@ public abstract class FlowNodeActivityBehavior { public final void activity(ExecutionEntity entity) { try { //当前节点 + if (StringUtils.isNotEmpty(entity.getProc_inst_id())){ + iActRuExecutionService.update(new UpdateWrapper() + .eq("proc_inst_id",entity.getProc_inst_id()) + .set("activity_id", entity.getActivityId()) + .set("activity_name", entity.getActivityName()) + .set("form_type", entity.getForm_type()) + .set("form_id", entity.getForm_id()) + .set("remark", "") + .set("status", StatusEnum.FLOW_STATUS.code("启动")) + .set("form_data", JSONObject.toJSON(entity.getT()).toString()) + .set("update_time", DateUtil.now())); + } this.execute(entity); iActRuExecutionService.update(new UpdateWrapper() .eq("proc_inst_id",entity.getProc_inst_id()) - .set("activity_id", entity.getActivityId()) - .set("activity_name", entity.getActivityName()) - .set("form_type", entity.getForm_type()) - .set("form_id", entity.getForm_id()) - .set("remark", "") .set("status", StatusEnum.FLOW_STATUS.code("执行中")) .set("form_data", JSONObject.toJSON(entity.getT()).toString()) .set("update_time", DateUtil.now())); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormActivityBehavior.java index 8193939d..c548c713 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormActivityBehavior.java @@ -101,7 +101,7 @@ public class FormActivityBehavior extends FlowNodeActivityBehavior { iostorinvService.save(mst); entity.setT(handler); entity.setForm_id(mst.getId()); - entity.setForm_type("IOSTOR_INV"); + entity.setForm_type("ST_IVT_IOSTORINV_IN"); } } } 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 593009d3..241d7b6a 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 @@ -23,15 +23,13 @@ public class ServerTaskActivityBehavior extends FlowNodeActivityBehavior typeHandler = TypeHandler.HANDLER_MAP.get(currentNode.getCategory()); + TypeHandler typeHandler = TypeHandler.HANDLER_MAP.get(currentNode.getCategory()); if (typeHandler == null) { throw new BadRequestException("【flow】当前节点处理类型未定义"); } - typeHandler.handler(currentNode.getSkipExpression(), entity.getT().getJSONArray("item"), null); + typeHandler.handler(currentNode.getSkipExpression(), entity.getT(), null); } - super.execute(entity); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/SubProcessActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/SubProcessActivityBehavior.java index 4b875d12..69303b0b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/SubProcessActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/SubProcessActivityBehavior.java @@ -61,7 +61,7 @@ public class SubProcessActivityBehavior extends FlowNodeActivityBehavior incomingFlows = new ArrayList<>(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/SubProcess/SubProcess.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/SubProcess/SubProcess.java index 32ae931c..4253ac79 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/SubProcess/SubProcess.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/SubProcess/SubProcess.java @@ -23,6 +23,7 @@ import java.util.Map; @Data public class SubProcess extends FlowNode { + protected List children = new ArrayList<>(); protected Map flowElementMap = new LinkedHashMap<>(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/ServerTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/ServerTask.java index a9d1b009..4b4053a3 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/ServerTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/node/impl/task/impl/ServerTask.java @@ -3,6 +3,7 @@ package org.nl.wms.flow_manage.flow.framework.entity.node.impl.task.impl; import lombok.Data; import org.nl.wms.flow_manage.flow.framework.entity.node.impl.task.ExecuteTask; +import java.util.ArrayList; import java.util.List; /* @@ -12,5 +13,5 @@ import java.util.List; @Data public class ServerTask extends ExecuteTask { protected String category; - protected List skipExpression; + protected List skipExpression=new ArrayList<>(); } 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 3bbaefb1..5ad8f550 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 @@ -15,6 +15,7 @@ import org.nl.wms.decision_manage.service.IStStrategyConfigService; import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler; import org.nl.wms.pm_manage.form_data.service.IPmFormDataService; import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; +import org.nl.wms.stor_manage.service.in.iostor_dtl.IStIvtIostorinvdtlInService; import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -37,7 +38,7 @@ public class DecisionHandler extends TypeHandler { @Autowired private IStIvtStructattrService iStIvtStructattrService; @Autowired - private IPmFormDataService iPmFormDataService; + private IStIvtIostorinvdtlInService stIvtIostorinvdtlInService; @Autowired private Map decisionHandlerMap; @@ -50,33 +51,34 @@ public class DecisionHandler extends TypeHandler { */ @Override - public JSONObject handler(List params, JSONObject entity, BmFormStruc form_struc) { + public JSONObject handler(List params, JSONObject item_json, BmFormStruc form_struc) { //出入库明细 - JSONArray item = entity.getJSONArray("item"); - for (int i = 0; i < item.size(); i++) { - JSONObject item_json = item.getJSONObject(i); - PmFormData iostorinvdtlIn = item_json.toJavaObject(PmFormData.class); - List list = iStIvtStructattrService.list(new QueryWrapper() - .eq("is_emp", true) - .eq("is_used", true) - .eq("stor_code",iostorinvdtlIn.getStor_code())); - for (String param : params) { - Decisioner decisioner = decisionHandlerMap.get(param); - list = decisioner.handler(list, iostorinvdtlIn); - if (CollectionUtils.isEmpty(list)){ - throw new BadRequestException("当前分配策略无可用货位"); - } - //跟新货位载具 - String struct_code = list.get(0).getStruct_code(); - //更新仓位，更新数据 - iStIvtStructattrService.update(new UpdateWrapper() - .set("vahicle_code",struct_code) - .eq("struct_code",struct_code)); - iPmFormDataService.updateById(iostorinvdtlIn); - item_json.getJSONObject("form_data").put("point_code2", struct_code); + StIvtIostorinvdtlIn iostorinvdtlIn = item_json.toJavaObject(StIvtIostorinvdtlIn.class); + List list = iStIvtStructattrService.list(new QueryWrapper() + .eq("is_emp", true) + .eq("is_used", true) + .eq("stor_code",iostorinvdtlIn.getStor_code())); + for (String param : params) { + Decisioner decisioner = decisionHandlerMap.get(param); + list = decisioner.handler(list, iostorinvdtlIn); + if (CollectionUtils.isEmpty(list)){ + throw new BadRequestException("当前分配策略无可用货位"); } - System.out.println(list); + //跟新货位载具 + String struct_code = list.get(0).getStruct_code(); + //更新仓位，更新数据 + iStIvtStructattrService.update(new UpdateWrapper() + .set("vahicle_code",struct_code) + .eq("struct_code",struct_code)); +// iPmFormDataService.updateById(iostorinvdtlIn); + stIvtIostorinvdtlInService.updateById(iostorinvdtlIn); + item_json.getJSONObject("form_data").put("point_code2", struct_code); } + System.out.println(list); +// JSONArray item = entity.getJSONArray("item"); +// for (int i = 0; i < item.size(); i++) { +// +// } return null; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ExpressionHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ExpressionHandler.java index 6dee25db..88d87b8a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ExpressionHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/ExpressionHandler.java @@ -11,7 +11,7 @@ import java.util.List; * @author ZZQ * @Date 2024/3/21 15:16 */ -@Service("express") +@Service("expression") public class ExpressionHandler extends TypeHandler { @Override diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java index 40ebebdb..2082f4ca 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java @@ -95,5 +95,10 @@ public class ActDeModel implements Serializable { */ private String tenant_id; + /** + * 归属租户 + */ + private String status; + }