结束运单更新周期的净重

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

@@ -2,6 +2,7 @@ package com.aoyang.tms.service.impl;
 
 import com.aoyang.tms.common.TmsTruckStatus;
 import com.aoyang.tms.common.WorkOrderEnum;
+import com.aoyang.tms.controller.vo.WorkCycleVO;
 import com.aoyang.tms.entity.Truck;
 import com.aoyang.tms.entity.TruckCheckInfo;
 import com.aoyang.tms.entity.WorkCycle;
@@ -84,7 +85,7 @@ public class WorkerServiceImpl implements WorkerService {
                 truck.setTmsStatus(TmsTruckStatus.WORKING);
                 truckService.updateById(truck);
                 //2.插入车辆检查数据
-                BeanUtils.copyProperties(workOrder,truckCheckInfo);
+                BeanUtils.copyProperties(workOrder, truckCheckInfo);
                 truckCheckInfo.setCreater(userId);
                 truckCheckInfo.setCreaterName(userName);
                 truckCheckInfo.setCreateDate(LocalDateTime.now());
@@ -144,12 +145,6 @@ public class WorkerServiceImpl implements WorkerService {
                 Truck truck = truckService.getById(workOrder.getTruckId());
                 truck.setTmsStatus(TmsTruckStatus.WORKING);
                 truckService.updateById(truck);
-                //2.创建行程周期
-                WorkCycle workCycle = new WorkCycle();
-                BeanUtils.copyProperties(truck, workCycle);
-                BeanUtils.copyProperties(workOrder, workCycle);
-                workCycleService.save(workCycle);
-
                 if (workOrder.getType() == 1) {
                     //3.订单进入前往装车点状态，
                     workOrder.setOrderStatus(WorkOrderEnum.ZHUANGCHE_RESULT_SUBMIT.orderStatus());
@@ -180,17 +175,17 @@ public class WorkerServiceImpl implements WorkerService {
                 Truck truck = truckService.getById(workOrder.getTruckId());
                 truck.setTmsStatus(TmsTruckStatus.RETURNING);
                 truckService.updateById(truck);
-                //2.创建行程周期
-                WorkCycle workCycle = new WorkCycle();
-                BeanUtils.copyProperties(truck, workCycle);
-                BeanUtils.copyProperties(workOrder, workCycle);
-                workCycleService.save(workCycle);
 
                 //2.订单完成状态
                 workOrder.setOrderStatus(WorkOrderEnum.COMPLETED.orderStatus());
                 workOrder.setCompleteTime(LocalDateTime.now());
                 workOrderService.updateById(workOrder);
 
+                //3.更新行车周期中的净重
+                WorkCycle workCycle = workCycleService.getById(workOrder.getCycleId());
+                workCycle.setJingWeight(Integer.valueOf(workOrderParam.getJingWeight()));
+                workCycleService.updateById(workCycle);
+
                 //3.并记行车日志
                 //TODO
             }

src/main/java/com/aoyang/tms/util/WriteImgUtil.java

@@ -140,7 +140,7 @@ public class WriteImgUtil {
 
     public static void main(String[] args) throws IOException {
         Map<String, CellPoint> map = new HashMap<>();
-        map.put("D:\\1.png", new CellPoint(46, 3, 47, 3));
+        map.put("D:\\1.png", new CellPoint(46, 3, 46, 5));
         addImageToExcel(new File("D:\\日志.xlsx"), 0, map);
         System.out.println("ok");
     }