Merge branch 'zhouju' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into zhouju
This commit is contained in:
commit
910f81a931
|
@ -42,6 +42,7 @@ public class InventoryExtServiceImpl extends BaseService<InventoryExtEntity,Str
|
||||||
if (null != entity && StrUtil.isNotEmpty(entity.getcInvCode())){
|
if (null != entity && StrUtil.isNotEmpty(entity.getcInvCode())){
|
||||||
InventoryExtEntity extEntity = new InventoryExtEntity();
|
InventoryExtEntity extEntity = new InventoryExtEntity();
|
||||||
extEntity.setCInvCode(entity.getCInvCode());
|
extEntity.setCInvCode(entity.getCInvCode());
|
||||||
|
extEntity.setDataSourceCode(entity.getDataSourceCode());
|
||||||
List<InventoryExtEntity> query = inventoryextDao.query(extEntity);
|
List<InventoryExtEntity> query = inventoryextDao.query(extEntity);
|
||||||
if (CollectionUtils.isNotEmpty(query)){
|
if (CollectionUtils.isNotEmpty(query)){
|
||||||
if (query.size() > 1){
|
if (query.size() > 1){
|
||||||
|
|
|
@ -41,6 +41,7 @@ public class InventorySubServiceImpl extends BaseService<InventorySubEntity,Stri
|
||||||
if (null != entity && StrUtil.isNotEmpty(entity.getcInvSubCode())){
|
if (null != entity && StrUtil.isNotEmpty(entity.getcInvSubCode())){
|
||||||
InventorySubEntity subEntity = new InventorySubEntity();
|
InventorySubEntity subEntity = new InventorySubEntity();
|
||||||
subEntity.setcInvSubCode(entity.getcInvSubCode());
|
subEntity.setcInvSubCode(entity.getcInvSubCode());
|
||||||
|
subEntity.setDataSourceCode(entity.getDataSourceCode());
|
||||||
List<InventorySubEntity> query = inventorySubDao.query(subEntity);
|
List<InventorySubEntity> query = inventorySubDao.query(subEntity);
|
||||||
if (CollectionUtils.isNotEmpty(query)){
|
if (CollectionUtils.isNotEmpty(query)){
|
||||||
if (query.size() > 1){
|
if (query.size() > 1){
|
||||||
|
|
Loading…
Reference in New Issue