完善订单组托可用数据显示功能

zwl

2025-09-12 7e10622ead5bd8b3ce0c9fda39d22ae0e938e030

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

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.WrkDetl;
import com.zy.asrs.common.wms.entity.WrkDetlLog;
@@ -37,20 +38,33 @@
                  @RequestParam(required = false) String condition,
                  @RequestParam(required = false) String timeRange,
                  @RequestParam Map<String, Object> param) {
        LambdaQueryWrapper<WrkDetlLog> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(WrkDetlLog::getHostId, getHostId());
        if (!Cools.isEmpty(condition)) {
            wrapper.like(WrkDetlLog::getId, condition);
        }
        QueryWrapper<WrkDetlLog> wrapper = new QueryWrapper<>();
        wrapper.eq("host_id", getHostId());
//        if (!Cools.isEmpty(condition)) {
//            wrapper.like(WrkDetl::getId, condition);
//        }
        if (!Cools.isEmpty(timeRange)) {
            String[] range = timeRange.split(RANGE_TIME_LINK);
            wrapper.ge(WrkDetlLog::getAppeTime, DateUtils.convert(range[0]));
            wrapper.le(WrkDetlLog::getAppeTime, DateUtils.convert(range[1]));
            wrapper.ge("io_time", DateUtils.convert(range[0]));
            wrapper.le("io_time", DateUtils.convert(range[1]));
        }
        if (!Cools.isEmpty(param.get("wrk_mast_id"))) {
            wrapper.eq(WrkDetlLog::getWrkMastId, param.get("wrk_mast_id"));
            wrapper.eq("wrk_mast_id", param.get("wrk_mast_id"));
        }
        wrapper.orderByDesc(WrkDetlLog::getId);
        if (!Cools.isEmpty(param.get("matnr"))) {
            wrapper.like("matnr", param.get("matnr"));
        }
        if (!Cools.isEmpty(param.get("maktx"))) {
            wrapper.like("maktx", param.get("maktx"));
        }
        if (!Cools.isEmpty(param.get("zpallet"))) {
            wrapper.like("zpallet", param.get("zpallet"));
        }
        if (!Cools.isEmpty(param.get("orderNo"))) {
            wrapper.like("order_no", param.get("orderNo"));
        }
        allLike(WrkDetlLog.class, param.keySet(), wrapper, condition);
        wrapper.orderByDesc("io_time");
        return R.ok(wrkDetlLogService.page(new Page<>(curr, limit), wrapper));
    }