feat:增加运单中止行车日志

src/main/java/com/aoyang/tms/controller/vo/TruckOrderManageVO.java

@@ -26,7 +26,7 @@ public class TruckOrderManageVO implements Serializable {
     private Integer tmsStatus;
 
     @ApiModelProperty(value = "物流公司id")
-    private Long orgId;
+    private String orgId;
 
     @ApiModelProperty(value = "物流公司名")
     private String orgName;
@@ -59,10 +59,10 @@ public class TruckOrderManageVO implements Serializable {
      * 执行中运单
      */
     @ApiModelProperty(value = "运单id")
-    private Long orderId;
+    private String orderId;
 
     @ApiModelProperty(value = "行程周期id")
-    private Long cycleId;
+    private String cycleId;
 
     @ApiModelProperty(value = "运单状态：0-待执行 1-前往 2-等待 3-成果报备 4-已完成 5-已关闭")
     private Integer orderStatus;

src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

@@ -207,7 +207,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         IPage<TruckOrderManageVO> truckOrderRecords = truckMapper.listTmsManageTruck(page, pageParam.getParam());
         List<TruckOrderManageVO> truckOrderList = truckOrderRecords.getRecords();
         for (TruckOrderManageVO vo : truckOrderList) {
-            LocationVO location = commonService.getLocation(vo.getTruckId());
+            LocationVO location = commonService.getLocation(Long.valueOf(vo.getTruckId()));
             if (location != null) {
                 vo.setLatitude(location.getLatitude());
                 vo.setLongitude(location.getLongitude());
@@ -215,7 +215,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             }
             if (vo.getOrderId() != null) {
                 // 设置已读未读信息
-                List<TruckDriver> truckDrivers = truckDriverService.findTruckDrivers(vo.getTruckId());
+                List<TruckDriver> truckDrivers = truckDriverService.findTruckDrivers(Long.valueOf(vo.getTruckId()));
                 List<ReadInfo> readInfos = new ArrayList<>();
                 for (TruckDriver driver : truckDrivers) {
                     QueryWrapper queryWrapper = new QueryWrapper<>();

src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -242,7 +242,17 @@ public class WorkerServiceImpl implements WorkerService {
 
                 //3.更新行车周期中的净重
                 WorkCycle workCycle = workCycleService.getById(workOrder.getCycleId());
-                workCycle.setJingWeight(Integer.valueOf(workOrderParam.getJingWeight()));
+                int jingWeight = workCycle.getJingWeight();
+                if (workOrder.getType() == 1) {
+                    jingWeight = jingWeight + Integer.valueOf(workOrderParam.getJingWeight());
+                } else {
+                    jingWeight = jingWeight - Integer.valueOf(workOrderParam.getJingWeight());
+                    // 卸车后磅单 装车净重 与 累计 卸车净重 之差 在 ± 1000 kg 以内，则由 重车 变为 空车；
+                    if (jingWeight < 10000) {
+                        jingWeight = 0;
+                    }
+                }
+                workCycle.setJingWeight(jingWeight);
                 workCycleService.updateById(workCycle);
 
                 //3.并记行车日志