|
|
@@ -1147,24 +1147,55 @@
|
|
|
</select>
|
|
|
<!-- 展示所有销售公司已审核的销售订单 -->
|
|
|
<select id="getSaleOrderList" parameterType="java.util.Map" resultType="java.util.Map">
|
|
|
- select
|
|
|
- adso.DISPATCH_ID "dispatchId",
|
|
|
- asom.SALE_ORDER_MATERIAL_ID "orderMaterialId",
|
|
|
- asom.sale_order_id as "saleOrderId",
|
|
|
- aso.SALE_NUMBER "saleNumber",
|
|
|
- asom.sale_order_material_truck_no as "saleOrderMaterialTruckNo",
|
|
|
- asom.sale_order_material_id,
|
|
|
- rra.address_delivery_address as "addressDeliveryAddress",
|
|
|
- asom.sale_date_of_receipt as "saleDateOfReceipt",
|
|
|
- asom.sale_order_consignee as "saleOrderConsignee",
|
|
|
- asom.sale_order_consignee_tel as "saleOrderConsigneeTel"
|
|
|
- from ams_sale_order aso
|
|
|
- join ams_sale_order_material asom
|
|
|
- on aso.sale_order_id =asom.sale_order_id
|
|
|
- left join AMS_DISPATCH_SALE_ORDER adso
|
|
|
- on adso.SALE_ORDER_MATERIAL_ID = asom.SALE_ORDER_MATERIAL_ID
|
|
|
- left join rms_receive_address rra on asom.sale_shipping_address_id=rra.address_id
|
|
|
- where aso.sale_order_status in (2, 4) and adso.DISPATCH_STATUS = #{status} and adso.DISPATCH_TYPE=0
|
|
|
+ select ADSO.DISPATCH_ID "dispatchId",
|
|
|
+ ASOM.SALE_ORDER_ID "saleOrderId",
|
|
|
+ ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
|
|
|
+ ASO.SALE_NUMBER "saleNumber",
|
|
|
+ ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "saleOrderMaterialTruckNo",
|
|
|
+ CONCAT(CONCAT(CONCAT(ADDRESS_PROVINCE, ADDRESS_DISTRICT), ADDRESS_TOWN),
|
|
|
+ ADDRESS_DELIVERY_ADDRESS) "addressDeliveryAddress",
|
|
|
+ TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'yyyy-mm-dd') "saleDateOfReceipt",
|
|
|
+ ASOM.SALE_ORDER_CONSIGNEE "saleOrderConsignee",
|
|
|
+ ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel",
|
|
|
+ RS.SHIPPER_NAME "shipperName",
|
|
|
+ RC.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
|
|
|
+ ASO.SALE_ORDER_ISSELF_MENTION "saleOrderIsselfMention",
|
|
|
+ ADSO.DISPATCH_TIME "dispatchTime",
|
|
|
+ (
|
|
|
+ SELECT *
|
|
|
+ FROM (
|
|
|
+ SELECT RM.MATERIAL_NAME
|
|
|
+ FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
|
|
|
+ LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
|
|
|
+ WHERE ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
|
|
|
+ ORDER BY ASTM.TRUCKNO_MATERIAL_ID
|
|
|
+ )
|
|
|
+ WHERE ROWNUM = 1
|
|
|
+ ) "materialName",
|
|
|
+ (
|
|
|
+ SELECT *
|
|
|
+ FROM (
|
|
|
+ SELECT ASTM.MATERIAL_THEORETICAL_WEIGHT
|
|
|
+ FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
|
|
|
+ WHERE ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
|
|
|
+ ORDER BY ASTM.TRUCKNO_MATERIAL_ID
|
|
|
+ )
|
|
|
+ WHERE ROWNUM = 1
|
|
|
+ ) "weight"
|
|
|
+ FROM AMS_SALE_ORDER ASO
|
|
|
+ JOIN AMS_SALE_ORDER_MATERIAL ASOM
|
|
|
+ ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
|
|
|
+ LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
|
|
|
+ ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
|
|
|
+ LEFT JOIN RMS_RECEIVE_ADDRESS RRA
|
|
|
+ ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
|
|
|
+ LEFT JOIN RMS_SHIPPER RS
|
|
|
+ ON RS.SHIPPER_ID = ASO.SHIPPER_ID
|
|
|
+ LEFT JOIN RMS_CONSIGNEE RC
|
|
|
+ ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
|
|
|
+ WHERE ASO.SALE_ORDER_STATUS IN (2, 4)
|
|
|
+ AND ADSO.DISPATCH_STATUS = #{status}
|
|
|
+ AND ADSO.DISPATCH_TYPE = 0
|
|
|
</select>
|
|
|
|
|
|
<!-- 通过收货地址，匹配对应的承运商-->
|
|
|
@@ -1172,10 +1203,5 @@
|
|
|
select rc.carrier_id from rms_receive_address rra join rms_carrier rc on rra.address_town = rc.carrier_bid_area
|
|
|
WHERE rra.address_id = #{param}
|
|
|
</select>
|
|
|
- <!-- 获取到站id -->
|
|
|
-<!-- <select id="selectReciveId" resultType="java.util.LinkedHashMap">-->
|
|
|
-<!-- select -->
|
|
|
-<!-- from-->
|
|
|
-<!-- where-->
|
|
|
-<!-- </select>-->
|
|
|
+
|
|
|
</mapper>
|
txf