From 7a5f0dfdc3d56208677b0973cff2beb5ab0cade7 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 19 Jul 2024 09:49:19 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=85=BC=E5=AE=B9vehicle=5Fid?= =?UTF-8?q?=EF=BC=9B=E8=BD=BD=E5=85=B7=E7=89=A9=E6=96=99=E8=A1=A8=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=BD=BD=E5=85=B7=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=9Ais=5Fdelete?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/common/domain/aspect/LogAspect.java | 1 + .../handler/GlobalExceptionHandler.java | 16 -------- .../org/nl/common/utils/RedissonUtils.java | 1 - .../controller/SchBaseTaskController.java | 7 ++-- .../handler/impl/GroupDickInStorageTask.java | 4 +- .../service/impl/SchBaseTaskServiceImpl.java | 7 +++- .../acs/controller/AcsToWmsController.java | 6 +-- .../service/impl/MdGruopDickServiceImpl.java | 4 +- .../iostorage/IOStorageController.java | 3 +- .../service/PalletIostorinvService.java | 8 ++-- .../service/CheckStorageService.java | 1 + .../impl/StIvtIostorinvServiceImpl.java | 2 +- .../pick/service/PickingService.java | 8 +++- .../wms/md_manage/group_dick/AddDialog.vue | 38 ++++++++++++++++++- 14 files changed, 67 insertions(+), 39 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/aspect/LogAspect.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/aspect/LogAspect.java index 2ce344c3..7ae460df 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/aspect/LogAspect.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/aspect/LogAspect.java @@ -79,6 +79,7 @@ public class LogAspect { // logService.save(getUsername(), StringUtils.getBrowser(request), requestIp, joinPoint, log); // } }catch (Exception ex){ + StringBuffer errorStack = new StringBuffer(); errorStack.append("
【异常堆栈:"); String errorMsg = ex.getMessage(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/exception/handler/GlobalExceptionHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/exception/handler/GlobalExceptionHandler.java index 96e5eb53..84e16bb0 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/exception/handler/GlobalExceptionHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/exception/handler/GlobalExceptionHandler.java @@ -65,22 +65,6 @@ public class GlobalExceptionHandler { return buildResponseEntity(ApiError.error(e.getStatus(),e.getMessage())); } - /** - * 处理所有接口数据验证异常 - */ - @ExceptionHandler(MethodArgumentNotValidException.class) - public ResponseEntity handleMethodArgumentNotValidException(MethodArgumentNotValidException e){ - // 打印堆栈信息 - log.error(ApiError.getStackTrace(e)); - String[] str = Objects.requireNonNull(e.getBindingResult().getAllErrors().get(0).getCodes())[1].split("\\."); - String message = e.getBindingResult().getAllErrors().get(0).getDefaultMessage(); - String msg = "不能为空"; - if(msg.equals(message)){ - message = str[1] + ":" + message; - } - return buildResponseEntity(ApiError.error(message)); - } - /** * 统一返回 */ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java index 6e2bed59..ffaeef79 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java @@ -37,7 +37,6 @@ public class RedissonUtils { throw new BadRequestException("当前业务:"+key+"正在执行请稍后再试"); } }catch (Exception ex){ - ex.printStackTrace(); throw ex; }finally { if (lock.isHeldByCurrentThread() && lock.isLocked()){ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java index ca6b006b..89daa5a0 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -43,10 +44,8 @@ public class SchBaseTaskController { @PostMapping("getVehicleTask") public ResponseEntity getVehicleTask(@RequestBody JSONObject param) { - if (CollectionUtils.isEmpty(param)){ - throw new BadRequestException("参数不能为空"); - } - return new ResponseEntity<>(iSchBaseTaskService.getByVehicle(param.getString("vehicle_code")), HttpStatus.OK); + Assert.noNullElements(new Object[]{param,param.getString("vehicle_id")},"请求参数不能为空"); + return new ResponseEntity<>(iSchBaseTaskService.getByVehicle(param.getString("vehicle_id")), HttpStatus.OK); } 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 6f5b9bf1..3a14f867 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 @@ -61,7 +61,9 @@ public class GroupDickInStorageTask extends AbstractTask { if (StringUtils.isEmpty(point_code1)){ throw new BadRequestException("申请任务失败:请求参数数据异常"); } - MdGruopDick mst = iMdGruopDickService.getOne(new QueryWrapper().eq("vehicle_code", vehicle_code).le("status", StatusEnum.FORM_STATUS.code("完成"))); + MdGruopDick mst = iMdGruopDickService + .getOne(new QueryWrapper().eq("vehicle_code", vehicle_code) + .lt("status", StatusEnum.FORM_STATUS.code("完成"))); if (mst == null){ throw new BadRequestException("申请任务失败:载具"+vehicle_code+"组盘信息不存在"); } 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 ae13a274..a24716ce 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 @@ -138,7 +138,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl() - .eq("vehicle_code", task.getVehicle_code())); + .eq("vehicle_code", task.getVehicle_code()) + .eq("is_delete",false)); if (vehicleMater != null && !StringUtils.isEmpty(vehicleMater.getProc_inst_id())) { FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMater.getProc_inst_id(), null, null); BussEventMulticaster.Publish(continueEvent); @@ -253,7 +254,9 @@ public class SchBaseTaskServiceImpl extends ServiceImpl().eq("vehicle_code", task.getVehicle_code())); + MdPbVehicleMater vehicleCode = iMdPbVehicleMaterService + .getOne(new QueryWrapper() + .eq("vehicle_code", task.getVehicle_code())); //查询分配规则 Map map = SpringContextHolder.getBean(DecisionHandler.class) .dispenseTransa(ListOf.of("nearby"), new JSONObject(MapOf.of("stor_code", stIvtStructattr.getStor_code()))); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/controller/AcsToWmsController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/controller/AcsToWmsController.java index 1d5b6c71..a32a3d06 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/controller/AcsToWmsController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/controller/AcsToWmsController.java @@ -34,10 +34,6 @@ public class AcsToWmsController { @SaIgnore @Log("acs请求wms") public ResponseEntity apply(@RequestBody InteracteDto form) { - try { - return new ResponseEntity<>(TableDataInfo.buildJson(gateWayService.apply(form)),HttpStatus.OK); - }catch (Exception ex){ - return new ResponseEntity<>(ApiError.error(ex.getMessage()),HttpStatus.BAD_REQUEST); - } + return new ResponseEntity<>(TableDataInfo.buildJson(gateWayService.apply(form)),HttpStatus.OK); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java index d8b3d869..49ca8b12 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java @@ -128,7 +128,9 @@ public class MdGruopDickServiceImpl extends ServiceImpl tmpCount1 = iMdPbVehicleMaterService.list(new QueryWrapper().in("vehicle_code", map.keySet())); + List tmpCount1 = iMdPbVehicleMaterService.list(new QueryWrapper() + .eq("is_delete",false) + .in("vehicle_code", map.keySet())); if (tmpCount1.size()>0){ throw new BadRequestException("组盘失败：载具已经存在组盘信息"+tmpCount1.stream().map(MdPbVehicleMater::getVehicle_code).collect(Collectors.joining(","))); } 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 6ad3695c..beb1fd3e 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 @@ -47,7 +47,8 @@ public class IOStorageController { public ResponseEntity outStorage(@RequestBody JSONObject form) { String vehicle_code = form.getString("vehicle_code"); MdPbVehicleMater one = iMdPbVehicleMaterService.getOne(new QueryWrapper() - .eq("vehicle_code", vehicle_code).eq("is_delete", false)); + .eq("vehicle_code", vehicle_code) + .eq("is_delete", false)); String proc_inst_id = one.getProc_inst_id(); if (!StringUtils.isEmpty(proc_inst_id)){ String parent_id = iActRuExecutionService.getParentByChild(proc_inst_id); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java index bf8b38f9..c9b01045 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java @@ -42,7 +42,9 @@ public class PalletIostorinvService { Assert.notNull(form, "参数不能为空"); String vehicle_code = form.getString("vehicle_code"); String material_id = form.getString("material_id"); - int count = iMdPbVehicleMaterService.count(new QueryWrapper().eq("vehicle_code", vehicle_code)); + int count = iMdPbVehicleMaterService.count(new QueryWrapper() + .eq("vehicle_code", vehicle_code) + .eq("is_delete",false)); if (count>0){ throw new BadRequestException("入库失败：当前载具信息已经存在"); } @@ -81,12 +83,12 @@ public class PalletIostorinvService { }; public void outStorage(JSONObject form){ - Assert.noNullElements(new Object[]{form,form.getString("material_id"),form.getInteger("qty"),form.getString("target_point")}, "参数不能为空"); + Assert.noNullElements(new Object[]{form,form.getString("pcsn"),form.getString("material_id"),form.getInteger("qty"),form.getString("target_point")}, "参数不能为空"); //触发流程 JSONObject flowData = new JSONObject(); flowData.put("material_id",form.getString("material_id")); flowData.put("qty",form.getInteger("qty")); - flowData.put("pcsn","1"); + flowData.put("pcsn",form.getString("pcsn")); flowData.put("stor_code",STOR_CODE); JSONObject auxParam = new JSONObject(); auxParam.put("target_point",form.getString("target_point")); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/service/CheckStorageService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/service/CheckStorageService.java index d0ad4c9f..1df6f03f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/service/CheckStorageService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/service/CheckStorageService.java @@ -160,6 +160,7 @@ public class CheckStorageService { Map vehicleMap = iMdPbVehicleMaterService.list(new QueryWrapper() .select("vehicle_code", "proc_inst_id") .in("vehicle_code", tmpCollect) + .eq("is_delete",false) .last("group by vehicle_code")).stream().collect(HashMap::new, (formMap, o) -> { formMap.put(o.getVehicle_code(), o.getProc_inst_id()); }, HashMap::putAll); 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 b946f638..22165e80 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 @@ -166,7 +166,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl tmpCount1 = iMdPbVehicleMaterService.list(new QueryWrapper().in("vehicle_code", collect)); + List tmpCount1 = iMdPbVehicleMaterService.list(new QueryWrapper() .eq("is_delete",false).in("vehicle_code", collect)); if (tmpCount1.size() > 0) { throw new BadRequestException("组盘失败：载具已经存在组盘信息" + tmpCount1.stream().map(MdPbVehicleMater::getVehicle_code).distinct().collect(Collectors.joining(","))); } 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 e02ff207..5bbb5471 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 @@ -78,7 +78,9 @@ public class PickingService { } PmFormData dtl = iFormDataService.getById((String) ((Map) params.get(0)).get("parent_id")); MdPbVehicleMater one = iMdPbVehicleMaterService.getOne(new QueryWrapper() - .eq("vehicle_code", dtl.getVehicle_code()).eq("material_id", dtl.getMaterial_id())); + .eq("vehicle_code", dtl.getVehicle_code()) + .eq("is_delete",false) + .eq("material_id", dtl.getMaterial_id())); if (one == null) { throw new BadRequestException("拣选明细载具物料信息不存在"); } @@ -196,7 +198,9 @@ public class PickingService { for (PmFormData dtl : dtls) { //载具物料信息 MdPbVehicleMater one = iMdPbVehicleMaterService.getOne(new QueryWrapper() - .eq("vehicle_code", dtl.getVehicle_code()).eq("material_id", dtl.getMaterial_id())); + .eq("vehicle_code", dtl.getVehicle_code()) + .eq("is_delete",false) + .eq("material_id", dtl.getMaterial_id())); List dis = iFormDataService.getByParentId(dtl.getId()); for (PmFormData data : dis) { String vehicle_code = data.getVehicle_code(); diff --git a/wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue b/wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue index 94208db1..1ee976de 100644 --- a/wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue +++ b/wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue @@ -28,6 +28,23 @@ + + + @@ -86,7 +103,7 @@