Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

zjj

2024-12-26 a484168b903a919b24d65a5d95dea88a04d8f34c

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

@@ -9,6 +9,7 @@
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;
import java.util.Set;

@Service("locDetlService")
@@ -82,8 +83,23 @@
    }

    @Override
    public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
    public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos,supp,temp1,temp2);
    }

    @Override
    public List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
        return this.baseMapper.queryStockCrn(matnr, batch, orderNo, locNos,supp,temp1,temp2);
    }

    @Override
    public List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
        return this.baseMapper.queryStockFour(matnr, batch, orderNo, locNos,supp,temp1,temp2);
    }

    @Override
    public List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
        return this.baseMapper.queryStockMinAnfme(matnr, batch, orderNo, locNos,supp,temp1,temp2);
    }

    @Override
@@ -98,11 +114,11 @@

    /**
     * 获取库存总数
     *
     * @return
     */
    @Override
    public Integer sum() {

    public Double sum() {
        return this.baseMapper.sum();
    }

@@ -126,4 +142,20 @@
    public void updateMatTurn(String matnrOld,String matnr){
        this.baseMapper.updateMatTurn(matnrOld,matnr);
    }

    @Override
    public List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo) {
        if (crnNo==1){
            return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapY(crnNo);
        }
        return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapN(crnNo);
    }

    @Override
    public List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr,String batch,String grade,Integer crnNo) {
        if (crnNo==1){
            return this.baseMapper.selectLocDetlUnilateralMoveShuttleY(matnr,batch,grade);
        }
        return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr,batch,grade);
    }
}