进口矿

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

@@ -217,7 +217,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 break;
             case 6:
             case 7:
-//            case 8:
+            case 8:
 //            case 9:
             case 10:
             case 17:

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

@@ -226,6 +226,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 5:
             case 6:
             case 7:
+            case 8:
                 //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
                 i += utilsService.closeOrderNormally(map);
                 //查询是否为一车多趟采购订单类型
@@ -235,20 +236,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                     omsFeign.addNewTransportOrder(orderId.intValue());
                 }
                 break;
-            case 8:
             case 9:
             case 17:
             case 18:
                 //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
                 i += utilsService.closeOrderNormally(map);
-//                i += utilsService.updateCapacityStatus(map, 0); //修改运力状态 0：空闲中
-                //采购出厂 通过feign调用新增详单
-//                try {
-//                    bmsShipFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("resultId"))); // 出厂实绩Id
-//                    bmsTruckFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("orderId")));  // 运单ID
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
                 break;
             case 10:
             case 20:

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

@@ -327,10 +327,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         if(measureCommission != null)
             map.put("materialId", measureCommission.get("materialId"));
         addMeasureCommission(map); // 添加计量委托
-
         /*访问接口发送数据*/
         return sendMesToMeasure(measureCommission);
-
     }
 
 
@@ -560,7 +558,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     @Override
     synchronized public Map<String, Object> sendLiuPiMeasureCommission(String capacityNumber) throws InterruptedException {
         Map<String, Object> map = new HashMap<>();
-        String num = "LP" + System.currentTimeMillis();
+        String num = "DZGTZDLP" + System.currentTimeMillis();
         map.put("carNumber", capacityNumber);
         map.put("purchOrder", num);
         //通过车牌号查询上一次委托发送数据

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

@@ -172,14 +172,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         //路段顺序号 + 1
         i += utilsService.updateOrderLineSequence(map);
         switch (orderType.intValue()){
-            case 1:
-                break;
-            case 2:
-                break;
-            case 3:
-                break;
-            case 4:
-                break;
             case 5:
             case 6:
             case 7:
@@ -192,10 +184,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 20:
                 i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
                 break;
-            case 12:
-                //判断是否还有物资，如果还有物资就执行发送计量委托
-//                materialIdIsNorWeight(map);
-                break;
         }
         //卸货成功后推送消息给websocket
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");