发票推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -1995,7 +1995,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				"cpoid=(select  top 1 cOrderCode from rdrecord01 where ccode='"+syPackingListTailoring.getRdrecord32Code()+"')","poid");
 			}
 			System.out.println("orderData\t"+orderData);
-			String cvenName=syPackingListTailoringMapper.getCvenName(syPackingListTailoring.getSupplierCode());//供应商编码
 			//List<SyPackingListFabricItem> listFabricItems=syPackingListFabric.getSyPackingListFabricItem();//需要进行分组
 			List<SyPackingListTailoringItem> listTailoringItems=listTailoringItemMaps.get(customer);
 			//System.out.println("codes.size\t"+codes.size());
@@ -2026,9 +2025,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			jsonObject1.put("CDEFINE4",syPackingListTailoring.getTheFinalShippingDate().substring(0,10));//最终船期
 			jsonObject1.put("CDEFINE6",syPackingListTailoring.getTheFinalShippingDate2().substring(0,10));//合同日期
 			jsonObject1.put("CDEFINE10",syPackingListTailoring.getShippingOrderNumber());//托书号
-			if(syPackingListTailoring.getSupplierCode()!=null){
-				String	venName=syPackingListTailoringMapper.getCvenName(syPackingListTailoring.getSupplierCode());
-				jsonObject1.put("CDEFINE12",cvenName);//供应商全称
+			if(account.equals("102")){
+				String	venName=syPackingListTailoringMapper.getCvenName(customer);
+				jsonObject1.put("CDEFINE12",venName);//供应商全称
+			}else{
+				String	venName=syPackingListTailoringMapper.getCvenName(customer.split("-")[0]);
+				jsonObject1.put("CDEFINE12",venName);//供应商全称
 			}
 			jsonObject1.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码
 			jsonObject1.put("IEXCHRATE",orderData.get("nflat"));//汇率
@@ -2394,12 +2396,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		List<Map<String,Object>> suppliers=syPackingListTailoringMapper.getSuppliers("rdrecord01",codes.toArray(new String[codes.size()]));
 		Map<String,List<String>> mapLists=new HashMap<>();
 		for (Map<String,Object> map : suppliers){
-			if(mapLists.containsKey(map.get("cVenCode").toString()+map.get("cPersonCode").toString())){
-				mapLists.get(map.get("cVenCode").toString()+map.get("cPersonCode").toString()).add(map.get("ccode").toString());
+			if(mapLists.containsKey(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString())){
+				mapLists.get(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString()).add(map.get("ccode").toString());
 			}else{
 				List<String> list=new ArrayList<>();
 				list.add(map.get("ccode").toString());
-				mapLists.put(map.get("cVenCode").toString()+map.get("cPersonCode").toString(),list);
+				mapLists.put(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString(),list);
 			}
 		}
 		System.out.println("mapLists\t"+mapLists);