#

pjb

2024-12-31 24527aa9d2f522faa574ac3f3bdb1544d0b2a9bf

 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;
@@ -89,7 +88,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 +98,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 +118,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("已入库的数据无法被删除");
@@ -161,7 +160,7 @@

            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("该库存已被其他用户冻结，请重新选择");
                }
@@ -366,9 +365,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());