| 
						
						
							
								
							
						
						
					 | 
					 | 
					@ -1069,7 +1069,7 @@ public class CtqyyClient extends CommonHttpClient {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        item.setBillNo(detailBizEntity.getOrderIdFk()); //单据号
 | 
					 | 
					 | 
					 | 
					        item.setBillNo(detailBizEntity.getOrderIdFk()); //单据号
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        item.setRegisterNo(detailBizEntity.getCertCode()); //注册/备案证号
 | 
					 | 
					 | 
					 | 
					        item.setRegisterNo(detailBizEntity.getCertCode()); //注册/备案证号
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        item.setManufactory(basicProducts.getManufactory()); //生产厂家
 | 
					 | 
					 | 
					 | 
					        item.setManufactory(basicProducts.getManufactory()); //生产厂家
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        item.setMeasname(basicProducts.getMeasname()); //计量单位
 | 
					 | 
					 | 
					 | 
					        item.setMeasname(thrProductsEntity.getMeasname()); //计量单位
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        item.setAllowNoBatch(IntUtil.value(basicProducts.getAllowNoBatch())); //是否允许无批次号
 | 
					 | 
					 | 
					 | 
					        item.setAllowNoBatch(IntUtil.value(basicProducts.getAllowNoBatch())); //是否允许无批次号
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        if (StrUtil.isNotEmpty(item.getManufactory())) {
 | 
					 | 
					 | 
					 | 
					        if (StrUtil.isNotEmpty(item.getManufactory())) {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            ThrCorpEntity thrCorpEntity = thrCorpService.getThrCorpByName(item.getManufactory());
 | 
					 | 
					 | 
					 | 
					            ThrCorpEntity thrCorpEntity = thrCorpService.getThrCorpByName(item.getManufactory());
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					 | 
					@ -1204,7 +1204,8 @@ public class CtqyyClient extends CommonHttpClient {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                            }
 | 
					 | 
					 | 
					 | 
					                            }
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                            String code = codeDetaiEntity.getCode();
 | 
					 | 
					 | 
					 | 
					                            String code = codeDetaiEntity.getCode();
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                            if (code.contains("\u001D")) {
 | 
					 | 
					 | 
					 | 
					                            if (code.contains("\u001D")) {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                                code = code.replace("\u001D", "zysoft");
 | 
					 | 
					 | 
					 | 
					//                                code = code.replace("\u001D", "zysoft");
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					                                code = code.replace("\u001D", "");
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                            }
 | 
					 | 
					 | 
					 | 
					                            }
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                            itemDTO.setCode(code);
 | 
					 | 
					 | 
					 | 
					                            itemDTO.setCode(code);
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					                            itemDTO.setCount(codeDetaiEntity.getCount());
 | 
					 | 
					 | 
					 | 
					                            itemDTO.setCount(codeDetaiEntity.getCount());
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					 | 
					
 
 |