|
@@ -646,7 +646,7 @@
|
|
|
APO.PURCHASE_ORDER_ID "purchaseOrderId",
|
|
|
APO.PURCHASE_ORDER_NO "purchaseOrderNo",
|
|
|
RM.MATERIAL_NAME "materialName",
|
|
|
- <if test="orderTypee = 8">
|
|
|
+ <if test="orderTypee == 8">
|
|
|
AP.PLAN_NO "planNo",
|
|
|
AP.PLAN_ID "planId",
|
|
|
to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd')"planTruckTime",
|
|
@@ -661,13 +661,13 @@
|
|
|
RW.WAREHOUSE_NAME "warehouseName", --卸货点
|
|
|
to_char(OO.ORDER_ENTRY_TIME, 'yyyy-mm-dd') "orderEntryTime", --进厂时间
|
|
|
RS.SUPPLIER_NAME "supplierName", --发货单位
|
|
|
- RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位,
|
|
|
+ RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位
|
|
|
OO.ORDER_ISSUE_TIME "orderIssueTime"
|
|
|
|
|
|
from OMSTRUCK_ORDER OO
|
|
|
left join AMS_PURCHASE_ORDER APO
|
|
|
on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
|
|
|
- <if test="orderTypee = 8">
|
|
|
+ <if test="orderTypee == 8">
|
|
|
left join AMSTRUCK_PURPLAN AP
|
|
|
on AP.BATCH_ID = APO.BATCH_ID and AP.PLAN_STATUS != 3
|
|
|
</if>
|
|
@@ -1189,7 +1189,7 @@
|
|
|
WHERE OO.ORDER_ID = #{orderId}
|
|
|
</select>
|
|
|
|
|
|
- <!-- 通过运输订单ID查询运输订单相关信息 -->
|
|
|
+ <!-- 通过运输订单ID查询运输订单相关信息 仅限单拼 -->
|
|
|
<select id="getOrderByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
|
|
|
SELECT APO.PURCHASE_ORDER_NO "purchaseOrderNo",
|
|
|
RC.CAPACITY_NUMBER "capacityNumber",
|
|
@@ -1197,7 +1197,7 @@
|
|
|
RM.MATERIAL_NAME "materialName",
|
|
|
OO.ORDER_ENTRY_TIME "orderEntryTime",
|
|
|
OO.ORDER_TYPE "orderType",
|
|
|
- RW.WAREHOUSE_NAME "warehouseName",
|
|
|
+ RW.WAREHOUSE_NAME " ",
|
|
|
OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
|
|
|
OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight"
|
|
|
FROM OMSTRUCK_ORDER OO
|