From 1420e5046f021455944d6ca6b5ba381b06963ec1 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 29 Apr 2026 11:32:12 +0800 Subject: [PATCH] =?UTF-8?q?2026-04-29=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/vo/InboundNotificationDetailVo.java | 1 + .../modules/oa/service/impl/ProductionBomServiceImpl.java | 5 +++-- .../inboundNotification/InboundNotificationDetailMapper.xml | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationDetailVo.java b/src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationDetailVo.java index 3ab978d..bde8169 100644 --- a/src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationDetailVo.java +++ b/src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationDetailVo.java @@ -25,4 +25,5 @@ public class InboundNotificationDetailVo extends InboundNotificationDetailEntity private String umName; private String inboundWarehouseId; private String spec; + private String jobRemark; } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/oa/service/impl/ProductionBomServiceImpl.java b/src/main/java/com/gaotao/modules/oa/service/impl/ProductionBomServiceImpl.java index 275dc1e..5e8b761 100644 --- a/src/main/java/com/gaotao/modules/oa/service/impl/ProductionBomServiceImpl.java +++ b/src/main/java/com/gaotao/modules/oa/service/impl/ProductionBomServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; +import java.math.BigDecimal; import java.util.*; /** @@ -84,7 +85,7 @@ public class ProductionBomServiceImpl implements ProductionBomService { params.add(String.valueOf(item.getItemNo())); // @itemNo params.add(item.getComponentPartNo()); // @parentPartNo - 使用组件物料编号 params.add(item.getQtyAssembly()); // @qtyAssembly - 使用装配数量 - params.add(String.valueOf(item.getQtyFixedScrapt())); // @qtyScrap - 使用固定报废数量 + params.add(item.getQtyFixedScrapt()); // @qtyScrap - 使用固定报废数量 params.add(String.valueOf(item.getScraptFactor())); // @scrapFactor - 使用报废率 params.add(item.getRemark() == null ? "" : item.getRemark()); // @remark - 使用备注 params.add(item.getQtyRequired()); // @qtyRequired - 使用需求数量 @@ -95,7 +96,7 @@ public class ProductionBomServiceImpl implements ProductionBomService { params.add(item.getOperationNo() == null ? "" : String.valueOf(item.getOperationNo())); // @operationNo params.add(item.getRmTypeDb() == null ? "" : item.getRmTypeDb()); // @rmTypeDb params.add(item.getMethod()); // @method - params.add(item.getQtySetup() == null ? "" : String.valueOf(item.getQtySetup())); // @qtySetup + params.add(item.getQtySetup() == null ? BigDecimal.ZERO : item.getQtySetup()); // @qtySetup // 执行存储过程 List> resultList = procedureDao.getProcedureData("UspInsertSOBom", params); diff --git a/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml b/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml index 62b88fd..fbee1b5 100644 --- a/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml +++ b/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml @@ -205,9 +205,11 @@ pr.RollQty as requiredQty, pr.remark, c.inbound_warehouse_id as inboundWarehouseId, - RIGHT(a.OrderNo, CHARINDEX('-', REVERSE(a.OrderNo)) - 1) AS relatedOrderLineNo + RIGHT(a.OrderNo, CHARINDEX('-', REVERSE(a.OrderNo)) - 1) AS relatedOrderLineNo, + s.Remark as jobRemark--任务备注 FROM ShopOrder a INNER JOIN SFDC_Rolls pr ON a.site = pr.site AND a.bu_no = pr.bu_no AND a.OrderNo = pr.OrderNo + INNER JOIN SOScheduledRouting S ON pr.Site = s.Site and pr.CreatedOpsSeqNo = s.SeqNo LEFT JOIN inbound_notification_detail b ON pr.Site = b.site AND pr.bu_no = b.bu_no AND pr.OrderNo = b.related_order_no AND pr.RollNo = b.roll_no INNER JOIN Part c on a.Site = c.Site and a.bu_no = c.bu_no and a.PartNo = c.PartNo left join um as u on c.site = u.site and c.UMID = u.UMID