tijiao

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

@@ -435,7 +435,6 @@ public class StatisticalReportController extends BaseRESTfulController {
                                        String isPage,
                                        String index
     ){
-
         if (index!=null&&!"null".equals(index)){
             mapValue.put("index",index);
         }
@@ -454,15 +453,6 @@ public class StatisticalReportController extends BaseRESTfulController {
     }
 
 
-
-
-
-
-
-
-
-
-
     @ApiOperation(value="查询拼装车统计报表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -515,8 +505,6 @@ public class StatisticalReportController extends BaseRESTfulController {
     }
 
 
-
-
     @ApiOperation("对内转车辆装货点进行统计")
     @PostMapping("/getLoading")
     public RESTfulResult getLoading(@RequestBody(required=false) Map<String,Object> mapValue,

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

@@ -163,6 +163,8 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                 return failed("该订单没有装货作业");
             }else if (i==-5){
                 return failed("请勿重复装车");
+            }else if( i == -6){
+                return failed("请通知司机完成前序操作再来装货！");
             }else {
                 return failed("装货异常，请联系管理员！");
             }

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

@@ -96,7 +96,10 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
             return failed("已卸过此物资");
         }else if(i == -3){
             return failed("该订单没有卸货作业");
-        } else{
+        }else if( i == -6) {
+            return failed("请通知司机完成前序操作再来卸货！");
+        }
+        else{
             return failed("卸货失败，请联系管理员！");
         }
     }

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

@@ -128,4 +128,7 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
 
     //通过钢材运输订单号查询装车实绩
     Map<String, Object> getSteelLoadResult(Map<String, Object> map);
+
+    Map<String, Object> getLoadResultMap(BigDecimal resultTotalId);
+
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.feign.*;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
+import com.steerinfo.dil.mapper.TmstruckLoadResultMapper;
 import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
@@ -39,6 +40,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     @Autowired
     private TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
 
+    @Autowired
+    private TmstruckLoadResultMapper tmstruckLoadResultMapper;
+
     @Autowired
     private UtilsServiceImpl utilsService;
 
@@ -191,6 +195,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 throw  new Exception("该车作业环节未全部完成！");
             }
         }
+        if(orderType == 2){
+            //根据总实绩ID查询该车有没有装货
+            Map<String,Object> loadResultMap = tmstruckLoadResultMapper.getLoadResultMap(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+            if(loadResultMap == null || loadResultMap.get("loadEndTime") == null){
+                throw new Exception("该车未扫装货，请提醒司机去扫装货");
+            }
+        }
         map.putAll(mesMap);
         map.putAll(selectMap);
         map.remove("Sqe");

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

@@ -67,6 +67,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     @Autowired
     private  TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
+    @Autowired
+    private TmstruckUnloadResultMapper tmstruckUnloadResultMapper;
 
     /**
      * 生成销售装车实绩（虚拟装车实绩）
@@ -203,6 +205,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         String capacityNumber = (String) mesMap.get("capacityNumber");
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
+        //装货时查询是否含有净重
+        Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(resultTotalId);
         if(orderType == 11 || orderType == 15 || orderType == 16){
             int sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
             sqe = sqe + 1;
@@ -245,6 +249,13 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         if(dataMap == null){
             return -3; //该订单没有装车作业
         }
+        //获取该实绩的路段顺序号
+        BigDecimal segmentSqe = DataChange.dataToBigDecimal(dataMap.get("segmentSqe"));
+        //获取订单的路段顺序号
+        BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(mesMap.get("orderSegmentSqe"));
+        if(segmentSqe.intValue() > (orderSegmentSqe.intValue() + 1)){
+            return -6;
+        }
         //查询装车实绩ID
         map.putAll(dataMap);
         tmstruckLoadResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
@@ -269,8 +280,13 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         }
         // 更新装货点
         tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("warehouseId")));
-        //更新路段顺序号
-        utilsService.updateOrderLineSequence(map);
+        if(netWeight == 0){ //如果没有净重 则更新路段顺序号  有则不更新
+            //路段顺序号 + 1
+            map.put("orderId", mesMap.get("orderId"));
+            utilsService.updateOrderLineSequence(map);
+        }
+        ////更新路段顺序号
+        //utilsService.updateOrderLineSequence(map);
         //判断是否为未装货
         if (map.get("insertUpdateRemark")!=null) {
             String insertUpdateRemark = (String) map.get("insertUpdateRemark");

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

@@ -193,6 +193,13 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         if(dataMap == null){
             return -3;  //该订单没有卸货作业
         }
+        //获取该实绩的路段顺序号
+        BigDecimal segmentSqe = DataChange.dataToBigDecimal(dataMap.get("segmentSqe"));
+        //获取订单的路段顺序号
+        BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(mesMap.get("orderSegmentSqe"));
+        if(segmentSqe.intValue() > (orderSegmentSqe.intValue() + 1)){
+            return -6;
+        }
         map.putAll(dataMap);
         updateUnloadResultBy(map); //更新卸货实绩
         if(netWeight == 0 || (netWeight == 1 && (orderType == 10 || orderType == 20))){ //如果没有净重 则更新路段顺序号  有则不更新

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

@@ -1764,7 +1764,6 @@
                TWR.RESULT_NET_WEIGHT "resultNetWeight",
                RL.LINE_NAME "lineName",
                RC3.CARRIER_NAME "carrierName"
-
         from OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OO.ORDER_ID=OOM.ORDER_ID

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

@@ -1762,5 +1762,9 @@
          )
     WHERE ROWNUM = 1
   </select>
+  <select id="getLoadResultMap" resultType="java.util.Map" parameterType="decimal">
+    select TLR.RESULT_LOAD_END_TIME "loadEndTime" from TMSTRUCK_LOAD_RESULT TLR
+    WHERE TLR.RESULT_TOTAL_ID = #{resultTotalId}
+  </select>
 
 </mapper>