Revert "#"

zjj

2024-11-12 d763f91da2dee979ac6825569cf61e9f8816d0fe

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

@@ -13,12 +13,11 @@
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.service.LocDetlService;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -83,10 +82,71 @@
                param.remove("modi_time");
            }
        }
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
        param.remove("curr");
        param.remove("limit");
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(param.get("crnNo"))) {
            switch ((String) param.get("crnNo")) {
                case "1": wrapper.le("SUBSTRING(loc_no, 1, 2)",4);
                    break;
                case "2":wrapper.ge("SUBSTRING(loc_no, 1, 2)",5).le("SUBSTRING(loc_no, 1, 2)",8);
                    break;
                case "3":wrapper.ge("SUBSTRING(loc_no, 1, 2)",9).le("SUBSTRING(loc_no, 1, 2)",12);
                    break;
                case "4":wrapper.ge("SUBSTRING(loc_no, 1, 2)",13).le("SUBSTRING(loc_no, 1, 2)",16);
                    break;
                case "5":
                    break;
                case "6":
                    break;
                case "7":wrapper.ge("SUBSTRING(loc_no, 1, 2)",17).le("SUBSTRING(loc_no, 1, 2)",37);
                    break;
                case "8":wrapper.ge("SUBSTRING(loc_no, 1, 2)",38).le("SUBSTRING(loc_no, 1, 2)",45);
                    break;
                case "9":wrapper.ge("SUBSTRING(loc_no, 1, 2)",46).le("SUBSTRING(loc_no, 1, 2)",53);
                    break;
                default:
            }
            param.remove("crnNo");
        }
        convert(param, wrapper);
        // 不同继承角色显示不同库信息
        RoleUtils.addRoleWrapperByLocNo(getUserId(),wrapper);
        Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
        if (locDetlPage.getRecords().size()==0){
            locDetlPage = locDetlService.selectPage(new Page<>(1, limit), wrapper);
        }
        return R.ok(locDetlPage);
    }

    @RequestMapping(value = "/error/locDetl/list/auth")// /locDetl/list/auth 接口问题
    @RequestMapping(value = "/stock/out/crn/list/auth")
    @ManagerAuth
    public R crnStockOutList(@RequestParam(defaultValue = "1") Integer curr,
                          @RequestParam(defaultValue = "10") Integer limit,
                          @RequestParam Map<String, Object> param){
        if (!Cools.isEmpty(param.get("modi_time"))){
            String val = String.valueOf(param.get("modi_time"));
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                param.put("startTime", DateUtils.convert(dates[0]));
                param.put("endTime", DateUtils.convert(dates[1]));
                param.remove("modi_time");
            }
        }
        param.remove("curr");
        param.remove("limit");
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        wrapper.addFilter("LEFT(loc_no,2)>=1 and LEFT(loc_no,2)<=16");
//        Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
        Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
        if (locDetlPage.getRecords().size()==0){
            locDetlPage = locDetlService.selectPage(new Page<>(1, limit), wrapper);
        }
        return R.ok(locDetlPage);
    }

    @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 接口问题
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
@@ -109,6 +169,8 @@
        excludeTrash(param);
        convert(param, wrapper);
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
        // 不同继承角色显示不同库信息
        RoleUtils.addRoleWrapperByLocNo(getUserId(),wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
//        if (!row.equals("")){
//            wrapper.and()