|
@@ -293,14 +293,22 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
|
i += updateLeaveResultByPDA(map);
|
|
|
|
|
|
i += utilsService.updateOrderLineSequence(map);
|
|
|
+
|
|
|
+ Boolean isArrivalFlag = isArrivalType(""+orderType);
|
|
|
+
|
|
|
+ String isSelfMention = tmstruckLeaveFactoryResultMapper.getIsSelfMention(orderId);
|
|
|
+ if(!isArrivalFlag || "是".equals(isSelfMention)){
|
|
|
+
|
|
|
+ i += utilsService.closeOrderNormally(map);
|
|
|
+ }
|
|
|
+ if(isArrivalFlag){
|
|
|
+
|
|
|
+ utilsMapper.updateArrival(map);
|
|
|
+ }
|
|
|
switch (orderType){
|
|
|
case 1:
|
|
|
-
|
|
|
- String isSelfMention = tmstruckLeaveFactoryResultMapper.getIsSelfMention(orderId);
|
|
|
try {
|
|
|
if(isSelfMention != null && isSelfMention.equals("是")) {
|
|
|
-
|
|
|
- i += utilsService.closeOrderSteel(map);
|
|
|
break;
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
@@ -394,7 +402,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
|
if(driverConfirmation == null){
|
|
|
throw new Exception("请提醒司机确认订单!");
|
|
|
}
|
|
|
- i += utilsService.closeOrderNormally(map);
|
|
|
+
|
|
|
|
|
|
Map<String,Object> mapValue = omsFeign.getSaleAllMessages(orderId.intValue());
|
|
|
Object closeStatus = mapValue.get("closeStatus");
|
|
@@ -408,14 +416,14 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
|
}
|
|
|
break;
|
|
|
case 4:
|
|
|
- i += utilsService.closeOrderNormally(map);
|
|
|
+
|
|
|
break;
|
|
|
case 5:
|
|
|
case 6:
|
|
|
case 7:
|
|
|
case 8:
|
|
|
|
|
|
- i += utilsService.closeOrderNormally(map);
|
|
|
+
|
|
|
|
|
|
Integer isMoreTripsStatus = tmstruckLeaveFactoryResultMapper.getIsMoreTripsStatus(DataChange.dataToBigDecimal(map.get("orderId")));
|
|
|
if(isMoreTripsStatus != null && isMoreTripsStatus == 1){
|
|
@@ -427,13 +435,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
|
case 17:
|
|
|
case 18:
|
|
|
|
|
|
- i += utilsService.closeOrderNormally(map);
|
|
|
+
|
|
|
break;
|
|
|
case 10:
|
|
|
case 20:
|
|
|
|
|
|
|
|
|
- i += utilsService.closeOrderNormally(map);
|
|
|
+
|
|
|
|
|
|
Integer orderStatus = tmstruckLeaveFactoryResultMapper.getOrderStatus(orderId);
|
|
|
if(orderStatus == 2){
|
|
@@ -452,7 +460,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
|
break;
|
|
|
case 23:
|
|
|
case 24:
|
|
|
- i += utilsService.closeOrderNormally(map);
|
|
|
+
|
|
|
omsFeign.addPurInwardOrder(orderId);
|
|
|
try {
|
|
|
bmsTruckFeign.addInwardDetailsOrder(map);
|
|
@@ -465,7 +473,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
|
case 19:
|
|
|
case 14:
|
|
|
|
|
|
- i += utilsService.closeOrderNormally(map);
|
|
|
+
|
|
|
|
|
|
omsFeign.pushMessageToDriver(map);
|
|
|
break;
|
|
@@ -794,4 +802,26 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ * 校验是否允许抵达
|
|
|
+ * @param orderType
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ Boolean isArrivalType(String orderType){
|
|
|
+ try{
|
|
|
+ String[] arr = tmstruckLeaveFactoryResultMapper.getVersionValue(10).split(",");
|
|
|
+ if(arr==null || arr.length<=0){
|
|
|
+ throw new Exception("数据库数据异常,类型字符串不存在!");
|
|
|
+ }
|
|
|
+ for(String temp:arr){
|
|
|
+ if(temp.equals(orderType)){
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }catch (Exception e){
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }
|
|
|
}
|