zhangym 1 year ago
parent
commit
a28f7958c7

+ 0 - 2
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -124,8 +124,6 @@ public class AMScontroller {
             Date dueTime = simpleDateFormat.parse(map.get("dueTime").toString());
             map.put("dueTime", dueTime);
         }
-
-
         return amsFeign.productionRequirementAdd(map);
     }
 

+ 17 - 5
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -240,11 +240,14 @@
         select * from(
         select * from(
         select
+        MATERIAL_TYPE_ID "operationsNameId",
+        MATERIAL_TYPE_NAME "operationsName",
         MATERIAL_TYPE_ID "id",
         MATERIAL_TYPE_ID "value",
         MATERIAL_TYPE_NAME "label",
         MATERIAL_TYPE_NAME "text",
-        REMARK "remark"
+        REMARK "remark",
+        'operationsName' "prop"
         from RMS_MATERIAL_TYPE
         where DELETED = 0
         )
@@ -475,12 +478,16 @@
         select
         RC.TRANS_RANGE_ID "transrangeId",
             RC.TRANS_RANGE_NAME "transrangeName",
+        RC.TRANS_RANGE_ID "operationRangeId",
+        RC.TRANS_RANGE_NAME "operationRangeName",
         RC.TRANS_RANGE_ID "id",
         RC.TRANS_RANGE_ID "value",
         RC.TRANS_RANGE_NAME "label",
         RC.TRANS_RANGE_NAME "text",
         rc.START_POINT_ID   "shippingPointId",
-        rc.END_POINT_ID     "receivingPointId"
+        rc.END_POINT_ID     "receivingPointId",
+        rc.LINE_ID  "lineId",
+        'operationRangeName' "prop"
         from RMS_TRANS_RANGE RC
         where DELETED = 0
         )
@@ -536,7 +543,8 @@
         RCT.CAPACITY_TYPE_NAME "text",
         RCT .CAPACITY_MAX_LOAD "capacityMaxLoad",
         '[' || listagg (RCFT .FUEL_TYPE_ID, ',') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID) || ']' "fuelTypeIds",
-        listagg (RFT .FUEL_TYPE_NAME, '/') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID) "fuelTypes"
+        listagg (RFT .FUEL_TYPE_NAME, '/') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID) "fuelTypes",
+        'capacityTypeName' "prop"
         from RMS_CAPACITY_TYPE RCT
         LEFT JOIN RMS_CAPACITY_FUEL_TYPE RCFT ON RCFT.CAPACITY_TYPE_ID = RCT .CAPACITY_TYPE_ID
         LEFT JOIN RMS_FUEL_TYPE RFT ON RFT .FUEL_TYPE_ID = RCFT.FUEL_TYPE_ID
@@ -585,7 +593,8 @@
         RL.LINE_NAME "label",
         RL.LINE_NAME "text",
         NVL(RL_TEMP."points",'无') "points",
-        RL.LINE_TYPE    "lineType"
+        RL.LINE_TYPE    "lineType",
+        'lineName' "prop"
         from RMS_LINE RL
         LEFT JOIN
         (
@@ -649,10 +658,13 @@
     <select id="getMaterialByLike" resultType="java.util.Map">
         select * from(
         select
+        RC.MATERIAL_ID "materialId",
+        RC.MATERIAL_NAME "materialName",
         RC.MATERIAL_ID "id",
         RC.MATERIAL_ID "value",
         RC.MATERIAL_NAME "label",
-        RC.MATERIAL_NAME "text"
+        RC.MATERIAL_NAME "text",
+        'materialName' "prop"
         from RMS_MATERIAL RC
         <where>
             DELETED = 0