|
|
@@ -1234,6 +1234,7 @@
|
|
|
<select id="getInwardWeightDetailsOrder" resultType="java.util.Map" parameterType="java.util.Map">
|
|
|
SELECT *
|
|
|
FROM (SELECT DISTINCT bdo.INSERT_TIME AS "insertTime",
|
|
|
+ r_c_type.CAPACITY_TYPE_NAME AS "capacityTypeName",
|
|
|
bdo.DETAILS_ID AS "detailsId",
|
|
|
oo.ORDER_ID AS "orderId",
|
|
|
bdo.DETAILS_NO AS "detailsNo",
|
|
|
@@ -1287,6 +1288,8 @@
|
|
|
ON oo.CAPACITY_ID = rc.CAPACITY_ID
|
|
|
LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
|
|
|
ON actp.PRICE_ID = bdo.PRICE_ID
|
|
|
+ LEFT JOIN RMS_CAPACITY_TYPE r_c_type
|
|
|
+ ON actp.CAPACITY_TYPE_ID = r_c_type.CAPACITY_TYPE_ID
|
|
|
WHERE bdo.WETHER_TO_STATEMENT = #{detailStatus}
|
|
|
AND oo.ORDER_TYPE = 11
|
|
|
<if test="userId != null" >
|
|
|
@@ -1343,6 +1346,7 @@
|
|
|
<select id="getPurInwarWeightDetailsOrder" resultType="java.util.Map" parameterType="java.util.Map">
|
|
|
select *
|
|
|
from (select oo.order_id "orderId",
|
|
|
+ r_c_type.CAPACITY_TYPE_NAME "capacityTypeName",
|
|
|
bdo.DETAILS_ID "detailsId",
|
|
|
rm.material_name "materialName",
|
|
|
apo.purchase_order_no "purchaseNo",
|
|
|
@@ -1400,6 +1404,8 @@
|
|
|
ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
|
|
|
LEFT JOIN RMS_CARRIER RCA
|
|
|
ON RCA.CARRIER_ID = AIP.CARRIER_ID
|
|
|
+ LEFT JOIN RMS_CAPACITY_TYPE r_c_type
|
|
|
+ ON ACTP.CAPACITY_TYPE_ID = r_c_type.CAPACITY_TYPE_ID
|
|
|
where oo.order_type in (10, 20, 23, 24)
|
|
|
AND bdo.WETHER_TO_STATEMENT = #{detailStatus}
|
|
|
<if test="userId != null" >
|
|
|
@@ -1454,7 +1460,8 @@
|
|
|
oo.order_number "orderNumber",
|
|
|
bdo.details_no "detailsNo",
|
|
|
bdo.INSERT_TIME "insertTime",
|
|
|
- bdo.DETAILS_ID "detailsId"
|
|
|
+ bdo.DETAILS_ID "detailsId",
|
|
|
+ RCT.CAPACITY_TYPE_NAME "capacityTypeName"
|
|
|
from bmstruck_details_order bdo
|
|
|
left join OMSTRUCK_ORDER OO
|
|
|
ON OO.ORDER_ID = BDO.ORDER_ID
|
|
|
@@ -1695,6 +1702,7 @@
|
|
|
<select id="getAllInwardWeight" resultType="java.util.Map" parameterType="java.util.Map">
|
|
|
SELECT * FROM (
|
|
|
SELECT rc.CAPACITY_NUMBER AS "capacityNumber",
|
|
|
+ r_c_type.CAPACITY_TYPE_NAME "capacityTypeName",
|
|
|
RCE.CARRIER_NAME AS "carrierName",
|
|
|
RS.SHIPPER_NAME AS "shipperName",
|
|
|
DB.RESULT_FOREIGN_SHIP_NAME "shipNum",
|
|
|
@@ -1751,6 +1759,8 @@
|
|
|
ON actp.PRICE_ID = bdo.PRICE_ID
|
|
|
LEFT JOIN DIL_BATCH DB
|
|
|
ON DB.BATCH_ID = 0
|
|
|
+ LEFT JOIN RMS_CAPACITY_TYPE r_c_type
|
|
|
+ ON actp.CAPACITY_TYPE_ID = r_c_type.CAPACITY_TYPE_ID
|
|
|
WHERE bdo.WETHER_TO_STATEMENT = #{detailStatus}
|
|
|
AND oo.ORDER_TYPE in (11,25)
|
|
|
<if test="userId != null" >
|
|
|
@@ -1765,6 +1775,7 @@
|
|
|
</if>
|
|
|
UNION ALL
|
|
|
select rc.capacity_number "capacityNumber",
|
|
|
+ r_c_type.CAPACITY_TYPE_NAME "capacityTypeName",
|
|
|
RCA.CARRIER_NAME "carrierName",
|
|
|
RSH.SHIPPER_NAME "shipperName",
|
|
|
DB.RESULT_FOREIGN_SHIP_NAME "shipNum",
|
|
|
@@ -1833,6 +1844,8 @@
|
|
|
ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
|
|
|
LEFT JOIN RMS_CARRIER RCA
|
|
|
ON RCA.CARRIER_ID = AIP.CARRIER_ID
|
|
|
+ LEFT JOIN RMS_CAPACITY_TYPE r_c_type
|
|
|
+ ON ACTP.CAPACITY_TYPE_ID = r_c_type.CAPACITY_TYPE_ID
|
|
|
where oo.order_type in (10, 20, 23, 24)
|
|
|
AND bdo.WETHER_TO_STATEMENT = #{detailStatus}
|
|
|
<if test="userId != null" >
|
|
|
@@ -1847,6 +1860,7 @@
|
|
|
</if>
|
|
|
UNION ALL SELECT
|
|
|
rc.capacity_number "capacityNumber",
|
|
|
+ r_c_type.CAPACITY_TYPE_NAME "capacityTypeName",
|
|
|
RCA.CARRIER_NAME "carrierName",
|
|
|
RSH.SHIPPER_NAME "shipperName",
|
|
|
DB.RESULT_FOREIGN_SHIP_NAME "shipNum",
|
|
|
@@ -1891,6 +1905,7 @@
|
|
|
LEFT JOIN RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
|
|
|
LEFT JOIN RMS_CARRIER RCA ON RCA.CARRIER_ID = AIP.CARRIER_ID
|
|
|
LEFT JOIN RMS_SHIPPER RSH ON RSH.SHIPPER_ID = 0
|
|
|
+ LEFT JOIN RMS_CAPACITY_TYPE r_c_type ON ACTP.CAPACITY_TYPE_ID = r_c_type.CAPACITY_TYPE_ID
|
|
|
WHERE
|
|
|
oo.order_type BETWEEN 15
|
|
|
AND 16
|
|
|
@@ -2185,6 +2200,7 @@
|
|
|
<select id="getInwardCountDetailsOrder" resultType="java.util.Map">
|
|
|
select *
|
|
|
from (select RC.CAPACITY_NUMBER "capacityNum",
|
|
|
+ RCT.CAPACITY_TYPE_NAME "capacityTypeName",
|
|
|
rs.shipper_name "shipperName",
|
|
|
rw.warehouse_name "unloadName",
|
|
|
rw2.warehouse_name "loadName",
|
hejiahui