commit for pull
This commit is contained in:
		@@ -1,6 +1,7 @@
 | 
			
		||||
package com.cnbm.packing.service;
 | 
			
		||||
 | 
			
		||||
import com.cnbm.dynamic.datasource.annotation.DataSource;
 | 
			
		||||
import com.cnbm.packing.dto.CamlineExtendArgDTO;
 | 
			
		||||
import com.cnbm.packing.dto.WoPowerLevelDTO;
 | 
			
		||||
import com.cnbm.packing.mapper.CamlineMapper;
 | 
			
		||||
 | 
			
		||||
@@ -40,4 +41,10 @@ public class DynamicDataSourceService {
 | 
			
		||||
        return mapper.getOrderNameBySubId(subId);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @DataSource("camline")
 | 
			
		||||
    @Transactional
 | 
			
		||||
    public CamlineExtendArgDTO getExtendArgFromCamline(String subId){
 | 
			
		||||
        return mapper.getExtendArgFromCamline(subId);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -17,6 +17,7 @@ import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper;
 | 
			
		||||
import com.cnbm.packing.service.ChangePackagingBoxHistoryServiceBiz;
 | 
			
		||||
import com.cnbm.packing.service.WoPackagingBoxSubstrateServiceBiz;
 | 
			
		||||
import org.apache.commons.lang3.StringUtils;
 | 
			
		||||
import org.omg.CORBA.PRIVATE_MEMBER;
 | 
			
		||||
import org.springframework.beans.factory.annotation.Autowired;
 | 
			
		||||
import org.springframework.stereotype.Service;
 | 
			
		||||
import org.springframework.transaction.annotation.Transactional;
 | 
			
		||||
@@ -37,6 +38,8 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private ChangePackagingBoxHistoryServiceBiz changePackagingBoxHistoryService;
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private WoPackagingBoxSubstrateMapper mapper;
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public QueryWrapper<WoPackagingBoxSubstrate> getWrapper(Map<String, Object> params){
 | 
			
		||||
@@ -164,11 +167,11 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public WoPackagingBoxSubstrate getBySubId(String subId) {
 | 
			
		||||
        return woPackagingBoxSubstrateMapper.getOneByWoSubstrateId(subId);
 | 
			
		||||
        return mapper.getOneByWoSubstrateId(subId);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public int updatePackagingBoxIdByWoSubstrateId(String packagingBoxId, String woSubstrateId) {
 | 
			
		||||
        return woPackagingBoxSubstrateMapper.updatePackagingBoxIdByWoSubstrateId(packagingBoxId,woSubstrateId);
 | 
			
		||||
        return mapper.updatePackagingBoxIdByWoSubstrateId(packagingBoxId,woSubstrateId);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user