更新周期净重

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -419,7 +419,7 @@ public class WorkerController {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
-        //TODO 1.车辆进入收车中状态，2.订单完成状态，3.并记行车日志
+        //1.车辆进入收车中状态，2.订单完成状态，3.并记行车日志
         Boolean flag = workerService.finishOrder(userId, utf8Name, workOrder);
         return new Result<>(flag);
     }
@@ -436,7 +436,7 @@ public class WorkerController {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
-        //TODO 1.车辆进入收车后检查状态，2.并记行车日志
+        //1.车辆进入收车后检查状态，2.并记行车日志
         Boolean flag = workerService.arriveTerminal(userId, utf8Name, workOrder);
         return new Result<>(flag);
     }
@@ -453,7 +453,7 @@ public class WorkerController {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
-        //TODO 1.车辆进入已经收车状态，3.并记行车日志，4.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
+        // 1.车辆进入已经收车状态，3.并记行车日志，4.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
         Boolean flag = workerService.finishWork(userId, utf8Name, workOrder);
         return new Result<>(flag);
     }

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

@@ -288,20 +288,23 @@ public class WorkerServiceImpl implements WorkerService {
                 Truck truck = truckService.getById(workOrder.getTruckId());
                 truck.setTmsStatus(TmsTruckStatus.DONE);
                 truckService.updateById(truck);
-                //2.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
-                WorkCycle workCycle = workCycleService.findCurrentWorkCycle(workOrder.getTruckId());
-                workCycle.setEndTime(LocalDateTime.now());
-                BeanUtils.copyProperties(truck, workCycle);
-                BeanUtils.copyProperties(workOrder, workCycle);
-                workCycleService.updateById(workCycle);
-
+                //2.上传订单信息
                 workOrder.setWeightingListNo(workOrderParam.getWeightingListNo());
                 workOrder.setWeightingListUrl(workOrderParam.getWeightingListUrl());
                 workOrder.setPiWeight(workOrderParam.getPiWeight());
                 workOrder.setMaoWeight(workOrderParam.getMaoWeight());
                 workOrder.setJingWeight(workOrderParam.getJingWeight());
                 workOrderService.updateById(workOrder);
-                //3 记录日志
+
+                //3.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
+                WorkCycle workCycle = workCycleService.findCurrentWorkCycle(workOrder.getTruckId());
+                workCycle.setEndTime(LocalDateTime.now());
+                BeanUtils.copyProperties(truck, workCycle);
+                BeanUtils.copyProperties(workOrder, workCycle);
+                workCycle.setJingWeight(Integer.valueOf(workOrderParam.getJingWeight()));
+                workCycleService.updateById(workCycle);
+
+                //4 记录日志
                 workLogService.logWorkCycleInfo(WorkLogTypeEnum.CLOSED, workOrder);
             }
         } catch (Exception e) {