From a1bd196ad79a9e6ac509217409a363905c71b5d5 Mon Sep 17 00:00:00 2001 From: zhaoyf <1783123481@qq.com> Date: Mon, 20 Jul 2026 15:37:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=B6=82=E8=A3=85=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/ext_manage/controller/MesToWmsController.java | 2 +- .../purchase/service/impl/InboundPdaServiceImpl.java | 1 - .../sch_manage/service/core/StructAreaDeliveryAutoTask.java | 5 +---- .../wms/sch_manage/service/core/tasks/Point2PointTask.java | 4 ++-- nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java index 0dd6206..cf65887 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java @@ -77,7 +77,7 @@ public class MesToWmsController { public ResponseEntity subWorkOrder(@RequestBody List dtos){ String[] filter = {};//过滤产线 for (WorkOrderDto.WorkOrderDataDto dto : dtos) { - if (ArrayUtils.contains(filter, dto.getWorkArea())){ + if (!ArrayUtils.contains(filter, dto.getWorkArea())){ iWorkOrderService.insert(dto); } } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/purchase/service/impl/InboundPdaServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/purchase/service/impl/InboundPdaServiceImpl.java index c6bbf1d..9fc0a94 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/purchase/service/impl/InboundPdaServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/purchase/service/impl/InboundPdaServiceImpl.java @@ -276,7 +276,6 @@ public class InboundPdaServiceImpl implements InboundPdaService { addParam.setStorCode(structattr.getStor_code()); addParam.setQty(item.getQty()); addInvParams.add(addParam); - continue; } } MdMeMaterialbase materDao = iMdMeMaterialbaseService.getByCode(item.getSku_code()); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/StructAreaDeliveryAutoTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/StructAreaDeliveryAutoTask.java index 2c3323e..7d12256 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/StructAreaDeliveryAutoTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/StructAreaDeliveryAutoTask.java @@ -48,10 +48,7 @@ public class StructAreaDeliveryAutoTask { return; } //查看所有可用点位 按区域区分 - Map> empRegionPointMap = iSchBasePointService.selectIdlePoint(Arrays.asList(RegionConstant.SPRAYING_RAW_MATERIAL_SIDE - , RegionConstant.WELDING_RAW_MATERIAL_SIDE - , RegionConstant.MACHINE_RAW_MATERIAL_SIDE - , RegionConstant.MACHINE_RAW_MATERIAL_SIDE)).stream() + Map> empRegionPointMap = iSchBasePointService.list().stream() .collect(Collectors.groupingBy( SchBasePoint::getRegion_code, Collectors.mapping(SchBasePoint::getPoint_code, Collectors.toList()) diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/Point2PointTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/Point2PointTask.java index 0053170..f5858bc 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/Point2PointTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/Point2PointTask.java @@ -202,8 +202,8 @@ public class Point2PointTask extends AbstractTask { entry.put("qty", plate.getQty()); entry.put("materialNo", orderBomItem.getMaterial_code()); entry.put("unitNo", "PCS"); - entry.put("receiptWarehouseNo", orderBomItem.getWarehouse_code()); - entry.put("issueWarehouseNo", workOrder.getDefault_warehouse_code()); + entry.put("receiptWarehouseNo", workOrder.getDefault_warehouse_code()); + entry.put("issueWarehouseNo", orderBomItem.getWarehouse_code()); // 将entry添加到数组中 entrys.add(entry); } diff --git a/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue b/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue index 3936e8a..2f508a7 100644 --- a/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue +++ b/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue @@ -302,7 +302,7 @@ export default { '0009': '手工入库', '1001': '销售出库', '0006': '生产领料', - '0007': '库存调拨', + '2001': '库存调拨', '106': '调拨出库', '107': '调拨入库', '109': '其他入库',