bug修改完成

ZY

2024-09-24 e2d71a5f83e70e0d419a3b793f9fd51de72b9fe1

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.WaitPakin;
import com.zy.asrs.common.wms.entity.WaitPakinLog;
import com.zy.asrs.common.wms.service.WaitPakinLogService;
import com.zy.asrs.framework.annotations.ManagerAuth;
@@ -37,14 +38,18 @@
                  @RequestParam(required = false) String timeRange,
                  @RequestParam Map<String, Object> param) {
        LambdaQueryWrapper<WaitPakinLog> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(WaitPakinLog::getId, condition);
        }
        wrapper.eq(WaitPakinLog::getHostId, getHostId());
        if (!Cools.isEmpty(timeRange)) {
            String[] range = timeRange.split(RANGE_TIME_LINK);
            wrapper.ge(WaitPakinLog::getAppeTime, DateUtils.convert(range[0]));
            wrapper.le(WaitPakinLog::getAppeTime, DateUtils.convert(range[1]));
        }
        if (!Cools.isEmpty(param.get("zpallet"))) {
            wrapper.like(WaitPakinLog::getZpallet, param.get("zpallet"));
        }
        if (!Cools.isEmpty(param.get("matnr"))) {
            wrapper.like(WaitPakinLog::getMatnr, param.get("matnr"));
        }
        return R.ok(waitPakinLogService.page(new Page<>(curr, limit), wrapper));
    }