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

Junjie

2023-09-20 c8ec0494e03be47ec0f1b3a89ad5e0a004bd7501

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

@@ -100,13 +100,16 @@
    }

    //出库
    public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued) {
    public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
        Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr).orderBy("modi_time");
        if(Cools.isEmpty(batch)){
            wrapper.isNull("batch");
        }else {
            wrapper.eq("batch",batch);
        }
        wapperSetCondition(wrapper,"batch",batch);
        wapperSetCondition(wrapper,"three_code",csocode);
        wapperSetCondition(wrapper,"dead_time",isoseq);
//        if(Cools.isEmpty(batch)){
//            wrapper.isNull("batch");
//        }else {
//            wrapper.eq("batch",batch);
//        }

        List<LocDetl> locDetlList = this.selectList(wrapper);
        for (LocDetl locDetl : locDetlList) {
@@ -178,4 +181,12 @@
    public int updateStockFreeze(String matnr, String locNo, Integer stockFreeze) {
        return this.baseMapper.updateStockFreeze(matnr, locNo, stockFreeze);
    }

    private void wapperSetCondition(Wrapper wrapper,String column, String condition){
        if(Cools.isEmpty(condition)){
            wrapper.isNull(column);
        }else {
            wrapper.eq(column,condition);
        }
    }
}