1.增加牌号作为唯一物料条件 （当前牌号 批号 包号可以筛选出唯一物料） 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善

zyx

2024-03-14 f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41

 src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
@@ -27,8 +28,8 @@
    @Autowired
    private PlaQtyService plaQtyService;

    public Pla selectByBatchAndPackageNo(String batch, String packageNo) {
        return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo));
    public Pla selectByBatchAndPackageNo(String batch, Integer packageNo, String brand) {
        return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo).eq("brand",brand));
    }

    @Override
@@ -65,7 +66,7 @@
            }
            //需要减去此次出库预览其他订单需出库的数量
            for (PlaQty plaQty : plaQties){
                if(Cools.eq(plaQty.getBatch(),pla.getBatch()) && Cools.eq(plaQty.getPackageNo(),pla.getPackageNo())){
                if(Cools.eq(plaQty.getBatch(),pla.getBatch()) && plaQty.getPackageNo() == pla.getPackageNo()){
                    weightAnfme -= plaQty.getQtyAnfme();
                }
            }
@@ -84,7 +85,7 @@
        }

        if(anfme > 0){
            PlaQty plaQty = new PlaQty(orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getId(),orderDetl.getOrderId(),orderDetl.getOrderNo(),anfme,null,new Date());
            PlaQty plaQty = new PlaQty(orderDetl.getBatch(),Integer.parseInt(orderDetl.getBrand()),orderDetl.getId(),orderDetl.getOrderId(),orderDetl.getOrderNo(),anfme,null,new Date());
            plaQties.add(plaQty);
        }

@@ -116,7 +117,7 @@
            plaQtyService.insert(plaQtyReturned);

            //直接更新pla的库存
            Pla pla = this.selectByBatchAndPackageNo(plaQty.getBatch(), plaQty.getPackageNo());
            Pla pla = this.selectByBatchAndPackageNo(plaQty.getBatch(), plaQty.getPackageNo(),plaQty.getBrand());
            //pla.setStatus(GlobleParameter.PLA_STATUS_0);
            pla.setModifyTime(new Date());

@@ -124,7 +125,8 @@
            pla.setStatus(GlobleParameter.PLA_STATUS_1);
            this.updateById(pla);

            SaasUtils.insertLog(0,pla.getLocNo(),pla.getBatch()+","+pla.getPackageNo(),plaQty.getOrderWeight(),user.getUsername());
            SaasUtils.insertLog(0,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());

        });
    }
@@ -142,4 +144,33 @@
            this.updateById(pla);
        });
    }

    @Override
    public List<Pla> selectToHistory() {
        return this.selectList(new EntityWrapper<Pla>().eq("status",GlobleParameter.PLA_STATUS_4));
    }

    @Override
    public Page<Pla> getStockStatisAll(Page<Pla> page) {

        List<Pla> plaList;
        if(Cools.isEmpty(page.getCondition().get("brand"))){
            plaList=baseMapper.getStockStatisAll();
        }else {
            plaList = baseMapper.getStockStatisAllByBrand(page.getCondition().get("brand").toString());
        }

        double weightSum = plaList.stream().mapToDouble(Pla::getWeight).sum();

        // 最后一条记录仅供合计重量信息展示
        Pla pla = new Pla();
        pla.setBrand("合计");
        pla.setMatnr("");
        pla.setWeight(weightSum);
        plaList.add(pla);

        page.setRecords(plaList);
        page.setTotal(0);
        return page;
    }
}