2025-11-03

pda销售出库优化

src/main/resources/mapper/salesOutbound/SalesOutboundMapper.xml

@@ -10,12 +10,13 @@
         h.site,
         h.order_no AS outboundNo,
         h.bu_no AS buNo,
-        '' AS relatedNo,
-        '' AS relatedLineNo,
+        d.related_order_no AS relatedNo,
+        d.related_order_line_no AS relatedLineNo,
         0 as totalLabels,
         0 as availableLabels,
         SUM(CAST(d.required_qty AS float)) as totalQty,
-        0 as availableQty
+        ISNULL(d.actual_out_qty,0) as availableQty,
+        h.required_outbound_date AS createDate
         FROM outbound_notification_head h
         INNER JOIN outbound_notification_detail d ON h.order_no = d.order_no AND h.site = d.site and h.bu_no = d.bu_no
         WHERE h.site = #{site} and h.bu_no in (select bu_no from AccessBu where username = #{userName})
@@ -32,7 +33,7 @@
         <if test="searchCode == null or searchCode == ''">
             AND CONVERT(DATE, h.required_outbound_date) = CONVERT(DATE, GETDATE())
         </if>
-        GROUP BY h.site, h.order_no, h.bu_no ,h.required_outbound_date
+        GROUP BY h.site, h.order_no, h.bu_no, h.required_outbound_date, d.related_order_no, d.related_order_line_no, d.actual_out_qty
         ORDER BY h.required_outbound_date DESC
     </select>
 
@@ -43,18 +44,19 @@
         h.site,
         h.order_no AS outboundNo,
         h.bu_no AS buNo,
-        '' AS relatedNo,
-        '' AS relatedLineNo,
+        d.related_order_no AS relatedNo,
+        d.related_order_line_no AS relatedLineNo,
         0 as totalLabels,
         0 as availableLabels,
         SUM(CAST(d.required_qty AS float)) as totalQty,
-        0 as availableQty
+        ISNULL(d.actual_out_qty,0) as availableQty,
+        h.required_outbound_date AS createDate
         FROM outbound_notification_head h
         INNER JOIN outbound_notification_detail d ON h.order_no = d.order_no AND h.site = d.site and h.bu_no = d.bu_no
         WHERE h.order_no = #{outboundNo}
         AND h.site = #{site}
         AND h.bu_no = #{buNo}
-        GROUP BY h.site, h.order_no, h.bu_no ,h.required_outbound_date
+        GROUP BY h.site, h.order_no, h.bu_no, h.required_outbound_date, d.related_order_no, d.related_order_line_no, d.actual_out_qty
     </select>
 
     <!-- 验证标签与销售出库单是否匹配 -->