登记、化验、称重页面调整，及登记化验数据提交

czt

2025-12-03 53fab3f56e8335fbf39fc07c4e10f6abdb0505bb

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java

@@ -8,6 +8,7 @@
import com.fzzy.igds.domain.InoutRecord;
import com.fzzy.igds.mapper.InoutRecordMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
@@ -37,21 +38,58 @@
     * @param param
     */
    public void listPageInout(Page<InoutRecord> page, InoutParam param) {
        QueryWrapper<InoutRecord> queryWrapper = getQueryWrapper(param);
        inoutRecordMapper.selectPage(page, queryWrapper);
    }

    /**
     * 查询数据集合
     * @param param
     */
    public List<InoutRecord> listInout(InoutParam param) {
        QueryWrapper<InoutRecord> queryWrapper = getQueryWrapper(param);
        return inoutRecordMapper.selectList(queryWrapper);
    }

    /**
     * 封装查询条件
     * @param param
     */
    public QueryWrapper<InoutRecord> getQueryWrapper(InoutParam param) {
        QueryWrapper<InoutRecord> queryWrapper = new QueryWrapper<>();

        param.setCompanyId(ContextUtil.getCompanyId());
        param.setDeptId(ContextUtil.subDeptId(null));
        queryWrapper.eq("company_id", param.getCompanyId());
        queryWrapper.eq("dept_id", param.getDeptId());

        if (StringUtils.isNotBlank(param.getCustomerName())) {
            queryWrapper.like("customer_name", param.getCustomerName());
        }
        if (StringUtils.isNotBlank(param.getWeightTag())) {
            queryWrapper.likeRight("progress", param.getWeightTag());
        }
        if (StringUtils.isNotBlank(param.getFoodVariety())) {
            queryWrapper.eq("food_variety", param.getFoodVariety());
        }
        if (StringUtils.isNotBlank(param.getCheckStatus())) {
            queryWrapper.eq("check_status", param.getCheckStatus());
        }
        if (StringUtils.isNotBlank(param.getDepotId())) {
            queryWrapper.eq("depot_id", param.getDepotId());
        }
        if (StringUtils.isNotBlank(param.getType())) {
            queryWrapper.eq("type", param.getType());
        }
        if (null != param.getStart()) {
            queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
        }
        if (null != param.getEnd()) {
            queryWrapper.le("create_time", DateUtil.getNextZero(param.getEnd()));
        }
        queryWrapper.eq("record_status", "NORMAL"); //正常状态的单子
        queryWrapper.orderByDesc("create_time");
        inoutRecordMapper.selectPage(page, queryWrapper);

        return queryWrapper;
    }