From b293f3c3b9eea4fda00a202ad3327f88979e9287 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Tue, 4 Mar 2025 22:46:46 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E4=BA=8C=E6=A5=BCCTU?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95=E5=8D=95=E6=8D=AE=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E8=BF=87=E6=BB=A4=E9=9D=9E=E7=AB=8B=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/common/utils/ErpServiceUtils.java | 4 ++-- .../behavior/impl/StrucFormActivityBehavior.java | 3 +++ .../java/org/nl/wms/pda_manage/pick/dto/PickTask.java | 2 +- .../form_data/service/impl/PmFormDataServiceImpl.java | 10 ++++++++++ .../wms/stor_manage/pick/service/PickingService.java | 3 ++- .../quartz/task/SyncErpBillsScheduleService.java | 4 ++-- 6 files changed, 20 insertions(+), 6 deletions(-) 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 359e185e..35092620 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("当前同步操作正在执行，稍后再试"); + throw new BadRequestException("系统正在自动同步ERP单据，正占用接口资源，请稍后再试"); } } catch (Exception ex) { throw new BadRequestException(ex.getMessage()); @@ -115,7 +115,7 @@ public class ErpServiceUtils { result.add(jsonObject); } } else { - throw new BadRequestException("当前同步操作正在执行，稍后再试"); + throw new BadRequestException("系统正在自动同步ERP单据，正占用接口资源，请稍后再试"); } } catch (Exception ex) { throw new BadRequestException(ex.getMessage()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StrucFormActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StrucFormActivityBehavior.java index 67db7320..f33fe3c8 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StrucFormActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StrucFormActivityBehavior.java @@ -109,6 +109,9 @@ public class StrucFormActivityBehavior extends FlowNodeActivityBehavior pmFormDataDtos) { List parents = pmFormDataDtos.stream().map(PmFormDataDto::getId).collect(Collectors.toList()); List childs = this.baseMapper.selectChilds(parents); + //过滤非料箱与托盘库 + childs.removeIf(r -> + !new HashSet<>(Arrays.asList("1233925", "1233926")) + .contains(r.getForm_data().getString("stock_Id")) + ); if (!CollectionUtils.isEmpty(childs)) { Map> childMap = childs.stream().collect(Collectors.groupingBy(PmFormDataDto::getParent_id)); for (PmFormDataDto dataDto : pmFormDataDtos) { @@ -348,6 +353,11 @@ public class PmFormDataServiceImpl extends ServiceImpl childs = this.baseMapper.selectChilds(ListOf.of(pmFormDataDto.getId())); + //过滤非料箱与托盘库 + childs.removeIf(r -> + !new HashSet<>(Arrays.asList("1233925", "1233926")) + .contains(r.getForm_data().getString("stock_Id")) + ); if (CollectionUtils.isEmpty(childs)){ throw new BadRequestException(code+"单据明细数据为空"); } 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 9b218c47..2505a395 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 @@ -91,7 +91,7 @@ public class PickingService { int mCode = iMdPbVehicleMaterService.count(new QueryWrapper() .in("vehicle_code", vehicleCodes).eq("is_delete",false)); if (mCode > 0) { - throw new BadRequestException("当前载具" + vehicleCodes + "以存在载具物料信息"); + throw new BadRequestException("当前载具" + vehicleCodes + "已存在载具物料信息"); } String now = DateUtil.now(); String user = SecurityUtils.getCurrentNickName(); @@ -238,6 +238,7 @@ public class PickingService { mater.setMaterial_id(one.getMaterial_id()); mater.setPcsn(one.getPcsn()); mater.setQty(data.getQty()); + mater.setPrd_ppbom_no(dtl.getForm_data().getString("prd_ppbom_no")); mater.setUnit_id(data.getUnit_id()); mater.setVehicle_code(vehicle_code); //设置目标仓库 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 8aef5c8f..28600f45 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 @@ -211,7 +211,7 @@ public class SyncErpBillsScheduleService { return "同步成功，共计" + result.size() + "条"; } }else { - throw new BadRequestException("当前同步操作正在执行，稍后再试"); + throw new BadRequestException("系统正在自动同步ERP单据，正占用接口资源，请稍后再试"); } } catch (Exception ex) { throw new BadRequestException(ex.getMessage()); @@ -308,7 +308,7 @@ public class SyncErpBillsScheduleService { .set(PmFormData::getMaterial_id, f.getMaterial_id()) .set(PmFormData::getQty, f.getQty()) //todo 确认分配数量是多少 - .set(PmFormData::getAssign_qty, f.getQty()) + .set(PmFormData::getAssign_qty,BigDecimal.ZERO) .set(PmFormData::getUnit_id, f.getUnit_id()) .set(PmFormData::getForm_data, JSON.toJSONString(f.getForm_data())) .set(PmFormData::getPlan_qty, f.getPlan_qty())