2025-12-26

优化

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

@@ -140,21 +140,28 @@
         SET
         required_qty = CASE
         <foreach item="item" index="index" collection="list" open="" close="" separator=" ">
-            WHEN roll_no = #{item.rollNo} THEN #{item.requiredQty,jdbcType=DOUBLE}
+            WHEN (roll_no = #{item.rollNo} OR (ISNULL(roll_no, '') = '' AND part_no = #{item.partNo})) THEN #{item.requiredQty,jdbcType=DOUBLE}
         </foreach>
         ELSE required_qty
         END,
         in_warehouse = CASE
         <foreach item="item" index="index" collection="list" open="" close="" separator=" ">
-            WHEN roll_no = #{item.rollNo} THEN #{item.inWarehouse}
+            WHEN (roll_no = #{item.rollNo} OR (ISNULL(roll_no, '') = '' AND part_no = #{item.partNo})) THEN #{item.inWarehouse}
         </foreach>
         ELSE in_warehouse
         END
-        WHERE roll_no IN
-        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
-            #{item.rollNo}
-        </foreach>
-        AND site = #{list[0].site} and bu_no = #{list[0].buNo} and order_no = #{list[0].orderNo}
+        WHERE site = #{list[0].site} AND bu_no = #{list[0].buNo} AND order_no = #{list[0].orderNo}
+        AND (
+            roll_no IN
+            <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+                #{item.rollNo}
+            </foreach>
+            OR (ISNULL(roll_no, '') = '' AND part_no IN
+            <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+                #{item.partNo}
+            </foreach>
+            )
+        )
     </update>
 
     <select id="getInboundDetail2" resultType="com.gaotao.modules.trans.entity.TransDetailSub" statementType="CALLABLE">

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

@@ -583,7 +583,7 @@
         T.SeqNo seqNo,
         T.QtyRequired qtyRequired,
         T.QtyReported qtyReported,
-        T.QtyApprove qtyApprove,
+        (SELECT SUM(RollQty) FROM SFDC_Rolls S WHERE s.Site = T.SITE AND s.CreatedOpsSeqNo = T.SeqNo AND s.VirtualNewRollFlag ='N'  and s.RollType ='下道流转')  qtyApprove,
         ROUND(T.TimeRequired, 3) timeRequired,
         T.TimeReported timeReported,
         T.PlanStartTime planStartTime,
@@ -627,7 +627,7 @@
         d.total_roll_qty,
         d.total_per_volume,
         d.Remark as soRemark,
-        (SELECT  count(1)  FROM  SFDC_Rolls S WHERE  Site = T.SITE AND CreatedOpsSeqNo = T.SeqNo AND VirtualNewRollFlag ='N'  and RollType ='下道流转') as productionRollQty
+        (SELECT count(1) FROM SFDC_Rolls S WHERE s.Site = T.SITE AND s.CreatedOpsSeqNo = T.SeqNo AND s.VirtualNewRollFlag ='N'  and s.RollType ='下道流转') as productionRollQty
         from SOScheduledRouting as T
         Left Join SOScheduledList as E on E.Site = T.Site and E.LinkedSeqNo = T.SeqNo,
         SORouting as D, Part as P, ShopOrder as SO