出入库优化-卡回收

jiazx0107@163.com

2023-06-19 5b44d1832e93be61b034b7e531f0c954a0018d74

 igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java

@@ -5,7 +5,6 @@
import com.ld.igds.common.CoreCommonService;
import com.ld.igds.constant.BizType;
import com.ld.igds.constant.Constant;
import com.ld.igds.constant.FoodType;
import com.ld.igds.constant.RedisConst;
import com.ld.igds.data.CommonData;
import com.ld.igds.data.Page;
@@ -19,6 +18,7 @@
import com.ld.igds.inout.service.InoutService;
import com.ld.igds.io.constant.OrderRespEnum;
import com.ld.igds.models.Depot;
import com.ld.igds.models.InoutPrice;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import com.ld.igds.util.RedisUtil;
@@ -171,6 +171,8 @@

    @Override
    public String updateData(InoutData data) throws Exception {

        data.setUpdateTime(new Date());
        if (StringUtils.isEmpty(data.getCompanyId())) {
            data.setCompanyId(ContextUtil.getCompanyId());
        }
@@ -187,6 +189,29 @@
        //更新缓存
        updateInoutCache(newData);

        return null;
    }

    @Override
    public String updateDataByHandle(InoutData data) {
        data.setUpdateTime(new Date());

        if (StringUtils.isEmpty(data.getCompanyId())) {
            data.setCompanyId(ContextUtil.getCompanyId());
        }
        InoutData newData;
        if (EntityUtils.isEntity(data)) {
            newData = new InoutData();
            BeanUtils.copyProperties(data, newData, new String[]{"checkItems", "files"});
        } else {
            newData = data;
        }

        inoutMapper.updateDataByHandle(newData);

        //更新缓存
        updateInoutCache(newData);
        
        return null;
    }

@@ -662,7 +687,6 @@
                .getCode())) {



            // 创建一个子任务进行推送信息
            FutureTask<String> futureTask = new FutureTask<>(new NotifyScreenTask(curList, completeList, deptId));

@@ -764,4 +788,14 @@
        return null;
    }

    @Override
    public List<InoutPrice> getPrice(InoutCheckParam param) {
        if(null == param.getStart()){
            param.setStart(new Date());
        }
        if(null == param.getEnd()){
            param.setEnd(new Date());
        }
        return inoutCheckMapper.getPrice(param);
    }
}