| 
					
				 | 
			
			
				@@ -1045,7 +1045,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 if(OM_MOMaterialsList.size()==1){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     //获取订单的自定义数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     getcFree(itemMap, OM_MOMaterialsList.get(0)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    itemMap.put("AUTOID_PO",OM_MOMaterialsList.get(0).get("MOMaterialsID"));//委外订单自件id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    itemMap.put("AUTOID_ALL",OM_MOMaterialsList.get(0).get("MOMaterialsID"));//委外订单行id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     itemMap.put("ALLCAUTOIDCOL","MOMaterialsID");//子件id字段名 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     itemMap.put("CINVCODE",OM_MOMaterialsList.get(0).get("cInvCode")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1093,7 +1093,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 this.baseMapper.updateVoucherHistoryCNumber(oConvertUtils.maxNumber(cCode),"0412"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 saveJson.put("CACCID",accID); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 saveJson.put("CVOUCHCODE",cCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                //saveJson.put("CGLTYPE","委外订单"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                saveJson.put("CGLTYPE","委外订单"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 saveJson.put("CBUSTYPE",map.get("CBUSTYPE")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 saveJson.put("DDATE",map.get("DDATE")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 saveJson.put("CPERSONCODE",map.get("CPERSONCODE")); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1114,7 +1114,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         saveItemJson.put("CINVCODE",m.get("CINVCODE")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         saveItemJson.put("IQUANTITY",m.get("iQuntity")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         saveItemJson.put("CBATCH",m.get("cBatch")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        saveItemJson.put("AUTOID_PO",m.get("AUTOID_PO")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        saveItemJson.put("AUTOID_ALL",m.get("AUTOID_ALL")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         saveItemJson.put("ALLCAUTOIDCOL",m.get("ALLCAUTOIDCOL")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         //获取自定义项 自由项 批次项 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         getCDEFINEJson(saveItemJson,m); 
			 |