自动化立体仓库 - WMS系统
pang.jiabao
2025-09-22 9e53b59e30bba2149900aa2cc9f22ad0ab445edd
src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,16 +13,16 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
@@ -38,6 +38,9 @@
    private LocDetlMapper locDetlMapper;
    @Autowired
    private MatService matService;
    @Resource
    private ManLocDetlMapper manLocDetlMapper;
    @RequestMapping(value = "/locDetl/update")
    public R update1() {
@@ -83,10 +86,14 @@
                param.remove("modi_time");
            }
        }
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
        Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
        if (stockOut.getRecords().size()==0){
            stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
        }
        return R.ok(stockOut);
    }
    @RequestMapping(value = "/error/locDetl/list/auth")// /locDetl/list/auth 接口问题
    @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 接口问题
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
@@ -94,6 +101,17 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        String locNo = (String) param.get("loc_no");
        if (!Cools.isEmpty(locNo)) {
            // 判断是否是平库在库库存
            if (locNo.startsWith("09") || locNo.startsWith("10")) {
                List<LocDetl> locDetls = manLocDetlMapper.selectLocDetlByLocNo(locNo);
                Page<LocDetl> page = new Page<>();
                page.setRecords(locDetls);
                page.setTotal(locDetls.size());
                return R.ok(page);
            }
        }
//        String row = "";
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
//        if (param.get("row") != null) {