diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-01-10.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-01-10.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-01-14.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-01-14.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-01-15.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-01-15.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-01-17.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-01-17.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-01-20.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-01-20.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-05.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-05.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-06.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-06.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-07.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-07.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-13.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-13.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-17.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-17.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-25.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-25.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-26.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-26.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-27.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-27.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-28.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-02-28.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-02.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-02.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-03.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-03.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-04.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-04.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-05.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-05.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-06.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-06.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-07.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-07.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-08.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-08.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-09.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-09.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-10.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/ErpLog/2025-03-10.0.log new file mode 100644 index 00000000..e69de29b 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 c2fc473f..bd42f5e8 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 @@ -82,7 +82,7 @@ public enum StatusEnum { "空货架", "0", null, "满货架", "1", null )), BIND_TYPE(ForkMap.of( - "解绑", "0", null, "绑定", "1", null + "解绑", "0", null, "绑定", "1", null, "不操作", "3", null )); /** * L:label diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/ErpServiceUtils.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/ErpServiceUtils.java index 35092620..ed5f964d 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/ErpServiceUtils.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/ErpServiceUtils.java @@ -82,7 +82,7 @@ public class ErpServiceUtils { } } } else { - throw new BadRequestException("系统正在自动同步ERP单据，正占用接口资源，请稍后再试"); + throw new BadRequestException("系统正在自动同步ERP单据，正占用接口资源，请稍后再试1"); } } catch (Exception ex) { throw new BadRequestException(ex.getMessage()); @@ -115,7 +115,7 @@ public class ErpServiceUtils { result.add(jsonObject); } } else { - throw new BadRequestException("系统正在自动同步ERP单据，正占用接口资源，请稍后再试"); + throw new BadRequestException("系统正在自动同步ERP单据，正占用接口资源，请稍后再试2"); } } catch (Exception ex) { throw new BadRequestException(ex.getMessage()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java index b0a39294..37d32bd8 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java @@ -64,11 +64,15 @@ public class SchBasePointController { public ResponseEntity update(@Validated @RequestBody SchBasePoint entity) { LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); //绑定或解绑 - if (entity.getVehicle_code() != null) { - TableDataInfo result = pointService.bindOrUnbind(entity.getCode(), entity.getVehicle_code(), (entity.getPriority())); - if (!"200".equals(result.getCode())) { - throw new BadRequestException( "地面站点:" + entity.getCode() + "绑定或解绑" + entity.getVehicle_code() + "指令下发CTU，返回操作失败，失败原因:" +result.getMsg()); + if (StringUtils.isNotBlank(entity.getVehicle_code())) { + if (!"3".equals(entity.getPriority())) { + TableDataInfo result = pointService.bindOrUnbind(entity.getCode(), entity.getVehicle_code(), (entity.getPriority())); + if (!"200".equals(result.getCode())) { + throw new BadRequestException("地面站点:" + entity.getCode() + "绑定或解绑" + entity.getVehicle_code() + "指令下发CTU，返回操作失败，失败原因:" + result.getMsg()); + } } + } else { + lambdaUpdateWrapper.set(SchBasePoint::getVehicle_code, null); } lambdaUpdateWrapper.set(SchBasePoint::getProduct_area, entity.getProduct_area()); lambdaUpdateWrapper.set(SchBasePoint::getRegion_code, entity.getRegion_code()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorEmptyShelfTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorEmptyShelfTask.java index a114c7d9..43f495a2 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorEmptyShelfTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorEmptyShelfTask.java @@ -87,8 +87,8 @@ public class SecondFloorEmptyShelfTask extends AbstractTask { .eq(SchBasePoint::getCode, schBaseTask.getPoint_code1())); //货架绑定 TableDataInfo tableDataInfo = iSchBasePointService.bindOrUnbind(schBaseTask.getPoint_code2(), schBaseTask.getVehicle_code(), "1"); - String bindResult = "200".equals(tableDataInfo.getCode()) ? "地面站点:" + schBaseTask.getPoint_code2() + "解绑" + schBaseTask.getVehicle_code() + "指令下发CTU，返回解绑成功！" : - "地面站点:" + schBaseTask.getPoint_code2() + "解绑" + schBaseTask.getVehicle_code() + "指令下发CTU，返回解绑失败，请操作站点绑定，失败原因：" + tableDataInfo.getMsg(); + String bindResult = "200".equals(tableDataInfo.getCode()) ? "地面站点:" + schBaseTask.getPoint_code2() + "绑定" + schBaseTask.getVehicle_code() + "指令下发CTU，返回绑定成功！" : + "地面站点:" + schBaseTask.getPoint_code2() + "绑定" + schBaseTask.getVehicle_code() + "指令下发CTU，返回绑定失败，请操作站点绑定，失败原因：" + tableDataInfo.getMsg(); iSchBaseTaskService.update(new LambdaUpdateWrapper() .set(SchBaseTask::getRemark, bindResult) .eq(SchBaseTask::getId, schBaseTask.getId())); 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 19d47488..b5b7e23d 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 @@ -153,9 +153,8 @@ public class DeviceManageController { HashMap map = new HashMap<>(); ArrayList list = new ArrayList<>(); list.add(MapOf.of("text","二楼出库点","value","2127")); - list.add(MapOf.of("text","三楼出库点","value","3104")); + list.add(MapOf.of("text","三楼出库点","value","3110")); list.add(MapOf.of("text","一楼出库点","value","1131")); - return new ResponseEntity<>(list,HttpStatus.OK); } @PostMapping("transfConfirm") diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java index 29577cc5..0f37dbb2 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java @@ -212,7 +212,7 @@ public class SyncErpBillsScheduleService { return "同步成功，共计" + result.size() + "条"; } }else { - throw new BadRequestException("系统正在自动同步ERP单据，正占用接口资源，请稍后再试"); + throw new BadRequestException("3系统正在自动同步ERP单据，正占用接口资源，请稍后再试3"); } } catch (Exception ex) { throw new BadRequestException(ex.getMessage()); diff --git a/wms_pro/qd/.env.development b/wms_pro/qd/.env.development index a07fe1aa..e5c033ac 100644 --- a/wms_pro/qd/.env.development +++ b/wms_pro/qd/.env.development @@ -1,8 +1,8 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://127.0.0.1:8012' -VUE_APP_WS_API = 'ws://127.0.0.1:8012' +VUE_APP_BASE_API = 'http://127.0.0.1:8099' +VUE_APP_WS_API = 'ws://127.0.0.1:8099' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue b/wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue index b7d46ab6..6634ab9c 100644 --- a/wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue +++ b/wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue @@ -169,6 +169,21 @@ /> + + + + + @@ -235,11 +250,11 @@ - - - - - + + + + +