|
@@ -2328,7 +2328,11 @@
|
|
|
END) "materialAcWeight",
|
|
END) "materialAcWeight",
|
|
|
ASM.EAS_PRIMARY_ID "closeEntryId",
|
|
ASM.EAS_PRIMARY_ID "closeEntryId",
|
|
|
ASM.DELETED "deletedStatus",
|
|
ASM.DELETED "deletedStatus",
|
|
|
- RC.CONSIGNEE_COMPANY_NAME "consigneeName",
|
|
|
|
|
|
|
+ (CASE
|
|
|
|
|
+ WHEN RC2.CONSIGNEE_COMPANY_NAME IS NOT NULL
|
|
|
|
|
+ THEN RC2.CONSIGNEE_COMPANY_NAME
|
|
|
|
|
+ ELSE RC.CONSIGNEE_COMPANY_NAME
|
|
|
|
|
+ END) "consigneeName",
|
|
|
ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
|
|
ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
|
|
|
RS.SHIPPER_NAME "shipperName",
|
|
RS.SHIPPER_NAME "shipperName",
|
|
|
RCA.CAPACITY_NUMBER "capacityNo",
|
|
RCA.CAPACITY_NUMBER "capacityNo",
|
|
@@ -2407,6 +2411,7 @@
|
|
|
BDO.PRICEIDS "priceIds",
|
|
BDO.PRICEIDS "priceIds",
|
|
|
BDO.REMARK "detailsRemark",
|
|
BDO.REMARK "detailsRemark",
|
|
|
BDO.PHOTO "photo",
|
|
BDO.PHOTO "photo",
|
|
|
|
|
+ BDO.DETAILS_ID "detailsId",
|
|
|
--理重
|
|
--理重
|
|
|
ASM.MATERIAL_WEIGHT "materialWeight",
|
|
ASM.MATERIAL_WEIGHT "materialWeight",
|
|
|
--收款客户
|
|
--收款客户
|
|
@@ -2480,6 +2485,8 @@
|
|
|
ON TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
ON TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
|
|
LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
|
|
|
ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
|
|
ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
|
|
|
|
|
+ LEFT JOIN RMS_CONSIGNEE RC2
|
|
|
|
|
+ ON RC2.CONSIGNEE_ID = BDO.CONSIGNEE_ID
|
|
|
WHERE ASO.SALE_TYPE = 1
|
|
WHERE ASO.SALE_TYPE = 1
|
|
|
and (aso.DELETED between 1 and 2 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED = 0 and aso.SALE_ORDER_STATUS between 0 and 4)
|
|
and (aso.DELETED between 1 and 2 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED = 0 and aso.SALE_ORDER_STATUS between 0 and 4)
|
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
@@ -2657,7 +2664,11 @@
|
|
|
END) "materialAcWeight",
|
|
END) "materialAcWeight",
|
|
|
ASM.EAS_PRIMARY_ID "closeEntryId",
|
|
ASM.EAS_PRIMARY_ID "closeEntryId",
|
|
|
ASM.DELETED "deletedStatus",
|
|
ASM.DELETED "deletedStatus",
|
|
|
- RC.CONSIGNEE_COMPANY_NAME "consigneeName",
|
|
|
|
|
|
|
+ (CASE
|
|
|
|
|
+ WHEN RC2.CONSIGNEE_COMPANY_NAME IS NOT NULL
|
|
|
|
|
+ THEN RC2.CONSIGNEE_COMPANY_NAME
|
|
|
|
|
+ ELSE RC.CONSIGNEE_COMPANY_NAME
|
|
|
|
|
+ END) "consigneeName",
|
|
|
ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
|
|
ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
|
|
|
RS.SHIPPER_NAME "shipperName",
|
|
RS.SHIPPER_NAME "shipperName",
|
|
|
RCA.CAPACITY_NUMBER "capacityNo",
|
|
RCA.CAPACITY_NUMBER "capacityNo",
|
|
@@ -2809,6 +2820,8 @@
|
|
|
ON TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
ON TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
|
|
LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
|
|
|
ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
|
|
ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
|
|
|
|
|
+ LEFT JOIN RMS_CONSIGNEE RC2
|
|
|
|
|
+ ON RC2.CONSIGNEE_ID = BDO.CONSIGNEE_ID
|
|
|
WHERE ASO.SALE_TYPE = 1
|
|
WHERE ASO.SALE_TYPE = 1
|
|
|
and (aso.DELETED between 1 and 2 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED = 0 and aso.SALE_ORDER_STATUS between 0 and 4)
|
|
and (aso.DELETED between 1 and 2 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED = 0 and aso.SALE_ORDER_STATUS between 0 and 4)
|
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
