xiugai luobang bug

src/main/java/com/steerinfo/dil/service/impl/TmstruckEnfactoryResultServiceImpl.java

@@ -112,7 +112,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 9:
                 return tmstruckEnfactoryResultMapper.getImportedDomesticNzLoadResult(map); //apiId:99
             case 10:
-                return tmstruckEnfactoryResultMapper.getCGNZEnFactory(map);
+                return tmstruckEnfactoryResultMapper.getCGNZEnFactory(map); //apiId:99
             case 11:
                 return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
             case 12:

src/main/resources/com/steerinfo/dil/mapper/TmstruckEnfactoryResultMapper.xml

@@ -1291,50 +1291,52 @@
         <include refid="orderByEnterTime"></include>
     </select>
     <select id="getCGNZEnFactory" resultType="java.util.Map" parameterType="map">
-        select TER.RESULT_ID               "resultId",
-       APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
-       RM.MATERIAL_NAME            "materialName",
-       DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-       OO.ORDER_NUMBER             "orderNumber",
-       RC.CAPACITY_NUMBER          "capacityNumber",
-       RG.GATEPOST_NAME            "gatepostName",
-       TER.RESULT_ENTRY_MODE       "resultEntryMode",
-       TER.RESULT_ENTRY_GATE_TIME  "resultEntryGateTime",
-       RS.SUPPLIER_NAME            "supplierName",
-       OOM.ORDER_MATERIAL_WEIGHT   "orderMaterialWeight",
-       TER.INSERT_TIME             "insertTime",
-       RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
-  from TMSTRUCK_ENFACTORY_RESULT TER
-  left join TMSTRUCK_TOTAL_RESULT TTR
-    on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-  left join OMSTRUCK_ORDER OO
-    on TTR.ORDER_ID = OO.ORDER_ID
-  left join amstruck_inward_plan aip
-    on aip.plan_id = oo.order_plan_id
-  left join amstruck_requirement_plan arp
-    on arp.plan_id = aip.plan_id
-  left join amstruck_inward_requirement air
-    on air.requirement_id = arp.requirement_id
-  left join AMS_PURCHASE_ORDER APO
-    on apo.purchase_order_id = air.purchase_order_id
-  left join DIL_BATCH DB
-    on DB.BATCH_ID = APO.BATCH_ID
-  left join RMS_CAPACITY RC
-    on RC.CAPACITY_ID = OO.CAPACITY_ID
-  left join RMS_SUPPLIER RS
-    on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-  left join RMS_CONSIGNEE RCON
-    on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
-  left join OMSTRUCK_ORDER_MATERIAL OOM
-    on OOM.ORDER_ID = OO.ORDER_ID
-  left join RMS_MATERIAL RM
-    on RM.MATERIAL_ID = OOM.MATERIAL_ID
-  left join RMS_GATEPOST RG
-    on RG.GATEPOST_ID = TER.GATEPOST_ID
- where TER.RESULT_ENTRY_GATE_TIME is not null
-   and OO.ORDER_TYPE = 10
-   order by
-   ter.result_entry_gate_time desc
+        select
+        *
+        from(
+        select TER.RESULT_ID "resultId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        RM.MATERIAL_NAME "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RG.GATEPOST_NAME "gatepostName",
+        TER.RESULT_ENTRY_MODE "resultEntryMode",
+        TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
+        RS.SUPPLIER_NAME "supplierName",
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
+        TER.INSERT_TIME "insertTime",
+        RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        from TMSTRUCK_ENFACTORY_RESULT TER
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join OMSTRUCK_ORDER OO
+        on TTR.ORDER_ID = OO.ORDER_ID
+        left join amstruck_inward_plan aip
+        on aip.plan_id = oo.order_plan_id
+        left join amstruck_requirement_plan arp
+        on arp.plan_id = aip.plan_id
+        left join amstruck_inward_requirement air
+        on air.requirement_id = arp.requirement_id
+        left join AMS_PURCHASE_ORDER APO
+        on apo.purchase_order_id = air.purchase_order_id
+        left join DIL_BATCH DB
+        on DB.BATCH_ID = APO.BATCH_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join RMS_SUPPLIER RS
+        on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        left join RMS_CONSIGNEE RCON
+        on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        left join RMS_GATEPOST RG
+        on RG.GATEPOST_ID = TER.GATEPOST_ID
+        where TER.RESULT_ENTRY_GATE_TIME is not null
+        and OO.ORDER_TYPE = 10
+        )
         <where>
             <if test="purchaseOrderId != null">
                 <foreach collection="purchaseOrderId" item="item" open="(" separator="or" close=")">