|
|
@@ -642,25 +642,25 @@
|
|
|
from
|
|
|
(
|
|
|
select
|
|
|
- OO.ORDER_ID "orderId",
|
|
|
- APO.PURCHASE_ORDER_ID "purchaseOrderId",
|
|
|
- AP.PLAN_ID "planId",
|
|
|
- APO.PURCHASE_ORDER_NO "purchaseOrderNo",
|
|
|
- RM.MATERIAL_NAME "materialName",
|
|
|
- AP.PLAN_NO "planNo",
|
|
|
- RC.CAPACITY_NUMBER "capacityNumber",
|
|
|
- RC.CAPACITY_ID "capacityId",
|
|
|
- OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
|
|
|
- to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd')"planTruckTime",
|
|
|
- to_char(AP.PLAN_INCOMING_TIME, 'yyyy-mm-dd') "planIncomingTime",
|
|
|
- OO.INSERT_USERNAME "insertUsername",
|
|
|
- OO.INSERT_TIME "insertTime",
|
|
|
- OO.ORDER_NUMBER "orderNumber",
|
|
|
- RW.WAREHOUSE_NAME "warehouseName", --卸货点
|
|
|
- to_char(OO.ORDER_ENTRY_TIME, 'yyyy-mm-dd') "orderEntryTime", --进厂时间
|
|
|
- RS.SUPPLIER_NAME "supplierName", --发货单位
|
|
|
- RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位,
|
|
|
- OO.ORDER_ISSUE_TIME "orderIssueTime"
|
|
|
+ OO.ORDER_ID "orderId",
|
|
|
+ APO.PURCHASE_ORDER_ID "purchaseOrderId",
|
|
|
+ AP.PLAN_ID "planId",
|
|
|
+ APO.PURCHASE_ORDER_NO "purchaseOrderNo",
|
|
|
+ RM.MATERIAL_NAME "materialName",
|
|
|
+ AP.PLAN_NO "planNo",
|
|
|
+ RC.CAPACITY_NUMBER "capacityNumber",
|
|
|
+ RC.CAPACITY_ID "capacityId",
|
|
|
+ OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
|
|
|
+ to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd')"planTruckTime",
|
|
|
+ to_char(AP.PLAN_INCOMING_TIME, 'yyyy-mm-dd') "planIncomingTime",
|
|
|
+ OO.INSERT_USERNAME "insertUsername",
|
|
|
+ OO.INSERT_TIME "insertTime",
|
|
|
+ OO.ORDER_NUMBER "orderNumber",
|
|
|
+ RW.WAREHOUSE_NAME "warehouseName", --卸货点
|
|
|
+ to_char(OO.ORDER_ENTRY_TIME, 'yyyy-mm-dd') "orderEntryTime", --进厂时间
|
|
|
+ RS.SUPPLIER_NAME "supplierName", --发货单位
|
|
|
+ RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位,
|
|
|
+ OO.ORDER_ISSUE_TIME "orderIssueTime"
|
|
|
|
|
|
from OMSTRUCK_ORDER OO
|
|
|
left join AMS_PURCHASE_ORDER APO
|
|
|
@@ -1516,9 +1516,9 @@
|
|
|
select *
|
|
|
from (
|
|
|
select apo.PURCHASE_ORDER_NO "purchaseOrderNo",
|
|
|
- apo.PURCHASE_ORDER_ID "purchaseOrderId",
|
|
|
- db.RESULT_FOREIGN_SHIP_NAME "remark"
|
|
|
-
|
|
|
+ apo.PURCHASE_ORDER_ID "purchaseOrderId",
|
|
|
+ db.RESULT_FOREIGN_SHIP_NAME "remark",
|
|
|
+ apo.RECEIVE_UNIT_ID "receiveUnitId"
|
|
|
from AMS_PURCHASE_ORDER APO
|
|
|
join DIL_BATCH DB on apo.BATCH_ID = db.BATCH_ID
|
|
|
where db.MATERIAL_ID = #{materialId}
|
txf