#增加生产日期，到期日期字段，增加库存明细超期库存检索

lty

5 天以前 9d38f2354b3a7267a2486d937bb7d256fcb949c1

 src/main/java/com/zy/asrs/controller/AgvLocDetlController.java

@@ -8,6 +8,7 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.service.AgvLocDetlService;
import com.zy.asrs.service.MatService;
@@ -20,6 +21,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;

@@ -40,14 +42,23 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param,
                  @RequestParam(required = false)Boolean unreason){
                  @RequestParam(required = false)Boolean unreason,
                  @RequestParam(required = false)Boolean expired){
        if (!Cools.isEmpty(unreason) && unreason) {

            return R.ok(agvLocDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvLocDetl>()
                    .where(" DATALENGTH( batch ) != 11 or\n" +
                            "            batch LIKE '%[a-z]%'")));
        }
        if (!Cools.isEmpty(expired) && expired) {
            return R.ok(agvLocDetlService.selectPage(
                    new Page<>(curr, limit),
                    new EntityWrapper<AgvLocDetl>()
                            .where("deadline < {0}", LocalDate.now())  // 新增的过期判断
            ));
        }
        param.remove("unreason");
        param.remove("expired");
        String row = "";
        EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
        if (param.get("row") != null) {