ads

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

@@ -154,7 +154,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         //通过订单号查询订单类型 及总实绩Id
         Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
         String capacityNumber = (String) mesMap.get("capacityNumber");
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
+        BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
         Integer orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         if(orderType == 11){
             //内转订单类型  没有生成实绩 直接新增

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

@@ -162,24 +162,26 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     public int leaveFactoryByPDA(Map<String, Object> map) throws Exception{
         int i = 0;
         String orderNumber = (String) map.get("orderNumber");
-        String substring = orderNumber.substring(0, orderNumber.length() - 1);
-        Map<String, Object> selectMap = tmstruckLeaveFactoryResultMapper.selectResultId(substring);
-        BigDecimal orderType = DataChange.dataToBigDecimal(selectMap.get("orderTypee"));
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(selectMap.get("resultTotalId"));
-        if(orderType.intValue() == 11){
+        orderNumber = orderNumber.substring(0, orderNumber.length() - 1);
+        //通过订单号查询订单类型 及总实绩Id
+        Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
+        Integer orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
+        String capacityNumber = (String) mesMap.get("capacityNumber");
+        if(orderType == 11){
             //内转订单类型 没有生成实绩 直接新增
-            Integer sqe = utilsMapper.getLineSequenceByOrderNumber(substring);
-            sqe = sqe == null ? 1 : sqe + 1;
+            Integer sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
+            sqe = sqe + 1;
             map.put("resultId",tmstruckLeaveFactoryResultMapper.selectMaxId());//出厂实绩ID
             map.put("Sqe",sqe);//查询路段顺序号+1
-            map.put(("totalId"),resultTotalId);
+            map.put(("totalId"),mesMap.get("totalId"));
             i += tmstruckLeaveFactoryResultMapper.insertSelective(generateLeaveFactory(map));
             //更新路段顺序号
-            selectMap.put("orderLineSequence",sqe);
-            i += utilsService.updateOrderLineSqeByOrderNumber(selectMap);
-            utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "出厂");
+            mesMap.put("orderLineSequence",sqe);
+            i += utilsService.updateOrderLineSqeByOrderNumber(mesMap);
+            utilsService.pushMesToWebsocket(capacityNumber, "出厂");
             return i;
         }
+        Map<String, Object> selectMap = tmstruckLeaveFactoryResultMapper.selectResultId(orderNumber);
         if(selectMap == null){
             throw new Exception("该车已出厂！！");
         }else{
@@ -191,12 +193,12 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             }
         }
         map.putAll(selectMap);
-        map.put("orderNumber", substring);
+        map.put("orderNumber", orderNumber);
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         i += updateLeaveResultByPDA(map); //更新出厂实绩
         //更新路段顺序号
         i += utilsService.updateOrderLineSequence(map);
-        switch (orderType.intValue()){
+        switch (orderType){
             case 1:
                 break;
             case 2:
@@ -295,7 +297,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             tmstruckLeaveFactoryResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("Sqe")));
         }
         if(map.get("totalId") !=null){
-            tmstruckLeaveFactoryResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("totalId")));
+            tmstruckLeaveFactoryResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("totalId")));
         }
         return tmstruckLeaveFactoryResult;
     }

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

@@ -594,7 +594,6 @@
                         OO.ORDER_TYPE       "orderTypee",
                         TTR.RESULT_TOTAL_ID "resultTotalId",
                         OO.CAPACITY_ID      "capacityId",
-                        RC.CAPACITY_NUMBER  "capacityNumber",
                         TLFR.SEGMENT_SQE    "segmentSqe",
                         OO.ORDER_LINE_SEQUENCE      "orderSegmentSqe",
                         OO.PRICE_ID             "priceId"
@@ -603,8 +602,6 @@
                                     on OO.ORDER_ID = TTR.ORDER_ID
                           left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
                                     on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                          left join RMS_CAPACITY RC
-                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
                  where OO.ORDER_NUMBER = #{orderNumber} and TLFR.RESULT_OUT_GATE_TIME is null
                  order by TLFR.SEGMENT_SQE
              )