|
|
@@ -2418,30 +2418,28 @@
|
|
|
<!-- 查询分解运输计划 -->
|
|
|
<select id="getInwardOrderList" resultType="java.util.Map" parameterType="java.util.Map">
|
|
|
SELECT *
|
|
|
- FROM (SELECT APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
|
|
|
- RM.MATERIAL_NAME AS "materialName",
|
|
|
- DB.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
|
|
|
- AIP.PLAN_NUMBER AS "planNumber",
|
|
|
- RCA.CARRIER_NAME AS "carrierName",
|
|
|
- AIP.CARRIER_ID AS "carrierId",
|
|
|
- RC.CAPACITY_NUMBER AS "capacityNumber",
|
|
|
- OOM.ORDER_MATERIAL_NUMBER AS "orderMaterialNumber",
|
|
|
- AIR.REQUIREMENT_NUMBER AS "requirementNumber",
|
|
|
- AIP.PLAN_ISSUE_TIME AS "planIssueTime",
|
|
|
- AIP.PLAN_ISSUE_NAME AS "planIssueName",
|
|
|
- AIR.REQUIREMENT_TYPE AS "requirementType",
|
|
|
- RCT.CAPACITY_TYPE_NAME AS "capacityTypeName",
|
|
|
- ARM.MATERIAL_COUNT AS "materialNumber",
|
|
|
- ARM.MATERIAL_WEIGHT AS "materialWeight",
|
|
|
- AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
|
|
|
- RW.WAREHOUSE_NAME AS "wareHouseName",
|
|
|
- AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
|
|
|
- AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
|
|
|
- AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
|
|
|
+ FROM (SELECT RM.MATERIAL_NAME || rm.material_specification || '(' ||
|
|
|
+ rm.material_model || ')' AS "materialName",
|
|
|
+ AIP.PLAN_NUMBER AS "planNumber",
|
|
|
+ RCA.CARRIER_NAME AS "carrierName",
|
|
|
+ AIP.CARRIER_ID AS "carrierId",
|
|
|
+ RC.CAPACITY_NUMBER AS "capacityNumber",
|
|
|
+ OOM.ORDER_MATERIAL_NUMBER AS "orderMaterialNumber",
|
|
|
+ AIR.REQUIREMENT_NUMBER AS "requirementNumber",
|
|
|
+ AIP.PLAN_ISSUE_TIME AS "planIssueTime",
|
|
|
+ AIP.PLAN_ISSUE_NAME AS "planIssueName",
|
|
|
+ AIR.REQUIREMENT_TYPE AS "requirementType",
|
|
|
+ ARM.MATERIAL_COUNT AS "materialNumber",
|
|
|
+ ARM.MATERIAL_WEIGHT AS "materialWeight",
|
|
|
+ AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
|
|
|
+ RW.WAREHOUSE_NAME AS "wareHouseName",
|
|
|
+ AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
|
|
|
+ AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
|
|
|
+ AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
|
|
|
AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
|
|
|
- RW1.WAREHOUSE_NAME "unloadWarehouseName",
|
|
|
- OO.ORDER_ID AS "orderId",
|
|
|
- AIP.INSERT_TIME AS "insertTime"
|
|
|
+ RW1.WAREHOUSE_NAME "unloadWarehouseName",
|
|
|
+ OO.ORDER_ID AS "orderId",
|
|
|
+ AIP.INSERT_TIME AS "insertTime"
|
|
|
FROM OMSTRUCK_ORDER OO
|
|
|
LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
|
|
|
ON OOM.ORDER_ID = OO.ORDER_ID
|
|
|
@@ -2455,20 +2453,14 @@
|
|
|
ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
|
|
|
LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
|
|
|
ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
|
|
|
- LEFT JOIN AMS_PURCHASE_ORDER APO
|
|
|
- ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
|
|
|
- LEFT JOIN DIL_BATCH DB
|
|
|
- ON APO.BATCH_ID = DB.BATCH_ID
|
|
|
LEFT JOIN RMS_MATERIAL RM
|
|
|
ON RM.MATERIAL_ID = OOM.MATERIAL_ID
|
|
|
LEFT JOIN RMS_WAREHOUSE RW
|
|
|
- ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
|
|
|
+ ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_PLATFORM_ID
|
|
|
LEFT JOIN RMS_WAREHOUSE RW1
|
|
|
ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
|
|
|
LEFT JOIN RMS_CARRIER RCA
|
|
|
ON RCA.CARRIER_ID = AIP.CARRIER_ID
|
|
|
- LEFT JOIN RMS_CAPACITY_TYPE RCT
|
|
|
- ON RCT.CAPACITY_TYPE_ID = AIR.CAPACITY_TYPE_ID
|
|
|
WHERE AIP.DELETED = 0
|
|
|
AND OO.ORDER_TYPE IN (4, 9, 10, 11)
|
|
|
<if test="carrierId != null">
|
Your Name