From d1628efd151f3df8f2772906879b25f95dc9feef Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 4 Jul 2024 10:08:13 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/enums/StatusEnum.java | 4 ++-- .../chainer/impl/EndDecisionChainer.java | 2 +- .../task/handler/impl/InStorageTask.java | 2 +- .../nodeType/excess/impl/DecisionHandler.java | 18 +++++++++++++----- .../controller/StIvtStructattrController.java | 6 ++++++ .../dao/mapper/xml/StIvtStructattrMapper.xml | 3 +++ .../views/wms/dispatch_manage/task/index.vue | 4 ++-- .../wms/stor_manage/storIvtInfo/index.vue | 9 ++++++++- 8 files changed, 36 insertions(+), 12 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 dc069fd9..c3046173 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 @@ -22,11 +22,11 @@ public enum StatusEnum { * 流程相关 */ MODEL_STATUS(ForkMap.of("发布", "10",null, "未发布", "30",null)), - FLOW_STATUS(ForkMap.of("启动", "10",null, "节点完成", "20",null,"暂停", "30",null,"完成", "90",null)), + FLOW_STATUS(ForkMap.of("启动", "10",null, "节点完成", "20",null,"暂停", "30",null,"完成", "80",null)), /** * 单据状态 */ - FORM_STATUS(ForkMap.of("生成", "10",null,"已分配", "13", null,"执行中", "20",null,"暂停", "30",null,"完成", "90",null,"取消", "100",null)), + FORM_STATUS(ForkMap.of("生成", "10",null,"已分配", "13", null,"执行中", "20",null,"暂停", "30",null,"完成", "80",null,"取消", "90",null)), /** * 出入库单据类型 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/EndDecisionChainer.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/EndDecisionChainer.java index 503a66dc..12eed7b3 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/EndDecisionChainer.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/EndDecisionChainer.java @@ -55,7 +55,7 @@ public class EndDecisionChainer extends DecisionerChain { .set("vehicle_code", startParam.getString("vehicle_code")) .set("lock_type", StatusEnum.LOCK.code("入库锁")) .eq("struct_code", structattr.getStruct_code())); - System.out.println("货位绑定成功"+structattr.getStruct_code()); + System.out.println("货位绑定成功"+structattr.getStruct_code()+"_"+startParam.getString("vehicle_code")); structs.add(structattr.getStruct_code()); }else { for (StructattrVechielDto vechielDto : ((List) transfers)) { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java index 56f9cad0..82b20b0c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java @@ -52,7 +52,7 @@ public class InStorageTask extends AbstractTask { throw new BadRequestException("创建任务失败:方法请求参数不能为空"); } List list = iSchBaseTaskService.list(new QueryWrapper().eq("vehicle_code", vehicle_code) - .ne("status", StatusEnum.FORM_STATUS.code("完成"))); + .lt("status", StatusEnum.FORM_STATUS.code("完成"))); if (!CollectionUtils.isEmpty(list)){ throw new BadRequestException("当前载具存在任务:"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.joining(","))); } 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 3ff4974b..7dbb2244 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 @@ -25,6 +25,7 @@ import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler; import org.nl.wms.stor_manage.struct.service.dto.StructattrVechielDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -70,23 +71,30 @@ public class DecisionHandler extends TypeHandler map = SpringContextHolder.getBean(DecisionHandler.class).dispense(params, item_json); + Map map = this.dispense(params, item_json); //更新仓位，更新数据 System.out.println(flow.getForm_type()+"更新明细id"+item_json.getString("id")); item_json.putAll(map); return t; } - @Transactional(propagation= Propagation.REQUIRES_NEW) public Map dispense(List params, JSONObject iostorinvdtl) { if (StringUtils.isEmpty(iostorinvdtl.getString("stor_code"))){ throw new BadRequestException("出入库策略执行异常:单据确认仓库编码"); } + Map decisionerMap = SpringContextHolder.getBeansOfType(Decisioner.class); + Decisioner decisioner = decisionerMap.get(params.get(0)); AtomicReference atomicResult = new AtomicReference<>(); + System.out.println("---1--"+Thread.currentThread().getName()); RedissonUtils.lock(()->{ - DecisionerChain> start = ChainerService.start(params, iostorinvdtl); - Map process = start.process(null); + System.out.println("---3--"+Thread.currentThread().getName()); + Map process = SpringContextHolder.getBean(DecisionHandler.class).dispenseTransa(params, iostorinvdtl); atomicResult.set(process); - },"入"+iostorinvdtl.getString("stor_code"),2); + },decisioner.strategyConfig.getStrategy_type()+iostorinvdtl.getString("stor_code"),10); return atomicResult.get(); } + @Transactional(propagation= Propagation.REQUIRES_NEW) + public Map dispenseTransa(List params, JSONObject iostorinvdtl) { + DecisionerChain> start = ChainerService.start(params, iostorinvdtl); + return start.process(null); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java index 3addbea9..5ccb8085 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java @@ -71,6 +71,12 @@ public class StIvtStructattrController { return new ResponseEntity<>(HttpStatus.OK); } + /** + * 库存查看 + * @param query + * @param page + * @return + */ @GetMapping("/getStructIvt") public ResponseEntity getStructIvt(StructattrQuery query, PageQuery page) { return new ResponseEntity<>(structattrService.getStructIvt(query,page), HttpStatus.OK); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml index eb3d393a..4b37c931 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml @@ -108,9 +108,12 @@ struct.sect_code, struct.stor_code, struct.vehicle_code, + struct.update_time, + struct.lock_type, vm.pcsn, vm.qty, vm.frozen_qty, + vm.unit_id, vm.parent_vehicle_code, material.material_code, material.material_name diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue index 309cd6dc..af48ce8f 100644 --- a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue +++ b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue @@ -274,10 +274,10 @@ export default { let status = '' switch (command) { case 'a':// 完成 - status = '90' + status = '80' break case 'b':// 取消 - status = '100' + status = '90' break case 'c':// 下发 status = '20' diff --git a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue index f4c1bcfe..a4929416 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue @@ -105,7 +105,12 @@ - + + + + + + @@ -152,6 +157,8 @@ export default { dicts: [], name: 'StructIvtInfo', components: {pagination, crudOperation, rrOperation, udOperation}, + tableEnums: [ 'bm_measure_unit#unit_name#unit_id' ], + statusEnums: [ 'LOCK' ], mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({