#

zyx

2024-05-07 d360bba38d918e2f586d27c5aeb8b1174a612630

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.Pla;
@@ -29,7 +30,7 @@
    private PlaQtyService plaQtyService;

    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));
        return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo).eq("brand",brand).eq(false,"status","全部出库"));
    }

    @Override
@@ -154,11 +155,18 @@
    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());
        Date stime = null;
        Date etime = null;
        Object create_time = page.getCondition().get("create_time");
        Object brand = page.getCondition().get("brand");
        Object status = page.getCondition().get("status");
        String createTime = create_time == null ? null : create_time.toString();
        if(!Cools.isEmpty(createTime)){
            String[] dates = createTime.split(" - ");
            stime = DateUtils.convert(dates[0]);
            etime = DateUtils.convert(dates[1]);
        }
        plaList=baseMapper.getStockStatisAll(brand == null ? null:brand.toString(), status == null ? null:status.toString(),  stime,etime);

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