From c380ae21b06c84c1cbec32517c97ed1ffd7cf1be Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 29 Oct 2024 10:01:01 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=89=98=E7=9B=98=E6=8B=A3=E9=80=89?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/AppRun.java | 2 +- .../handler/impl/PalletInStorageTask.java | 2 +- .../devicemanage/DeviceManageController.java | 2 +- .../iostorage/IOStorageController.java | 13 ++ .../service/impl/PmFormDataServiceImpl.java | 4 +- .../impl/StIvtIostorinvServiceImpl.java | 9 ++ .../pick/service/PickingService.java | 8 +- .../resources/config/application-dev3.yml | 2 +- .../wms/flow_manage/act/execution/index.vue | 46 +++--- .../views/wms/stor_manage/out/AddDialog.vue | 151 +++++++++--------- 10 files changed, 133 insertions(+), 106 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java index 7a4df8e0..a59e69c9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java @@ -42,7 +42,7 @@ public class AppRun implements CommandLineRunner { @Override public void run(String... args) { - HeartClientServer heartServer = new HeartClientServer(new InetSocketAddress("192.168.8.218", 20889)); +// HeartClientServer heartServer = new HeartClientServer(new InetSocketAddress("192.168.8.218", 20889)); System.out.println("--------项目启动完成--------"); } 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 5774e1ab..9daf30f2 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 @@ -62,7 +62,7 @@ public class PalletInStorageTask extends AbstractTask { throw new BadRequestException("申请任务失败:载具"+vehicle_code+"物料信息不存在"); } MdPbVehicleMaterVo vehicleMater = item.get(0); - + //拣选回库流程 BussEventMulticaster.Publish( new FlowStartEvent("pallet_in", (proc_inst_id,empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper() diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java index aad4b25a..0b54fae1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java @@ -101,7 +101,7 @@ public class DeviceManageController { if (vehicleMater == null){ throw new BadRequestException(String.format(vehicleCode+"载具组盘信息不存在")); } - wmsToAcsService.toCommand(device_code,form.getMode(),vehicleInfo.getH()); + wmsToAcsService.toCommand(device_code,"1",vehicleInfo.getH()); return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java index 88c8db03..341e2bfe 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java @@ -17,6 +17,8 @@ import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution; import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService; import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater; import org.nl.wms.pda_manage.palletio.service.PalletIostorinvService; +import org.nl.wms.pm_manage.form_data.service.IPmFormDataService; +import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -41,6 +43,8 @@ public class IOStorageController { private IMdPbVehicleMaterService iMdPbVehicleMaterService; @Autowired private IActRuExecutionService iActRuExecutionService; + @Autowired + private IPmFormDataService iPmFormDataService; @PostMapping("out") @@ -52,6 +56,7 @@ public class IOStorageController { .eq("vehicle_code", vehicle_code) .eq("is_delete", false)); if (one!=null){ + //流程校验 String proc_inst_id = one.getProc_inst_id(); if (!StringUtils.isEmpty(proc_inst_id)){ String parent_id = iActRuExecutionService.getParentByChild(proc_inst_id); @@ -62,6 +67,14 @@ public class IOStorageController { throw new BadRequestException(String.format("当前载具%s业务流程%s未完成",vehicle_code,parent_id)); } } + //单据校验"针对托盘库拣选 + int count = iPmFormDataService.count(new QueryWrapper() + .eq("form_type", "Picking") + .eq("vehicle_code", vehicle_code) + .lt("status", StatusEnum.FORM_STATUS.code("完成"))); + if (count>0){ + throw new BadRequestException(String.format("当前载具%s为拣选出库请先进行拣选操作",vehicle_code)); + } iMdPbVehicleMaterService.update(new UpdateWrapper() .set("is_delete",true) .set("proc_inst_id",null) 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 db163703..1ec6261f 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 @@ -157,8 +157,8 @@ public class PmFormDataServiceImpl extends ServiceImpl queryTree(FormDataQuery query, PageQuery pageQuery) { - Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); - page.setOrderBy("id DESC"); +// Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); +// page.setOrderBy("id DESC"); List pmFormDataDtos = this.baseMapper.queryTree(query); return pmFormDataDtos; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java index 71355f49..38c42cc1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java @@ -296,7 +296,16 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl() .set("frozen_qty", 0) .in("id", Arrays.asList(split))); + //更新点位锁定 + String vehicleCodes = iostorinvdtls.stream().map(StIvtIostorinvdtl::getVehicle_code).collect(Collectors.joining(",")); + String[] vehicleCodeSplit = vehicleCodes.split(","); + iStIvtStructattrService + .update(new UpdateWrapper() + .set("lock_type",StatusEnum.LOCK.code("无锁")) + .in("vehicle_code", Arrays.asList(vehicleCodeSplit)) + ); } + this.update(new UpdateWrapper() .set("status", StatusEnum.FORM_STATUS.code("取消")) .eq("id", id)); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java index 873244e5..9d21eed7 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java @@ -189,17 +189,15 @@ public class PickingService { PickingService pickingService = SpringContextHolder.getBean(this.getClass()); pickingService.disGroup(mst); + iFormDataService.update(new UpdateWrapper() + .set("status",StatusEnum.FORM_STATUS.code("执行中")) + .eq("id",mst.getId())); //只有透传才有vehicle_code参数否则只有inst_id FlowContinueEvent continueEvent = new FlowContinueEvent(mst.getProc_inst_id(), (PermeateFunction) (inst_id, vehicle_code) -> iMdPbVehicleMaterService.update(new UpdateWrapper() .set("proc_inst_id",inst_id) .eq("is_delete",false) .eq("vehicle_code",vehicle_code)), null) .setDto(dto); - continueEvent.setCallback(emp->{ - iFormDataService.update(new UpdateWrapper() - .set("status",StatusEnum.FORM_STATUS.code("执行中")) - .eq("id",mst.getId())); - }); BussEventMulticaster.Publish(continueEvent); } diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml index d5b76700..ebee11d7 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -8,7 +8,7 @@ spring: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://${DB_HOST:192.168.8.218}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false - url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + url: jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} password: ${DB_PWD:123456} diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue index ec5c7b71..b733063d 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue +++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue @@ -95,16 +95,15 @@ - - + - - - - - - - + + + + + + + - - - + + + + + + + + + + + + + @@ -306,12 +306,12 @@ export default { }) }, flowConfirm(proc_inst_id) { - curdExecution.flowConfirm(proc_inst_id).then(res => { + curdExecution.flowConfirm(proc_inst_id).then(res => { crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) }) this.crud.toQuery() }, - async load(tree, treeNode, resolve) { + async load(tree, treeNode, resolve) { curdExecution.queryByParentId(tree.proc_inst_id).then(res => { resolve(res) }) diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue index feafa0c2..2b9413a3 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue @@ -44,25 +44,26 @@ - + - + - +