2026-04-29

优化

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;
 }

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<Map<String, Object>> resultList = procedureDao.getProcedureData("UspInsertSOBom", params);

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