#

vincentlu

2025-05-13 ebd2f4397a92c6a5096de1b86d59154363344720

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java

@@ -6,15 +6,14 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.controller.param.LocInitParam;
import com.zy.acs.manager.manager.entity.Loc;
import com.zy.acs.manager.manager.entity.Zone;
import com.zy.acs.manager.manager.enums.LocStsType;
import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.ZoneService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -24,6 +23,7 @@

import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;

@RestController
@RequestMapping("/api")
@@ -39,7 +39,7 @@
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
        return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(true)));
        return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(false)));
    }

    @PreAuthorize("hasAuthority('manager:loc:list')")
@@ -84,6 +84,22 @@
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(loc);
    }

    @PreAuthorize("hasAuthority('manager:loc:update')")
    @OperationLog("Update Loc")
    @PostMapping("/loc/update/many")
    public R updateMany(@RequestBody List<Loc> locList) {
        if (!Cools.isEmpty(locList)) {
            for (Loc loc : locList) {
                loc.setUpdateBy(getLoginUserId());
                loc.setUpdateTime(new Date());
                if (!locService.updateById(loc)) {
                    return R.error("Update Fail");
                }
            }
        }
        return R.ok("Update Success").add(locList.stream().map(Loc::getId).collect(Collectors.toList()));
    }

    @PreAuthorize("hasAuthority('manager:loc:remove')")
@@ -141,13 +157,13 @@
                            locNo,    // 库位编号
                            null,    // 名称
                            null,    // 条码
                            LocStsType.IDLE.val(),    // 库位状态
                            param.getLocSts(),    // 库位状态
                            offset,    // 偏移量
                            r,    // 排
                            b,    // 列
                            l,    // 层
                            null,    // 托盘码
                            null,    // 库位类型
                            param.getLocType(),    // 库位类型
                            null,    // 状态[非空]
                            null,    // 是否删除[非空]
                            null,    // 租户
@@ -157,6 +173,7 @@
                            null,    // 修改时间
                            null    // 备注
                    );
                    loc.setCompDirect(param.getCompDirect());
                    if (locService.count(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, locNo)) > 0) {
                        throw new CoolException(locNo + " location has exist !");
                    }