tian

src/main/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -274,9 +274,16 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         return success(omstruckOrderSeparateService.getAllLoadUnloadResult(map));
     }
 
+
     @ApiOperation(value = "根据订单ID查询订单子表物资信息")
     @PostMapping("/getOrderMaterial/{orderId}")
-    public RESTfulResult getOrderMaterial(@PathVariable("orderId")Integer orderId){
+    public RESTfulResult getOrderMaterial(@PathVariable("orderId")Integer orderId) {
         return success(omstruckOrderSeparateService.getOrderMaterial(orderId));
     }
+
+    @ApiOperation(value = "查看所有实绩点")
+    @PostMapping("/getAllResultLineMes")
+    public RESTfulResult getAllResultLineMes(Integer orderId){
+        return success(omstruckOrderSeparateService.getAllOrderResult(new BigDecimal(orderId)));
+    }
 }

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.java

@@ -108,4 +108,22 @@ public interface OmstruckOrderSeparateMapper {
 
     Integer getOrderPlanEnable(Object orderId);
 
+    //通过总实绩ID查询进厂实绩数据
+    List<Map<String, Object>> getAllEnFactoryResultMesByTotalId(Integer resultTotalId);
+
+    //通过总实绩ID查询出厂实绩数据
+    List<Map<String, Object>> getAllOutFactoryResultMesByTotalId(Integer resultTotalId);
+
+      //通过总实绩ID查询装车实绩数据
+    List<Map<String, Object>> getAllLoadResultMesByTotalId(Integer resultTotalId);
+
+      //通过总实绩ID查询卸车实绩数据
+    List<Map<String, Object>> getAllUnloadResultMesByTotalId(Integer resultTotalId);
+
+     //通过总实绩ID查询计毛实绩数据
+    List<Map<String, Object>> getAllMaoWeightResultMesByTotalId(Integer resultTotalId);
+
+     //通过总实绩ID查询计毛实绩数据
+    List<Map<String, Object>> getAllPiWeightResultMesByTotalId(Integer resultTotalId);
+
 }

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

@@ -271,6 +271,39 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         return segmentList;
     }
 
