Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

6 天以前 ca412ade3b178fbc8ba0a4b6215a040acdede954

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsCarKeyDispatchServiceImpl.java

@@ -1,9 +1,13 @@
package com.ruoyi.tms.service.impl;

import java.util.Date;
import java.util.List;

import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;

import com.ruoyi.common.utils.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
import org.springframework.scheduling.annotation.Async;
@@ -179,4 +183,30 @@
    {
        return tmsCarKeyDispatchMapper.deleteTmsCarKeyDispatchById(id);
    }

    @Override
    public TmsCarKeyDispatch selectTmsCarKeyDispatchdriverMobile(String driverCode) {
        return tmsCarKeyDispatchMapper.selectTmsCarKeyDispatchdriverMobile(driverCode);
    }
    @Override
    public AjaxResult takeReview(TmsCarKeyDispatch tmsCarKeyDispatch) {
        if (tmsCarKeyDispatch == null) {
            return AjaxResult.error("查无符合要求的调度单，请联系调度人员",3);
        }
        if (StringUtils.isEmpty(tmsCarKeyDispatch.getVehicleCarKeyNo())){
            return AjaxResult.error("车钥匙柜号为空，请联系调度人员",3);

        }
        tmsCarKeyDispatch.setStatus(1);
        tmsCarKeyDispatch.setCarKeyCollectionTime(new Date());
        tmsCarKeyDispatchMapper.updateTmsCarKeyDispatch(tmsCarKeyDispatch);




        AjaxResult success = new AjaxResult(0, "成功",1);
        success.put("boxNumber",tmsCarKeyDispatch.getVehicleCarKeyNo());
        logger.info("成功返回{}",success);
        return success;
    }
}