diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 98d06e78..6ffe88b8 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -561,6 +561,13 @@ public class StructuralPackageOrderController extends BaseController { .eq(WmsStructuralPackageOrderTray::getState, OrderState.Unpackaged.getState()) .eq(WmsStructuralPackageOrderTray::getNo, request.getTrayNo()) .update()).throwMessage("打包失败,请重试"); + deliverStructuralPackageOrderTrayItemService.updateBatchById(trayItems); + if (trayItems.stream().anyMatch(it -> Objects.nonNull(it.getOfflineReceived()))) { + deliverStructuralPackageOrderService.lambdaUpdate() + .set(WmsStructuralPackageOrder::getQuehuo, true) + .eq(WmsStructuralPackageOrder::getId, tray.getOrderId()) + .update(); + } saveMaterialQrCodeScanRecord(qrCodeDTOs, 1); return ApiResult.success(); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java index 3511da8c..70352f8b 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java @@ -159,4 +159,9 @@ public class DeliverStructuralPackageOrderVO { * 送货单id */ private Long deliverId; + + /** + * 是否存在缺货零件 + */ + private Boolean quehuo; } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml index 8f1f5f20..f731820f 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml @@ -3,9 +3,13 @@ SELECT o.*,m."no"||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no" - ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",sp.drawing_no as "packageDrawingNo" + ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",sp.drawing_no as "packageDrawingNo",o.quehuo FROM wms_structural_package_order o LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id" LEFT JOIN user_supplier us ON o.supplier_id=us.id