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