From 9906e6b188bf2c36dddc0d5adadbf02e69ea3e4b Mon Sep 17 00:00:00 2001 From: wujian <14790700720@163.com> Date: 星期五, 25 十月 2024 09:17:29 +0800 Subject: [PATCH] add -sap --- jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java index 81efeb7..8de6c6f 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java +++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java @@ -58,6 +58,15 @@ public TableDataInfo list(OmProductionOrdeInfo omProductionOrdeInfo) { startPage(); + if (StrUtil.isNotBlank(omProductionOrdeInfo.getEngineNo())){ + BsOrderScheduling bsOrderScheduling = bsOrderSchedulingService.selectBsOrderSchedulingSNCode(omProductionOrdeInfo.getEngineNo()); + if (ObjectUtil.isNotEmpty(bsOrderScheduling)){ + String orderNo = bsOrderScheduling.getOrderNo(); + if (StrUtil.isNotBlank(orderNo)){ + omProductionOrdeInfo.setWorkOrderNo(orderNo); + } + } + } List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(omProductionOrdeInfo); return getDataTable(list); } @@ -255,8 +264,11 @@ if (StrUtil.isBlank(factory)){ throw new ServiceException("璇烽�夋嫨宸ュ巶缂栧彿"); } - List<OmProductionOrdeInfo> omProductionOrdeInfos = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(omProductionOrdeInfo); - if(omProductionOrdeInfos.size() == 0){ + OmProductionOrdeInfo queryProductOrder = new OmProductionOrdeInfo(); + queryProductOrder.setWorkshopCode(factory); + queryProductOrder.setProductionNotice(productionNotice); + List<OmProductionOrdeInfo> omProductionOrdeInfos = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(queryProductOrder); + if(CollUtil.isEmpty(omProductionOrdeInfos)){ try { logger.info("鎺ユ敹宸ュ崟鍙凤細,{}",productionNotice); ReceivingServices.insertWebserviceData(factory,productionNotice); -- Gitblit v1.9.3