From 0e9a35adac4d80ca7d00a331290c14c9828da5d5 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 29 Aug 2024 16:20:07 +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 --- .../service/impl/SchBaseTaskServiceImpl.java | 21 ++++++++++------- .../behavior/FlowNodeActivityBehavior.java | 1 - .../wms/pda_manage/group/GroupController.java | 23 +++++++++++-------- .../controller/PmFormDataController.java | 2 ++ .../service/impl/PmFormDataServiceImpl.java | 6 ++--- 5 files changed, 31 insertions(+), 22 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java index 45ad46d0..1ffe74fa 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java @@ -242,14 +242,16 @@ public class SchBaseTaskServiceImpl extends ServiceImpl().eq("struct_code", struct_code)); + String vehicleCode = struct.getVehicle_code(); RedissonUtils.lock(() -> { System.out.println("---3--" + Thread.currentThread().getName()); - Map process = SpringContextHolder.getBean(DecisionHandler.class).dispenseTransa(ListOf.of("nearby"), new JSONObject(MapOf.of("stor_code", stIvtStructattr.getStor_code()))); + Map process = SpringContextHolder.getBean(DecisionHandler.class).dispenseTransa(ListOf.of("nearby","depthPriority"), new JSONObject(MapOf.of("stor_code", stIvtStructattr.getStor_code()))); moveStruct.set(((Map) process.get("form_data")).get("end_struct_code")); }, "1" + stIvtStructattr.getStor_code(), 5); Map moveForm = MapOf.of("task_type", StatusEnum.IOBILL_TYPE_MOVE.code("异常位移库") , "is_send", false - , "vehicle_code", "YCZJ" + task_code, "form_data", new JSONObject(MapOf.of("start_struct_code", struct_code, "end_struct_code", moveStruct.get()))); + , "vehicle_code", StringUtils.isEmpty(vehicleCode)?"YCZJ" + task_code:vehicleCode, "form_data", new JSONObject(MapOf.of("start_struct_code", struct_code, "end_struct_code", moveStruct.get()))); moveStorageTask.createTask(new JSONObject(moveForm)); } @@ -271,12 +273,15 @@ public class SchBaseTaskServiceImpl extends ServiceImpl() - .eq("struct_code", struct_code) - .set("lock_type", StatusEnum.LOCK.code("异常锁定")) - .set("update_time", DateUtil.now()) - .set("remark", "入满异常:" + task_code) - .set("vehicle_code", "YCZJ" + task_code)); + StIvtStructattr struct = iStIvtStructattrService.getOne(new QueryWrapper().eq("struct_code", struct_code)); + if (StringUtils.isEmpty(struct.getVehicle_code())){ + iStIvtStructattrService.update(new UpdateWrapper() + .eq("struct_code", struct_code) + .set("lock_type", StatusEnum.LOCK.code("异常锁定")) + .set("update_time", DateUtil.now()) + .set("remark", "入满异常:" + task_code) + .set("vehicle_code", "YCZJ" + task_code)); + } JSONObject result = new JSONObject(); result.put("point_code2", new_struct_code); return result; 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 25aad9c7..1243f9d4 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 @@ -57,7 +57,6 @@ public abstract class FlowNodeActivityBehavior { .set("form_type", entity.getForm_type()) .set("aux_param", entity.getAuxParam().toString()) .set("form_id", entity.getForm_id()) - .set("remark", "") .set("status", StatusEnum.FLOW_STATUS.code("启动")) .set("form_data", entity.getT().toString()) .set("update_time", DateUtil.now())); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/group/GroupController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/group/GroupController.java index fcb6cb95..09be02bc 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/group/GroupController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/group/GroupController.java @@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.entity.PageQuery; +import org.nl.common.utils.RedissonUtils; import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService; import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase; import org.nl.wms.base_manage.material.service.dto.MaterialQuery; @@ -92,22 +93,24 @@ public class GroupController { /** * 手持物料组盘操作 - * @param form + * @param jform * @return */ @PostMapping("in") @SaIgnore @Log("手持物料组盘操作") public ResponseEntity inStorage(@RequestBody JSONObject jform) { - MaterGroupDto form = jform.toJavaObject(MaterGroupDto.class); - Assert.noNullElements(new Object[]{form,form.getItem(),form.getStor_code()},"请求参数不能为空"); - for (MaterItem item : form.getItem()) { - GroupItemData itemData = new GroupItemData(); - itemData.setSingle_weight(item.getSingle_weight()); - item.setForm_data(itemData); - item.setUnit_id("16"); - } - iMdGruopDickService.groupDick((JSONObject) JSONObject.toJSON(form)); + RedissonUtils.lock(()->{ + MaterGroupDto form = jform.toJavaObject(MaterGroupDto.class); + Assert.noNullElements(new Object[]{form,form.getItem(),form.getStor_code()},"请求参数不能为空"); + for (MaterItem item : form.getItem()) { + GroupItemData itemData = new GroupItemData(); + itemData.setSingle_weight(item.getSingle_weight()); + item.setForm_data(itemData); + item.setUnit_id("16"); + } + iMdGruopDickService.groupDick((JSONObject) JSONObject.toJSON(form)); + },"手持组盘入库",5); return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java index b66a40e9..a438b911 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java @@ -1,6 +1,7 @@ package org.nl.wms.pm_manage.form_data.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; @@ -26,6 +27,7 @@ import java.util.Arrays; */ @RestController @RequestMapping("/api/pmFormData") +@SaIgnore public class PmFormDataController { @Autowired diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java index a8eebf4f..5adbe353 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java @@ -134,11 +134,11 @@ public class PmFormDataServiceImpl extends ServiceImpl queryTree(FormDataQuery query, PageQuery pageQuery) { Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); page.setOrderBy("id DESC"); - this.baseMapper.queryTree(query); - return page; + List pmFormDataDtos = this.baseMapper.queryTree(query); + return pmFormDataDtos; }