Merge remote-tracking branch 'origin/master'

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

@@ -153,7 +153,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
 
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         //判断是不是内转
-        if(orderType == 11 || orderType == 15 || orderType == 16){
+        if(orderType == 11 || orderType == 15 || orderType == 16 || orderType == 25){
             //如果是内转新增卸货实绩
             Integer sqe = utilsMapper.getLineSequenceByOrderNumber((String) map.get("orderNumber"));
             sqe = sqe == null ? 1 : sqe +1;
@@ -165,7 +165,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             //更新路段顺序号
             //内转只要是卸货都直接关闭订单 事务跨服务更改同表同一行数据 不能调用 会锁行
             //如果没有净重更新路段顺序号需要继续回皮 有就结束订单
-            if(netWeight == 0){
+            if(netWeight == 0 && orderType != 25){
                 mesMap.put("orderLineSequence",sqe);
                 utilsService.updateOrderLineSqeByOrderNumber(mesMap);
             }else {
@@ -177,7 +177,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
             Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
             String remark =(String) remarkMap.get("remark");
-            if (remark.contains("计时")){
+            if (remark.contains("计时") && orderType != 25){
                  map.put("inwardTypes",3);
                  tmstruckTimeTaskResultService.addTimeTaskResult(map);
             }