guoyong hace 4 años
padre
commit
334ce5e838

+ 2 - 2
src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -49,7 +49,7 @@ public class WorkerServiceImpl implements WorkerService {
         WorkOrder workOrder = workOrderService.getById(workOrderParam.getId());
         Truck truck = truckService.getById(workOrder.getTruckId());
         WorkCycle workCycleOld = workCycleService.getOne(
-                new QueryWrapper<WorkCycle>().eq("truck_id", workOrder.getTruckId()).eq("status", 1));
+                new QueryWrapper<WorkCycle>().eq("truck_id", workOrder.getTruckId()).eq("status", 1).last("limit 1"));
         Boolean zhongFlag = workCycleOld == null ? false : workCycleOld.getJingWeight() > 0;
         if (workOrder.getType() == 1) {
             if (zhongFlag) {
@@ -365,7 +365,7 @@ public class WorkerServiceImpl implements WorkerService {
                     //已收车
                     truck.setTmsStatus(TmsTruckStatus.DONE);
                     truckService.updateById(truck);
-                }else{
+                } else {
                     truck.setTmsStatus(TmsTruckStatus.PRE_CHECK);
                     truckService.updateById(truck);
                 }