1.干线查询零担列表

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -864,7 +864,7 @@
     </update>
 
     <select id="findZeroListByWarehouseId" resultType="com.alibaba.fastjson.JSONObject">
-        select ldsa.waybill_no waybillNo,
+        select ldsa.waybill_number waybillNo,
                ldsa.order_code orderCode,
                lww.create_time createTime,
                lww.destination destination,
@@ -874,16 +874,19 @@
                lww.consignee consignee,
                lww.consignee_name consigneeName,
                lww.goods_name goodsName,
-               ldsa.total_number totalNum,
+               lww.total_count totalNum,
                lww.total_weight weight,
                lww.total_volume volume,
-               ldsa.stock_num stockNum,
+               ldsa.hand_quantity stockNum,
                lww.customer_train customerTrain,
+               lww.total_freight,
+               lww.total_count,
                lww.remark remark,
-               ROUND(lww.total_freight/total_count,2) price
+               ROUND(lww.total_freight/lww.total_count,2) price
         from logpm_distribution_stock_article ldsa
                  left join logpm_warehouse_waybill lww on lww.waybill_no = ldsa.waybill_number
-        where
+        where ldsa.is_zero = 1
+        and ldsa.warehouse_id = #{warehouseId}
     </select>
 
 </mapper>