Merge remote-tracking branch 'origin/master'

zhangherong

3 天以前 8caf5f04be94d8f52fb291dd045663079d681c19

 src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInventoryServiceImpl.java

@@ -4,9 +4,11 @@
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.mapper.LswMaterialInventoryMapper;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
import org.jeecg.modules.lsw.vo.LswMaterialInventoryVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;

/**
@@ -25,4 +27,9 @@
   public List<LswMaterialInventory> selectByMainId(String mainId) {
      return lswMaterialInventoryMapper.selectByMainId(mainId);
   }

    @Override
    public List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(List<String> bomMaterialNumberList, String factoryId) {
      return lswMaterialInventoryMapper.selectLineSideMaterialInventoryByMaterialNumber(bomMaterialNumberList, factoryId);
    }
}