|
|
@@ -1919,6 +1919,7 @@
|
|
|
ASM.SALE_MATERIAL_ID "saleMaterialId",
|
|
|
ASM.MATERIAL_NUMBER "materialNum",
|
|
|
ASM.EAS_PRIMARY_ID "closeEntryId",
|
|
|
+ ASM.STEEL_METER "steelMeters",
|
|
|
ASM.DELETED "deletedStatus",
|
|
|
RC.CONSIGNEE_COMPANY_NAME "consigneeName",
|
|
|
ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
|
|
|
@@ -3027,7 +3028,12 @@
|
|
|
SELECT distinct OO.ORDER_ID "orderId",
|
|
|
ASO.SALE_ORDER_ID "saleOrderId",
|
|
|
ASO.SALE_NUMBER "saleOrderNo",
|
|
|
+ ASO.SALE_REMARK "saleRemark",
|
|
|
+ ASO.SALER_ID "salerId",
|
|
|
+ ASO.SHIPPER_ID "shipperId",
|
|
|
+ ASO.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
|
|
|
RC.CONSIGNEE_COMPANY_NAME "consigneeName",
|
|
|
+ RC.CONSIGNEE_ID "receiveId",
|
|
|
ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
|
|
|
RS.SHIPPER_NAME "shipperName",
|
|
|
(CASE WHEN
|
|
|
@@ -3047,6 +3053,7 @@
|
|
|
OO.ORDER_LINE_SEQUENCE "lineSequence",
|
|
|
ASO.SALE_ORDER_ISSELF_MENTION "isSelfMention",
|
|
|
RSR.SALER_NAME "saler",
|
|
|
+ RSR.SALER_ID "saler",
|
|
|
R_CARRIER.CARRIER_ABBREVIATION "carrierName",
|
|
|
OO.ORDER_NUMBER "orderNo",
|
|
|
RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
@@ -3119,22 +3126,39 @@
|
|
|
<select id="getSteelReportDetailsListBySmId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
|
|
|
SELECT distinct
|
|
|
ASM.SALE_MATERIAL_ID "saleMaterialId",
|
|
|
- ASM.MATERIAL_NUMBER "materialNum",
|
|
|
+ ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
|
|
|
+ ASM.MATERIAL_NUMBER "materialNumber",
|
|
|
+ ASM.IS_POUND_SALE "isPoundSale",
|
|
|
+ ADSO.CARRIER_ID "carrierId",
|
|
|
ASM.EAS_PRIMARY_ID "closeEntryId",
|
|
|
+ ASM.STEEL_METER "steelMeters",
|
|
|
+ RRP.PLACE_ID "placeId",
|
|
|
+ RRP.ADDRESS_DELIVERY_ADDRESS "place",
|
|
|
+ RRP.ADDRESS_ID "shipperAddressId",
|
|
|
+ ASOM.TRUCK_REMARK "truckRemark",
|
|
|
+ ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel",
|
|
|
+ ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
|
|
|
ASM.DELETED "deletedStatus",
|
|
|
RM.MATERIAL_ID "materialId",
|
|
|
RM.MATERIAL_NAME "materialName",
|
|
|
RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
|
|
|
+ RM.MATERIAL_SPECIFICATION "materialSpecification",
|
|
|
+ RM.MATERIAL_MODEL "materialModel",
|
|
|
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",
|
|
|
TLR.RESULT_LOAD_END_TIME "loadTime",
|
|
|
- BDO.DETAILS_AMOUNT "detailsAmount"
|
|
|
+ BDO.DETAILS_AMOUNT "detailsAmount",
|
|
|
+ oo.ORDER_NUMBER "orderNo"
|
|
|
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_RECEIVE_PLACE RRP
|
|
|
+ ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_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
|
luobang