|
|
@@ -1824,6 +1824,7 @@
|
|
|
<if test="shipperId != null">
|
|
|
and a_s_order.SHIPPER_ID = #{shipperId}
|
|
|
</if>
|
|
|
+ ORDER BY a_s_order.UPDATE_TIME DESC
|
|
|
)
|
|
|
<where>
|
|
|
<if test="saleNumber != null">
|
|
|
@@ -1917,7 +1918,6 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
</where>
|
|
|
- <include refid="orderBy1"></include>
|
|
|
</select>
|
|
|
|
|
|
<select id="getAmsSaleOrderApprovedes" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
|
|
|
@@ -2257,11 +2257,13 @@
|
|
|
SELECT DISTINCT ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "truckNo",
|
|
|
RM.MATERIAL_NAME AS "materialName",
|
|
|
ASM.MATERIAL_ID AS "materialId",
|
|
|
- ASTM.SALE_ORDER_MATERIAL_NUMBER AS "materialNumber",
|
|
|
+ ASM.MATERIAL_NUMBER AS "materialNumber",
|
|
|
+ ASM.MATERIAL_WEIGHT AS "materialWeight",
|
|
|
ASOM.SALE_DATE_OF_RECEIPT AS "receiptDate",
|
|
|
RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "materialModelSpecification",
|
|
|
RM.MATERIAL_CODE AS "materialCode",
|
|
|
- RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "place",
|
|
|
+ RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
|
|
|
+ RRP.ADDRESS_DELIVERY_ADDRESS AS "place",
|
|
|
ASOM.SALE_DATE_OF_RECEIPT AS "receiptDate",
|
|
|
ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTel",
|
|
|
ASOM.SALE_ORDER_CONSIGNEE AS "saleOrderConsignee",
|
|
|
@@ -2604,6 +2606,7 @@
|
|
|
WHERE ASO.SALE_ORDER_STATUS IN (2,4)
|
|
|
AND ASOM.ISSUE_STATUS IS NULL
|
|
|
AND ADSO.CARRIER_ID IS NULL
|
|
|
+ AND ASO.DELETED = 0
|
|
|
)
|
|
|
<where>
|
|
|
<if test="saleNumber != null">
|
|
|
@@ -2720,6 +2723,7 @@
|
|
|
AND ASOM.ISSUE_STATUS IS NULL
|
|
|
AND ADSO.DISPATCH_TYPE = 2
|
|
|
AND OO.ORDER_ID IS NULL
|
|
|
+ AND ASO.DELETED = 0
|
|
|
)
|
|
|
<where>
|
|
|
<if test="saleNumber != null">
|
|
|
@@ -2787,23 +2791,23 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getTruckNoMaterialAndCarrier" parameterType="DECIMAL" resultType="java.util.Map" >
|
|
|
- SELECT DISTINCT ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "truckNo",
|
|
|
- RM.MATERIAL_NAME AS "materialName",
|
|
|
- ASM.MATERIAL_ID AS "materialId",
|
|
|
- ASTM.SALE_ORDER_MATERIAL_NUMBER AS "materialNumber",
|
|
|
- ASM.MATERIAL_WEIGHT AS "materialWeight",
|
|
|
- ASOM.SALE_DATE_OF_RECEIPT AS "receiptDate",
|
|
|
- RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "materialModelSpecification",
|
|
|
- RM.MATERIAL_CODE AS "materialCode",
|
|
|
+ SELECT DISTINCT ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "truckNo",
|
|
|
+ RM.MATERIAL_NAME AS "materialName",
|
|
|
+ ASM.MATERIAL_ID AS "materialId",
|
|
|
+ ASM.MATERIAL_NUMBER AS "materialNumber",
|
|
|
+ ASM.MATERIAL_WEIGHT AS "materialWeight",
|
|
|
+ ASOM.SALE_DATE_OF_RECEIPT AS "receiptDate",
|
|
|
+ RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "materialModelSpecification",
|
|
|
+ RM.MATERIAL_CODE AS "materialCode",
|
|
|
RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
|
|
|
- RRP.ADDRESS_DELIVERY_ADDRESS AS "place",
|
|
|
- ASOM.SALE_DATE_OF_RECEIPT AS "receiptDate",
|
|
|
- ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTel",
|
|
|
- ASOM.SALE_ORDER_CONSIGNEE AS "saleOrderConsignee",
|
|
|
- ASOM.SALE_ORDER_MATERIAL_ID AS "saleOrderMaterialId",
|
|
|
- ASOM.SALE_SHIPPING_ADDRESS_ID AS "placeId",
|
|
|
- RC.CAPACITY_NUMBER AS "capacityNumber",
|
|
|
- ADSO.CARRIER_ID AS "carrierId"
|
|
|
+ RRP.ADDRESS_DELIVERY_ADDRESS AS "place",
|
|
|
+ ASOM.SALE_DATE_OF_RECEIPT AS "receiptDate",
|
|
|
+ ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTel",
|
|
|
+ ASOM.SALE_ORDER_CONSIGNEE AS "saleOrderConsignee",
|
|
|
+ ASOM.SALE_ORDER_MATERIAL_ID AS "saleOrderMaterialId",
|
|
|
+ ASOM.SALE_SHIPPING_ADDRESS_ID AS "placeId",
|
|
|
+ RC.CAPACITY_NUMBER AS "capacityNumber",
|
|
|
+ ADSO.CARRIER_ID AS "carrierId"
|
|
|
FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
|
|
|
LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
|
|
|
ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
|
|
|
@@ -2860,10 +2864,12 @@
|
|
|
ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
|
|
|
LEFT JOIN RMS_CARRIER RCA
|
|
|
ON RCA.CARRIER_ID = ADSO.CARRIER_ID
|
|
|
- WHERE ASO.SALE_ORDER_STATUS IN (2,4)
|
|
|
+ WHERE OO.ORDER_TYPE = 1
|
|
|
+ AND ASO.SALE_ORDER_STATUS IN (2,4)
|
|
|
AND ASOM.ISSUE_STATUS IS NULL
|
|
|
AND ADSO.DISPATCH_TYPE = 2
|
|
|
AND OO.ORDER_ID IS NOT NULL
|
|
|
+ AND OO.ORDER_STATUS IN (4,5)
|
|
|
)
|
|
|
<where>
|
|
|
<if test="saleNumber != null">
|
HUJIANGUO