|
@@ -1905,6 +1905,7 @@
|
|
|
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",
|
|
|
|
|
+ RCA.CAPACITY_NUMBER "newCapacityNo",
|
|
|
NVL(OO.CAPACITY_ID,0) "capacityIds",
|
|
NVL(OO.CAPACITY_ID,0) "capacityIds",
|
|
|
OO.CAPACITY_ID "capacityId",
|
|
OO.CAPACITY_ID "capacityId",
|
|
|
ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
|
|
ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
|
|
@@ -2081,7 +2082,10 @@
|
|
|
R_CARRIER.CARRIER_ABBREVIATION is null
|
|
R_CARRIER.CARRIER_ABBREVIATION is null
|
|
|
</if>
|
|
</if>
|
|
|
<if test="item != null">
|
|
<if test="item != null">
|
|
|
- R_CARRIER.CARRIER_ABBREVIATION like '%${item}%'
|
|
|
|
|
|
|
+ (CASE WHEN ASO.SALE_ORDER_ISSELF_MENTION = '是'
|
|
|
|
|
+ THEN '自提'
|
|
|
|
|
+ ELSE R_CARRIER.CARRIER_ABBREVIATION
|
|
|
|
|
+ END) like '%${item}%'
|
|
|
</if>
|
|
</if>
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
zengyf