|
|
@@ -2220,7 +2220,7 @@
|
|
|
and R_CARRIER.CARRIER_SSO_ID = #{carrierSsoId}
|
|
|
</if>
|
|
|
<if test="inboundWarehouse != null">
|
|
|
- and RRP.ADDRESS_DELIVERY_ADDRESS = #{inboundWarehouse}
|
|
|
+ and RRP.ADDRESS_DELIVERY_ADDRESS like '%${inboundWarehouse}%'
|
|
|
</if>
|
|
|
<if test="remark != null" >
|
|
|
and RSR.SALER_NAME || RCA.CAPACITY_NUMBER ||
|
|
|
@@ -6542,25 +6542,15 @@
|
|
|
when ASO.SALE_ORDER_STATUS = 0 then '待审核'
|
|
|
END
|
|
|
) "saleOrderStatus",
|
|
|
- (CASE
|
|
|
- when OO.ORDER_STATUS =2
|
|
|
- then '已完成'
|
|
|
- when OO.ORDER_STATUS=4
|
|
|
- then '已派单'
|
|
|
- when nvl(OO.ORDER_STATUS,0)=0
|
|
|
- then '未派发'
|
|
|
- when OO.ORDER_STATUS=7
|
|
|
- then '已关闭'
|
|
|
- when OO.ORDER_STATUS=8
|
|
|
- then '已关闭'
|
|
|
- WHEN TRR.INSERT_TIME IS NOT NULL
|
|
|
+ (CASE WHEN
|
|
|
+ OO.ORDER_STATUS = 2
|
|
|
THEN '已完成'
|
|
|
- WHEN QQR.RESULT_START_TIME IS NOT NULL
|
|
|
- THEN '排队中'
|
|
|
- when OO.ORDER_STATUS = 5
|
|
|
- then '已接单'
|
|
|
- END)
|
|
|
- "orderStatus",
|
|
|
+ WHEN TTR.ORDER_STATUS IS NULL
|
|
|
+ THEN '未派发'
|
|
|
+ WHEN TTR.ORDER_STATUS = '排队中' AND QQR.UPDATE_TIME IS NOT NULL
|
|
|
+ THEN '已放行'
|
|
|
+ ELSE TTR.ORDER_STATUS
|
|
|
+ END) "orderStatus",
|
|
|
(SELECT count(asm.SALE_MATERIAL_ID) FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
|
|
|
LEFT JOIN AMS_SALE_MATERIAL ASM
|
|
|
ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
|
|
|
@@ -6627,7 +6617,7 @@
|
|
|
and R_CARRIER.CARRIER_SSO_ID = #{carrierSsoId}
|
|
|
</if>
|
|
|
<if test="inboundWarehouse != null">
|
|
|
- and ORI.INBOUND_WAREHOUSE = #{inboundWarehouse}
|
|
|
+ and ORI.INBOUND_WAREHOUSE like '%${inboundWarehouse}%'
|
|
|
</if>
|
|
|
<if test="remark != null" >
|
|
|
and RSR.SALER_NAME || RCA.CAPACITY_NUMBER ||
|
|
|
@@ -6939,7 +6929,8 @@
|
|
|
ORI.MATERIAL_NUMBER "inventoryMaterialNumber",
|
|
|
ORI.THEORY_WEIGHT "inventoryTheoryWeight",
|
|
|
ORI.SINGLE_WEIGHT "singleWeight",
|
|
|
- ORI.METER "meter"
|
|
|
+ ORI.METER "meter",
|
|
|
+ ORI.INVENTORY_ID "inventoryId"
|
|
|
FROM AMS_SALE_ORDER ASO
|
|
|
LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
|
|
|
ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
|
Redeem