2026-03-23

1、结束卷优化
2、工单材料上机记录优化

src/main/resources/mapper/schedule/MaterialOnMachineRecordMapper.xml

@@ -110,7 +110,7 @@
         LEFT JOIN SORouting sor WITH(NOLOCK) ON smh.Site = sor.Site AND smh.OrderNo = sor.OrderNo AND smh.ItemNo = sor.ItemNo
         LEFT JOIN SOScheduledRouting ssr WITH(NOLOCK) ON smh.Site = ssr.Site AND smh.SeqNo = ssr.SeqNo
         <include refid="whereCondition"/>
-        ORDER BY smh.StartDate DESC, smh.OrderNo, smh.SeqNo, smh.HistSeqNo DESC
+        ORDER BY smh.OrderNo, smh.SeqNo, smh.HistSeqNo
         OFFSET #{query.offset} ROWS FETCH NEXT #{query.limit} ROWS ONLY
     </select>
 

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -1230,16 +1230,32 @@
     </select>
 
     <select id="getSfdcMaterialByRollNo" parameterType="SearchScheduleData" resultType="SfdcMaterialData">
-        SELECT smh.Site site, smh.OrderNo orderNo, smh.ItemNo itemNo, smh.SeqNo seqNo, smh.HistSeqNo histSeqNo,
-        smh.RollNo rollNo, smh.ReportDate reportDate,
-        smh.Reportedby reportedby, smh.RMRollNo rmRollNo, smh.PartNo partNo, smh.Remark remark, smh.StartDate startDate,
+        SELECT
+        smh.Site site,
+        smh.OrderNo orderNo,
+        smh.ItemNo itemNo,
+        smh.SeqNo seqNo,
+        smh.HistSeqNo histSeqNo,
+        smh.RollNo rollNo,
+        smh.ReportDate reportDate,
+        smh.Reportedby reportedby,
+        smh.RMRollNo rmRollNo,
+        smh.PartNo partNo,
+        smh.Remark remark,
+        smh.StartDate startDate,
         smh.FinishDate finishedDate,
-        smh.FinishFlag finishedFlag, smh.HistType histType, smh.TransGeneratedFlag transGeneratedFlag,
+        smh.FinishFlag finishedFlag,
+        smh.HistType histType,
+        smh.TransGeneratedFlag transGeneratedFlag,
         smh.OriginalRMRollNo originalRMRollNo,
-        smh.UnissueFlag unissueFlag, ROUND(smh.TransQty, 3) transQty, 0 netIssueQty,
+        smh.UnissueFlag unissueFlag,
+        ROUND(smh.TransQty, 3) transQty,
+        NetIssueQty netIssueQty,
         smh.OriginalHistSeqNo originalHistSeqNo,
-        smh.StartFromRollNo startFromRollNo, smh.KeyRMFlag keyRMFlag, smh.SAPBOMItemNo sAPBOMItemNo, smh.Setupflag
-        setupflag
+        smh.StartFromRollNo startFromRollNo,
+        smh.KeyRMFlag keyRMFlag,
+        smh.SAPBOMItemNo sAPBOMItemNo,
+        smh.Setupflag setupflag
         FROM SFDC_MaterialHist smh
         <where>
             <if test="site != null and site != ''">

src/main/resources/mapper/shopOrder/ProductionReportMapper.xml

@@ -374,6 +374,7 @@
         A.CreatedDate,
         B.OrderNo as consumeOrderNo,
         B.SeqNo as consumeSeqNo,
+        B.
         B.ItemNo as consumeItemNo,
         B.StartDate as date1,
         B.ReportDate as date2,