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

zjj

2024-11-04 4c2ac1e9f5fee2eeb7f1c97ccd7b0532ca144232

 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")
@@ -46,6 +47,11 @@
    @Override
    public List<String> getSameDetlToday(String matnr, Integer start, Integer end) {
        return this.baseMapper.selectSameDetlToday(matnr, start, end);
    }

    @Override
    public List<String> getSameDetlToday(String matnr,String batch, Integer start, Integer end) {
        return this.baseMapper.selectSameDetlTodayBatch(matnr,batch, start, end);
    }


@@ -116,4 +122,25 @@
    public Double getLocDetlSumQty(String locNo) {
        return this.baseMapper.selectLocDetlSumQty(locNo);
    }

    @Override
    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);
    }
}