2025-10-17

优化

src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java

@@ -381,7 +381,7 @@ public interface SchedulingService {
      * @param reportList 排数据列表
      */
     void saveProductionReportAndDefect(String site, String orderNo, Float itemNo, Integer seqNo, 
-                                       String rollNo, String operator, List<ProductionReportData> reportList);
+                                       String rollNo, String operator, List<ProductionReportData> reportList, String rollNo2);
 
     /**
      * @Author AI

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -3485,7 +3485,7 @@ public class ScheduleServiceImpl implements ScheduleService {
                 
                 // 调用保存方法
                 schedulingService.saveProductionReportAndDefect(site, orderNo, Float.valueOf(itemNo), 
-                    Integer.valueOf(seqNo), rollNoArr[i], operatorId, reportList);
+                    Integer.valueOf(seqNo), rollNoArr[i], operatorId, reportList, rollNo);
             }
         }
         //返回打印的数据 2022-05-09

src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java

@@ -1335,7 +1335,7 @@ public class SchedulingServiceImpl implements SchedulingService {
     @Override
     @Transactional
     public void saveProductionReportAndDefect(String site, String orderNo, Float itemNo, Integer seqNo, 
-                                               String rollNo, String operator, List<ProductionReportData> reportList) {
+                                               String rollNo, String operator, List<ProductionReportData> reportList, String rollNo2) {
         if (reportList == null || reportList.isEmpty()) {
             return;
         }
@@ -1377,9 +1377,9 @@ public class SchedulingServiceImpl implements SchedulingService {
             defectData.setSeqNo(seqNo);
             defectData.setHistSeqNo(nextHistSeqNo);
             defectData.setReportedby(operator);
-            defectData.setDefectCode("DEFAULT");  // 默认不良代码，可以根据实际情况调整
+            defectData.setDefectCode("10001");  // 默认不良代码，可以根据实际情况调整
             defectData.setDefectQty(totalDefectQty);
-            defectData.setRollNo(rollNo);
+            defectData.setRollNo(rollNo2);
             defectData.setRemark("创建分卷自动记录");
             
             defectList.add(defectData);

src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml

@@ -186,7 +186,7 @@
         LEFT JOIN inbound_notification_detail b ON a.Site = b.site AND a.bu_no = b.bu_no AND a.OrderNo = b.related_order_no AND a.PartNo = b.part_no
         INNER JOIN SFDC_Rolls pr ON a.site = pr.site and a.bu_no = pr.bu_no and  a.OrderNo = pr.OrderNo
         inner join Part c on a.Site = c.Site and a.bu_no = c.bu_no and a.PartNo = c.PartNo
-        where a.site = #{query.site} and a.bu_no = #{query.buNo} and pr.status ='待入库' AND B.SITE IS NULL
+        where a.site = #{query.site} and a.bu_no = #{query.buNo} and pr.status ='待入库' AND B.SITE IS NULL and isnull(pr.status,'*') <![CDATA[<>]]> '*'
         and a.PartNo not in
         <foreach collection="query.arr" close=")" open="(" item="item" separator=",">
             #{item}