自动化立体仓库 - WMS系统
pang.jiabao
2025-04-17 391dd89a6583e0f1eceaf1297fd852e3da32bf68
src/main/java/com/zy/asrs/controller/PlaController.java
@@ -68,6 +68,11 @@
            wrapper.eq("brand", param.get("brand"));
            param.remove("brand");
        }
        // 仓库精确匹配
        if (!Cools.isEmpty(param.get("stash"))) {
            wrapper.eq("stash", param.get("stash"));
            param.remove("stash");
        }
        // 没有选择的时候默认不显示已出库的物料
        if (Cools.isEmpty(param.get("status"))) {
            wrapper.ne("status", "全部出库");
@@ -145,7 +150,7 @@
    }
    @RequestMapping(value = "/pla/sellout/auth")
    @ManagerAuth
    @ManagerAuth(memo = "sellout")
    @Transactional
    @Synchronized
    public R sellout(@RequestBody List<Pla> plas) {
@@ -157,7 +162,11 @@
        OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMaktx(orderNo, maktx);
        for (Pla pla : plas) {
            // 获取最新冻结状态
            Pla pla1 = plaService.selectOne(new EntityWrapper<Pla>().setSqlSelect("stock_freeze as stockFreeze,stock_freeze_by as stockFreezeBy,stock_freeze_date as stockFreezeDate").eq("id", pla.getId()));
            pla.setStockFreeze(pla1.getStockFreeze());
            pla.setStockFreezeBy(pla1.getStockFreezeBy());
            pla.setStockFreezeDate(pla1.getStockFreezeDate());
            if (pla.getStockFreeze() == 0) {
//                throw new CoolException("库存已被冻结,请重新选择库存");
                log.info("该库存已被其他用户冻结,请重新选择;{},{}", pla.getStockFreezeBy(), getUser().getUsername());