From 1f5cf5da0b74ae07e54a3c3b7973681ec56088a0 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Thu, 20 Mar 2025 19:10:01 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E4=BA=8C=E6=A5=BC?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E5=87=BA=E5=BA=93=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E4=BB=BB=E5=8A=A1=E7=94=B3=E8=AF=B7=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E8=BF=94=E5=9B=9E400=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/impl/GroupDickInStorageTask.java | 50 ++++++++++++------- .../handler/impl/PalletInStorageTask.java | 27 ++++++---- .../service/impl/CockpitServiceImpl.java | 3 +- .../controller/PmFormDataController.java | 3 +- .../dao/mapper/xml/StIvtStructattrMapper.xml | 1 + .../wms/pm_manage/feedback_data/index.vue | 3 +- 6 files changed, 55 insertions(+), 32 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 66e749e9..95c66326 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 @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.enums.StatusEnum; @@ -29,6 +30,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.List; +import java.util.stream.Collectors; /** @@ -59,32 +61,32 @@ public class GroupDickInStorageTask extends AbstractTask { public JSONObject createTask(JSONObject data) { for (String vehicle_code : data.keySet()) { String point_code1 = data.getString(vehicle_code); - if (StringUtils.isEmpty(point_code1)){ + if (StringUtils.isEmpty(point_code1)) { throw new BadRequestException("申请任务失败:请求参数数据异常"); } List item = iMdPbVehicleMaterService.getVehicleMaters(vehicle_code); - if (CollectionUtils.isEmpty(item)){ - throw new BadRequestException("申请任务失败:载具"+vehicle_code+"载具物料信息信息不存在"); + if (CollectionUtils.isEmpty(item)) { + throw new BadRequestException("申请任务失败:载具" + vehicle_code + "载具物料信息信息不存在"); } String groupId = item.get(0).getGroup_id(); MdGruopDick mst = iMdGruopDickService.getById(groupId); SchBaseTask schBaseTask = iSchBaseTaskService.getOne(new QueryWrapper() .eq("vehicle_code", vehicle_code).select("task_code") - .lt("status",StatusEnum.FORM_STATUS.code("完成"))); - if (schBaseTask!=null){ - throw new BadRequestException("申请任务失败:载具"+vehicle_code+"已经存任务"+schBaseTask.getTask_code()); + .lt("status", StatusEnum.FORM_STATUS.code("完成"))); + if (schBaseTask != null) { + throw new BadRequestException("申请任务失败:载具" + vehicle_code + "已经存任务" + schBaseTask.getTask_code()); } JSONObject mstJ = (JSONObject) JSONObject.toJSON(mst); MdPbVehicleMaterVo vehicleMater = item.get(0); mstJ.put("stor_code", vehicleMater.getStor_code()); //更新载具proc_inst_id String currentInstId = vehicleMater.getProc_inst_id(); - if (StringUtils.isNotEmpty(currentInstId)){ - System.out.println("载具"+vehicle_code+"任务流程信息不存在"+currentInstId); + if (StringUtils.isNotEmpty(currentInstId)) { + System.out.println("载具" + vehicle_code + "任务流程信息不存在" + currentInstId); ActRuExecution execution = iActRuExecutionService.getById(currentInstId); - if (execution == null){ - throw new BadRequestException("申请任务失败:载具"+vehicle_code+"任务流程信息不存在"+currentInstId); + if (execution == null) { + throw new BadRequestException("申请任务失败:载具" + vehicle_code + "任务流程信息不存在" + currentInstId); } FlowContinueEvent continueEvent = new FlowContinueEvent(currentInstId, null, new JSONObject(MapOf.of("start_point", point_code1))); BussEventMulticaster.Publish(continueEvent); @@ -96,17 +98,29 @@ public class GroupDickInStorageTask extends AbstractTask { }else { BussEventMulticaster.Publish( new FlowStartEvent("md_group", - (proc_inst_id,empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper() - .set("proc_inst_id",proc_inst_id) - .eq("vehicle_code",vehicle_code) - .eq("is_delete",false)) - ,new JSONObject(MapOf.of("start_point", point_code1))) - .build("md_group_dick",mst.getId(),mst.getSource_form_type(),mst.getSource_form_id(), mstJ) - .build("md_pb_vehicleMater",item) + (proc_inst_id, empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper() + .set("proc_inst_id", proc_inst_id) + .eq("vehicle_code", vehicle_code) + .eq("is_delete", false)) + , new JSONObject(MapOf.of("start_point", point_code1))) + .build("md_group_dick", mst.getId(), mst.getSource_form_type(), mst.getSource_form_id(), mstJ) + .build("md_pb_vehicleMater", item) ); } } - return null; + List list = iSchBaseTaskService.list(new QueryWrapper().in("vehicle_code", data.keySet()) + .lt("status", StatusEnum.FORM_STATUS.code("完成"))); + JSONObject jsonObject = new JSONObject(); + if (ObjectUtils.isNotEmpty(list)) { + if (list.size() == data.keySet().size()) { + jsonObject.put("task_code", list.size() > 1 ? list.stream().map(SchBaseTask::getTask_code).collect(Collectors.joining(",")) : list.get(0).getTask_code()); + return jsonObject; + } else { + return null; + } + } else { + return null; + } } @Override diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java index 149a2623..60730fb1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.enums.StatusEnum; @@ -59,7 +60,7 @@ public class PalletInStorageTask extends AbstractTask { @Override public JSONObject createTask(JSONObject data) { -// :{"start_point":"1120","vehicle_code":"T00000199","height":0} + // :{"start_point":"1120","vehicle_code":"T00000199","height":0} String point_code1 = data.getString("start_point"); String vehicle_code = data.getString("vehicle_code"); String h = data.getString("height"); @@ -123,16 +124,24 @@ public class PalletInStorageTask extends AbstractTask { mstJ.put("stor_code", vehicleMater.getStor_code()); BussEventMulticaster.Publish( new FlowStartEvent("md_group", - (proc_inst_id,empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper() - .set("proc_inst_id",proc_inst_id) - .eq("vehicle_code",vehicle_code) - .eq("is_delete",false)) - ,new JSONObject(MapOf.of("start_point", point_code1))) - .build("md_group_dick",mst.getId(),mst.getSource_form_type(),mst.getSource_form_id(), mstJ) - .build("md_pb_vehicleMater",item) + (proc_inst_id, empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper() + .set("proc_inst_id", proc_inst_id) + .eq("vehicle_code", vehicle_code) + .eq("is_delete", false)) + , new JSONObject(MapOf.of("start_point", point_code1))) + .build("md_group_dick", mst.getId(), mst.getSource_form_type(), mst.getSource_form_id(), mstJ) + .build("md_pb_vehicleMater", item) ); } - return null; + List list = iSchBaseTaskService.list(new QueryWrapper().eq("vehicle_code", vehicle_code) + .lt("status", StatusEnum.FORM_STATUS.code("完成"))); + if (ObjectUtils.isNotEmpty(list)) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("task_code", list.get(0).getTask_code()); + return jsonObject; + } else { + return null; + } } @Override diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java index 5e2058ed..adf5a134 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/impl/CockpitServiceImpl.java @@ -74,7 +74,7 @@ public class CockpitServiceImpl implements CockpitService { */ @Override public List queryPickingPoint() { - return schBasePointServiceImpl.list(new LambdaQueryWrapper().eq(SchBasePoint::getRegion_code, "PICK01").eq(SchBasePoint::getIs_used, true)); + return schBasePointServiceImpl.list(new LambdaQueryWrapper().eq(SchBasePoint::getRegion_code, "PICK01")); } @@ -456,6 +456,7 @@ public class CockpitServiceImpl implements CockpitService { */ @Override public List pickingInfo(String code) { + // List pointList = schBasePointServiceImpl.list(new LambdaQueryWrapper().eq(SchBasePoint::getRegion_code, "PICK01")); List taskList = cockpitMapper.getPickingTask(code); taskList.forEach(r -> { if (StringUtils.isNotBlank(r.getForm_data())) { 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 277ab41b..848cd0b0 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 @@ -96,8 +96,7 @@ public class PmFormDataController { iPmFormDataService.update( new LambdaUpdateWrapper() .set(PmFormData::getStatus, StatusEnum.FORM_STATUS.code("完成")) - .in(PmFormData::getId, ids) - ); + .in(PmFormData::getId, ids)); } return new ResponseEntity<>(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 13094df9..f903136e 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 @@ -166,6 +166,7 @@ left join md_me_materialbase material on vm.material_id = material.material_id struct.vehicle_code is not null + AND (struct.stor_code != 'HStockId' and struct.stor_code != 'CStockId' ) and vm.is_delete = false and (struct.struct_code LIKE '%${query.search}%' diff --git a/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue b/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue index 16f139d6..fcef4a7c 100644 --- a/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue +++ b/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue @@ -426,9 +426,8 @@ export default { return } const ids = this.currentRow.map(row => row.id) - // 构造参数 const param = { - data: ids // 将提取的 id 数组赋值给 param.data + data: ids } crudFormData.confirm(param).then(res => { this.crud.notify('单据处理成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)