出库作业里面显示冻结/未冻结

pang.jiabao

2025-04-17 391dd89a6583e0f1eceaf1297fd852e3da32bf68

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

@@ -11,7 +11,6 @@
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.microsoft.sqlserver.jdbc.SQLServerException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.GlobleParameter;
import com.zy.asrs.entity.result.KeyValueVo;
@@ -69,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", "全部出库");
@@ -89,7 +93,7 @@
    @RequestMapping(value = "/pla/add/auth")
    @ManagerAuth
    public R add(@RequestBody List<Pla> plas) {
        System.out.println(plas.toString());
        log.info(plas.toString());
        plas.forEach(pla -> {
            plaService.insert(pla);
        });
@@ -99,7 +103,7 @@
    @RequestMapping(value = "/pla/update/auth")
    @ManagerAuth
    public R update(@RequestBody List<Pla> plas) {
        System.out.println(plas.toString());
        log.info(plas.toString());
        plas.forEach(pla -> {
            Pla plaSave = plaService.selectById(pla.getId());
            pla.setModifyTime(new Date());
@@ -119,7 +123,7 @@
    @RequestMapping(value = "/pla/delete/auth")
    @ManagerAuth
    public R delete(@RequestBody List<Pla> plas) {
        System.out.println(plas.toString());
        log.info(plas.toString());
        plas.forEach(pla -> {
            if (!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_0) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_1)) {
                throw new CoolException("已入库的数据无法被删除");
@@ -146,7 +150,7 @@
    }

    @RequestMapping(value = "/pla/sellout/auth")
    @ManagerAuth
    @ManagerAuth(memo = "sellout")
    @Transactional
    @Synchronized
    public R sellout(@RequestBody List<Pla> plas) {
@@ -158,10 +162,14 @@
        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("库存已被冻结，请重新选择库存");
                System.out.println(pla.getStockFreezeBy() + "," + getUser().getUsername());
                log.info("该库存已被其他用户冻结，请重新选择;{},{}", pla.getStockFreezeBy(), getUser().getUsername());
                if (!Cools.eq(pla.getStockFreezeBy(), getUser().getUsername())) {
                    throw new CoolException("该库存已被其他用户冻结，请重新选择");
                }
@@ -171,6 +179,9 @@

            if (pla.getWeightAnfme() - pla.getQtyAnfme() - pla.getOrderWeight() < 0) {
                throw new CoolException("批号:" + pla.getBatch() + "，包号:" + pla.getPackageNo() + " 剩余可出库重量不足，请调整出库重量");
            }
            if (Cools.isEmpty(pla.getMassState())){
                throw new CoolException("质量指标为上传");
            }
            pla.setQtyAnfme(pla.getQtyAnfme() + pla.getOrderWeight());
            pla.setHandlerBy(getUser().getUsername());
@@ -366,9 +377,14 @@
                .andNew().like("batch", condition)
                .groupBy("batch")
                .orderBy("batch", false);
        List<Pla> plas = plaService.selectPage(new Page<Pla>(1, 30), wrapper).getRecords();
        Page<Pla> plaPage = new Page<>(1, 30);
        plaPage.setSearchCount(false);
        Page<Pla> plaPage1 = plaService.selectPage(plaPage, wrapper);
        // 重新查询然后给page设置Total
        plaPage.setTotal(this.plaService.selectCount(new EntityWrapper<Pla>().setSqlSelect("batch")
                .andNew().like("batch", condition)));
        List<KeyValueVo> valueVos = new ArrayList<>();
        for (Pla pla : plas) {
        for (Pla pla : plaPage1.getRecords()) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(pla.getBatch());
            vo.setValue(pla.getBatch());