|
|
@@ -1004,11 +1004,46 @@
|
|
|
RRA.ADDRESS_TOWN "addressTown",
|
|
|
OO.ORDER_LINE_SEQUENCE "lineSqe",
|
|
|
OO.DRIVER_TEL "capacityTel",
|
|
|
- TWR.RESULT_GROSS_WEIGHT "grossWeight",
|
|
|
- TWR.RESULT_GROSS_WEIGHT_TIME "grossWeightTime",
|
|
|
- TWR.RESULT_TARE_WEIGHT "tareWeight",
|
|
|
- TWR.RESULT_TARE_WEIGHT_TIME "tareWeightTime",
|
|
|
- TWR.RESULT_NET_WEIGHT "netWeight",
|
|
|
+
|
|
|
+ TWB .WEIGHT_BATCH_ID "weightBatchId",
|
|
|
+ (
|
|
|
+ CASE
|
|
|
+ WHEN TWB.WEIGHT_BATCH_ID IS NOT NULL
|
|
|
+ THEN TWB.BATCH_GROSS_WEIGHT
|
|
|
+ ELSE TWR.RESULT_GROSS_WEIGHT
|
|
|
+ END
|
|
|
+ ) "grossWeight",
|
|
|
+ (
|
|
|
+ CASE
|
|
|
+ WHEN TWB.WEIGHT_BATCH_ID IS NOT NULL
|
|
|
+ THEN TWB.BATCH_GROSS_WEIGHT_TIME
|
|
|
+ ELSE TWR.RESULT_GROSS_WEIGHT_TIME
|
|
|
+ END
|
|
|
+ ) "grossWeightTime",
|
|
|
+ (
|
|
|
+ CASE
|
|
|
+ WHEN TWB.WEIGHT_BATCH_ID IS NOT NULL
|
|
|
+ THEN TWB.BATCH_TARE_WEIGHT
|
|
|
+ ELSE TWR.RESULT_TARE_WEIGHT
|
|
|
+ END
|
|
|
+ ) "tareWeight",
|
|
|
+ (
|
|
|
+ CASE
|
|
|
+ WHEN TWB.WEIGHT_BATCH_ID IS NOT NULL
|
|
|
+ THEN TWB.BATCH_TARE_WEIGHT_TIME
|
|
|
+ ELSE TWR.RESULT_TARE_WEIGHT_TIME
|
|
|
+ END
|
|
|
+ ) "tareWeightTime",
|
|
|
+ (
|
|
|
+ CASE
|
|
|
+ WHEN bdo.CONSIGNEE_ID is null and bdo.PRICE_VALUE is null and bdo.REMARK is not null
|
|
|
+ THEN null
|
|
|
+ WHEN TWB.WEIGHT_BATCH_ID IS NOT NULL
|
|
|
+ THEN TWB.BATCH_NET_WEIGHT
|
|
|
+ ELSE TWR.RESULT_NET_WEIGHT
|
|
|
+ END
|
|
|
+ ) "netWeight",
|
|
|
+
|
|
|
TLFR.RESULT_OUT_GATE_TIME "outGateTime",
|
|
|
TER.RESULT_ENTRY_GATE_TIME "entryGateTime",
|
|
|
TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
|
|
|
@@ -1092,6 +1127,8 @@
|
|
|
ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN RMS_CONSIGNEE RC2
|
|
|
ON RC2.CONSIGNEE_ID = BDO.CONSIGNEE_ID
|
|
|
+ LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
|
|
|
+ ON TWB .WEIGHT_BATCH_ID = BDO .WEIGHT_BATCH_ID
|
|
|
WHERE ASO.SALE_TYPE = 1
|
|
|
AND ASO.DELETED = 0
|
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
