1

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/StockSaleReceiptReportMapper.xml

@@ -56,7 +56,7 @@
         IFNULL(i.deduction_weight,0) as deductionWeight,
         s.gross_weight as grossWeight,
         s.tare as tare,
-        case when s.manual_flag = '1' then s.settlement_weight when m.settlement_weight_method = '1' then s.net_weight else IFNULL(i.unload_net_weight,0)-IFNULL(i.deduction_weight,0) end as settlementWeight,
+        case when s.manual_flag = '1' then s.settlement_weight when m.settlement_weight_method = '1' then s.net_weight when s.process_no = '退库' then s.net_weight else IFNULL(i.unload_net_weight,0)-IFNULL(i.deduction_weight,0) end as settlementWeight,
         s.settlement_price AS settlementPrice,
         ROUND(s.amount_ing_receivable,2) as amountIngReceivable,
         ROUND(s.amount_ed_receivable,2) as amountEdReceivable,