+    /**
+     * 查询运输进程，通过实绩ID
+     * @Author TXF
+     * @Date 2022/2/18 16:46
+     * @param orderId
+     * @return
+     **/
+    public List<Map<String, Object>> getAllOrderResult(BigDecimal orderId){
+        //通过订单Id查询总实绩Id
+        Integer resultTotalId = omstruckOrderSeparateMapper.getTotalIdByOrderId(orderId);
+        //通过总实绩ID查询所有的实绩：包括进厂、出厂、计重、装卸货
+        List<Map<String, Object>> allMesList = new ArrayList<>(20);
+        allMesList.addAll(omstruckOrderSeparateMapper.getAllEnFactoryResultMesByTotalId(resultTotalId));
+        allMesList.addAll(omstruckOrderSeparateMapper.getAllOutFactoryResultMesByTotalId(resultTotalId));
+        allMesList.addAll(omstruckOrderSeparateMapper.getAllLoadResultMesByTotalId(resultTotalId));
+        allMesList.addAll(omstruckOrderSeparateMapper.getAllUnloadResultMesByTotalId(resultTotalId));
+        allMesList.addAll(omstruckOrderSeparateMapper.getAllMaoWeightResultMesByTotalId(resultTotalId));
+        allMesList.addAll(omstruckOrderSeparateMapper.getAllPiWeightResultMesByTotalId(resultTotalId));
+        //对列表中数据路段顺序号进行排序
+        allMesList.sort(new Comparator<Map<String, Object>>() {
+            @Override
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                BigDecimal segmenSqe1 = DataChange.dataToBigDecimal(o1.get("segmenSqe"));
+                BigDecimal segmenSqe2 = DataChange.dataToBigDecimal(o2.get("segmenSqe"));
+                return segmenSqe1.compareTo(segmenSqe2);
+            }
+        });
+        for (Map<String, Object> objectMap : allMesList) {
+            System.out.println(objectMap);
+        }
+        return allMesList;
+    }
+
     /**
      * 通过运输订单号查询实绩位置
      * @param orderNumber

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

@@ -1950,6 +1950,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     mesMap.put("organizationCode","二厂");
                 }
                 break;
+            case 11:
+                mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
+                mesMap.put("shipperName","四川省达州钢铁集团有限责任公司");
+                mesMap.put("consigneeCompanyName","四川省达州钢铁集团有限责任公司");
+                break;
             case 12:
             case 13:
             case 15:

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

@@ -632,4 +632,104 @@
 	    ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
         WHERE	OO.ORDER_ID = #{orderId}
     </select>
+
+    <select id="getAllEnFactoryResultMesByTotalId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+            select TER.SEGMEN_SQE             "segmenSqe",
+            TER.RESULT_ENTRY_GATE_TIME "pointDate",
+            RG.GATEPOST_NAME           "pointName",
+            '进厂'                     "linkName"
+            from TMSTRUCK_ENFACTORY_RESULT TER
+            left join RMS_GATEPOST RG
+            on RG.GATEPOST_ID = TER.GATEPOST_ID
+            where TER.RESULT_TOTAL_ID = #{resultTotalId}
+            )
+        where "pointDate" is not null
+    </select>
+
+    <select id="getAllOutFactoryResultMesByTotalId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select TLFR.SEGMENT_SQE             "segmenSqe",
+                        TLFR.RESULT_OUT_GATE_TIME "pointDate",
+                        RG.GATEPOST_NAME           "pointName",
+                        '出厂'                     "linkName"
+                 from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                          left join RMS_GATEPOST RG
+                                    on RG.GATEPOST_ID = TLFR.GATEPOST_ID
+                 where TLFR.RESULT_TOTAL_ID = #{resultTotalId}
+             )
+        where "pointDate" is not null
+    </select>
+
+    <select id="getAllLoadResultMesByTotalId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select TLR.SEGMENT_SQE "segmenSqe",
+                        TLR.RESULT_LOAD_END_TIME "pointDate",
+                        RW.WAREHOUSE_NAME   "pointName",
+                        RM.MATERIAL_NAME    "materialName",
+                        '装货'                "linkName"
+                 from TMSTRUCK_LOAD_RESULT TLR
+                    left join RMS_WAREHOUSE RW on TLR.LOADING_ID = RW.WAREHOUSE_ID
+                    left join RMS_MATERIAL RM on TLR.MATERIAL_ID = RM.MATERIAL_ID
+                 where TLR.RESULT_TOTAL_ID = #{resultTotalId}
+             )
+        where "pointDate" is not null
+    </select>
+
+    <select id="getAllUnloadResultMesByTotalId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select TUR.SEGMENT_SQE "segmenSqe",
+                        TUR.RESULT_END_TIME "pointDate",
+                        RW.WAREHOUSE_NAME   "pointName",
+                        RM.MATERIAL_NAME    "materialName",
+                        '卸货'            "linkName"
+                 from TMSTRUCK_UNLOAD_RESULT TUR
+                          left join RMS_WAREHOUSE RW on TUR.RESULT_UNLOAD_PLACE_ID = RW.WAREHOUSE_ID
+                          left join RMS_MATERIAL RM on TUR.MATERIAL_ID = RM.MATERIAL_ID
+                 where TUR.RESULT_TOTAL_ID = #{resultTotalId}
+             )
+        where "pointDate" is not null
+    </select>
+
+    <select id="getAllMaoWeightResultMesByTotalId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select TWR.GROSS_SEGMENT_SQE "segmenSqe",
+                        TWR.RESULT_GROSS_WEIGHT_TIME "pointDate",
+                        RTC.TRUCK_CALCULATE_NUMBER   "pointName",
+                        TWR.RESULT_GROSS_WEIGHT     "weight",
+                        TWR.RESULT_NET_WEIGHT        "netWeight",
+                        RM.MATERIAL_NAME            "materialName",
+                        '计量'                      "linkName"
+                 from TMSTRUCK_WEIGHT_RESULT TWR
+                          left join RMS_TRUCK_CALCULATE RTC on TWR.RESULT_GROSS_PLACE_ID = RTC.TRUCK_CALCULATE_ID
+                          left join RMS_MATERIAL RM on TWR.MATERIAL_ID = RM.MATERIAL_ID
+                 where TWR.RESULT_TOTAL_ID = #{resultTotalId}
+             )
+        where "pointDate" is not null
+    </select>
+
+    <select id="getAllPiWeightResultMesByTotalId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select TWR.TARE_SEGMENT_SQE "segmenSqe",
+                        TWR.RESULT_TARE_WEIGHT_TIME "pointDate",
+                        RTC.TRUCK_CALCULATE_NUMBER   "pointName",
+                        TWR.RESULT_TARE_WEIGHT     "weight",
+                        TWR.RESULT_NET_WEIGHT        "netWeight",
+                        RM.MATERIAL_NAME            "materialName",
+                        '计量'                      "linkName"
+                 from TMSTRUCK_WEIGHT_RESULT TWR
+                          left join RMS_TRUCK_CALCULATE RTC on TWR.RESULT_TARE_PLACE_ID = RTC.TRUCK_CALCULATE_ID
+                          left join RMS_MATERIAL RM on TWR.MATERIAL_ID = RM.MATERIAL_ID
+                 where TWR.RESULT_TOTAL_ID = #{resultTotalId}
+             )
+        where "pointDate" is not null
+    </select>
+
+
 </mapper>