|
|
@@ -2011,6 +2011,7 @@
|
|
|
TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
|
|
|
TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
|
|
|
ASOM.SALE_DATE_OF_RECEIPT "saleDateReceipt",
|
|
|
+ ASM.MATERIAL_PLAN_NUMBER "materialPlanNumber",
|
|
|
(CASE
|
|
|
WHEN
|
|
|
ASOM.WARRANTY_NUMBER IS NULL
|
|
|
@@ -3343,7 +3344,7 @@
|
|
|
LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINOF ON RISWINOF.INWARD_WAREHOUSE_CODE = ASM.TRANSFER_IN_OF_WAREHOUSE
|
|
|
LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
|
|
|
LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
- AND TWR.MATERIAL_ID = ASM.MATERIAL_ID
|
|
|
+ AND TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
|
|
|
WHERE
|
|
|
ASO.SALE_TYPE = 4
|
|
|
AND ASO.DELETED = 0
|
|
|
@@ -3383,6 +3384,9 @@
|
|
|
<if test="inwardSteelType != null">
|
|
|
and aso.BUSINESS_TYPE like '%${inwardSteelType}%'
|
|
|
</if>
|
|
|
+ <if test="toTheStation != null">
|
|
|
+ and RAS2.ARRIVAL_NAME like '%${toTheStation}%'
|
|
|
+ </if>
|
|
|
ORDER BY
|
|
|
ASO.SALE_ORDER_ID DESC,
|
|
|
oo.ORDER_ID DESC)
|
|
|
@@ -4184,7 +4188,7 @@
|
|
|
WHEN 0 THEN
|
|
|
'NAL'
|
|
|
ELSE
|
|
|
- CONCAT(ROUND("orderNum"*100/"planNum", 4),'%')
|
|
|
+ CONCAT(ROUND("orderNum"*100/"planNum", 2),'%')
|
|
|
END) AS "percent",
|
|
|
NVL("numGong",0) "numGong",
|
|
|
NVL("numCang",0) "numCang",
|
|
|
@@ -4192,11 +4196,12 @@
|
|
|
NVL("truckThoWeight",0) "materialThoWeight",
|
|
|
NVL("trainWeight",0) "trainWeight",
|
|
|
Nvl("trainThoWeight",0) "trainThoWeight",
|
|
|
+ nvl("unloadThoWeight",0) "unloadThoWeight",
|
|
|
decode("target",'钢材达州组',1,'钢材万州组',2,'钢材南充组',3,'钢材巴中组',4,'钢材广安组',5,'钢材武汉组',6,'钢材西安组',7,'钢材重庆组',8,'钢材成都组',9,'钢材工程组',10,11) "no"
|
|
|
FROM
|
|
|
(
|
|
|
--查询非自提
|
|
|
- SELECT T1."target",T1."carrierName",
|
|
|
+ SELECT T0."target",T0."carrierName",
|
|
|
T1."planNum",T1."orderNum",T1."quxiaoNum",
|
|
|
T1."planNum"-"orderNum" "notSendNum",
|
|
|
T1."notEnNum",T1."EnNum",
|
|
|
@@ -4208,8 +4213,27 @@
|
|
|
T5."truckNetWeight",
|
|
|
T5."truckThoWeight",
|
|
|
T4."trainWeight",
|
|
|
- T6."trainThoWeight"
|
|
|
+ T6."trainThoWeight",
|
|
|
+ T1."unloadThoWeight"
|
|
|
+ FROM
|
|
|
+ (SELECT DISTINCT
|
|
|
+ ASM.TRANSFER_OUT_OF_WAREHOUSE "target",
|
|
|
+ RC.CARRIER_ABBREVIATION "carrierName"
|
|
|
FROM
|
|
|
+ AMS_SALE_ORDER ASO
|
|
|
+ LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
|
|
|
+ LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
|
|
|
+ LEFT JOIN RMS_CARRIER RC ON RC.CARRIER_ID = ADSO.CARRIER_ID
|
|
|
+ LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
|
|
|
+ LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
|
|
|
+ WHERE
|
|
|
+ ASM.TRANSFER_OUT_OF_WAREHOUSE IS NOT NULL
|
|
|
+ AND RC.CARRIER_ABBREVIATION IS NOT NULL
|
|
|
+ AND ASO.SALE_ORDER_ISSELF_MENTION = '否'
|
|
|
+ and to_date(#{startDate}, 'yyyy-mm-dd') <= to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
|
+ and to_date(#{endDate}, 'yyyy-mm-dd') >= to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-2,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
|
+ AND ASO.SALE_TYPE = 1) T0
|
|
|
+ LEFT JOIN
|
|
|
(
|
|
|
SELECT
|
|
|
ASM .TRANSFER_OUT_OF_WAREHOUSE "target",--方向
|
|
|
@@ -4224,7 +4248,12 @@
|
|
|
COUNT(DISTINCT OO_UN_RECEIVE.ORDER_ID) "unReceiveNum",--未接收数量
|
|
|
COUNT(DISTINCT OO_EN .ORDER_ID) "EnNum",--进场待装数量
|
|
|
SUM(TWR.RESULT_NET_WEIGHT) "totalNet",--总净重
|
|
|
- SUM(ASM.MATERIAL_WEIGHT) "materialThoWeight"
|
|
|
+ SUM(ASM.MATERIAL_WEIGHT) "materialThoWeight",
|
|
|
+ SUM(CASE WHEN
|
|
|
+ TWR.RESULT_NET_WEIGHT IS NULL
|
|
|
+ THEN ASM.MATERIAL_WEIGHT
|
|
|
+ ELSE 0
|
|
|
+ END) "unloadThoWeight"
|
|
|
FROM AMS_SALE_ORDER ASO
|
|
|
LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
|
|
|
ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
|
|
|
@@ -4319,7 +4348,7 @@
|
|
|
or (NVL(ASOM.WARRANTY_NUMBER,0) = 1 and asom.PREVIOUS_ORDER_NUMBER is null))
|
|
|
</if>
|
|
|
GROUP BY ASM .TRANSFER_OUT_OF_WAREHOUSE,RC.CARRIER_ABBREVIATION
|
|
|
- ) T1
|
|
|
+ ) T1 ON T0."target" = T1."target" AND T1."carrierName" = T0."carrierName"
|
|
|
LEFT JOIN
|
|
|
(
|
|
|
--查询工地数量
|
|
|
@@ -4474,7 +4503,7 @@
|
|
|
</if>
|
|
|
GROUP BY ASM.TRANSFER_OUT_OF_WAREHOUSE
|
|
|
) T6 ON T1 ."target" = T6."target" AND T1."carrierName" = T6."carrierName"
|
|
|
- LEFT JOIN
|
|
|
+ JOIN
|
|
|
(
|
|
|
--查询净重、理重
|
|
|
SELECT
|
|
|
@@ -4516,7 +4545,7 @@
|
|
|
and to_date(#{endDate}, 'yyyy-mm-dd') >= to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
|
</if>
|
|
|
GROUP BY ASM.TRANSFER_OUT_OF_WAREHOUSE,RC.CARRIER_ABBREVIATION
|
|
|
- ) T5 ON T1 ."target" = T5."target" AND T1."carrierName" = T5."carrierName"
|
|
|
+ ) T5 ON T0 ."target" = T5."target" AND T0."carrierName" = T5."carrierName"
|
|
|
UNION
|
|
|
SELECT T1."target",T1."carrierName",
|
|
|
T1."planNum",T1."orderNum",T1."quxiaoNum",
|
|
|
@@ -4532,7 +4561,8 @@
|
|
|
T5."truckNetWeight",
|
|
|
T5."truckThoWeight",
|
|
|
0 "trainWeight",
|
|
|
- 0 "trainThoWeight"
|
|
|
+ 0 "trainThoWeight",
|
|
|
+ T1."unloadThoWeight"
|
|
|
FROM
|
|
|
(
|
|
|
--查询自提
|
|
|
@@ -4549,7 +4579,12 @@
|
|
|
COUNT(DISTINCT OO_RECEIVED.ORDER_ID) "receivedNum",--已接单数量
|
|
|
COUNT(DISTINCT OO_UN_RECEIVE.ORDER_ID) "unReceiveNum",--未接收数量
|
|
|
SUM(TWR.RESULT_NET_WEIGHT) "totalNet",--总净重
|
|
|
- SUM(ASM.MATERIAL_WEIGHT) "materialThoWeight"
|
|
|
+ SUM(ASM.MATERIAL_WEIGHT) "materialThoWeight",
|
|
|
+ SUM(CASE WHEN
|
|
|
+ TWR.RESULT_NET_WEIGHT IS NULL
|
|
|
+ THEN ASM.MATERIAL_WEIGHT
|
|
|
+ ELSE 0
|
|
|
+ END) "unloadThoWeight"
|
|
|
FROM AMS_SALE_ORDER ASO
|
|
|
LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
|
|
|
ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
|
|
|
@@ -4725,7 +4760,7 @@
|
|
|
</if>
|
|
|
GROUP BY ASM.TRANSFER_OUT_OF_WAREHOUSE
|
|
|
) T3 ON T1 ."target" = T3."target" AND T1."carrierName" = T3."carrierName"
|
|
|
- LEFT JOIN
|
|
|
+ JOIN
|
|
|
(
|
|
|
--查询净重、理重
|
|
|
SELECT
|
luobang