Merge remote-tracking branch 'origin/master'

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -2911,7 +2911,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			jsonObject1.put("CVOUCHCODE",code.replaceAll("DZ",orderNumber));//发票号
 			jsonObject1.put("CMAKER","进出口平台管理员");//制单人
 			jsonObject1.put("CVERIFIER","进出口平台管理员");//审核人
-			jsonObject1.put("CACCID","103");//账套号
+			jsonObject1.put("CACCID","102");//账套号
 			jsonObject1.put("CTYPE","专用");//发票类型
 			if(order.get("cCusCode").equals("T020001")){
 				jsonObject1.put("CTYPE","普通");//发票类型
@@ -2936,7 +2936,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				jsonObject1.put("CPTCODE","02");
 			}
 			jsonObject1.put("CCUSCODE",order.get("cCusCode"));//客户编码
-			jsonObject1.put("CDEPCODE",order.get("cDepCode"));//部门编码
+//			jsonObject1.put("CDEPCODE",order.get("cDepCode"));//部门编码
 			jsonObject1.put("SALETPYECODE",order.get("cSTCode"));//销售类型编码
 			jsonObject1.put("IEXCHRATE",order.get("iExchRate"));//汇率
 			jsonObject1.put("CEXCH_NAME",order.get("cexch_name"));//币种名称
@@ -3008,6 +3008,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			Map<String,List<String>> maps=new HashMap<>();//key:客户编码-字符,value:主表id-数组 用于区分维度完成分组条件
 		}
 
+//		System.out.println("测试合并推送面辅料销售发票  \n"+jsonArrays1);
 		text(jsonArrays1,"测试合并推送面辅料销售发票");
 //		System.out.println("102销售发票\t"+jsonArrays1);
 		JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"saleinvoice_import");//销售发票单
@@ -3041,11 +3042,15 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		//删除入库单号记录
 		String account="101";
 		List<String> codes=getList3(listFabrics);//获取入库单号
-		System.out.println("面辅料查看入库单号  "+codes);
+//		System.out.println("面辅料查看入库单号  "+codes);
+		listFabrics.forEach(f->{
+//			System.out.println("单据号   "+f.getDocumentNo()+"  Rdrecord32Code  "+f.getRdrecord32Code());
+		});
 		if(codes.size()==0){
 			return "无可推送数据!";
 		}
 		Map<String,List<String>> customers=getSuppliers(listFabrics);//key：供应商编码，value：入库单单据号
+//		System.out.println("customers  "+customers);
 		Map<String,List<SyPackingListFabricItem>> listFabricItemMaps=getListFabricItemMaps(customers,listFabrics);//key：供应商编码，value：子表数据
 		Map<String,List<SyPackingListFabric>> listFabricMaps=getListFabricMaps(customers,listFabrics);//key：供应商编码，value：主表数据
 		Map<String,List<SyPackingListFabric>> codeMaps=new HashMap<>();//key：传入销售发票单id，value：主表数据
@@ -3062,7 +3067,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			String orderNumber=listFabrics.get(0).getShippingOrderNumber().substring(0,syPackingListFabric.getShippingOrderNumber().indexOf("-"));
 			List<SyPackingListFabricItem> listTailoringItems=listFabricItemMaps.get(customer);
 			List<Map<String,Object>> invoices=getInvoices1(customers.get(customer));
-			JSONObject  jsonObject1=new JSONObject();
+			JSONObject jsonObject1=new JSONObject();
 			code=org.jeecg.modules.system.util.oConvertUtils.addOne(code);
 			code=orderNumber+code.substring(code.indexOf("0"));
 			redisUtil.set("pushsno002", code);//采购委外发-票单
@@ -3166,9 +3171,23 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			jsonObject1.put("DETAILList",jsonArrays);
 			jsonArrays1.add(jsonObject1);
 		}
+//		System.out.println("测试合并推送面辅料采购发票  \n"+jsonArrays1);
+		JSONArray jsonArrays2=new JSONArray();
+		jsonArrays1.forEach(j->{
+			JSONObject  jsonObject=(JSONObject)j;
+			JSONObject  jsonObject1=new JSONObject();
+			jsonObject1.put("CACCID","101");
+			jsonObject1.put("CMAKER","进出口平台管理员");
+			jsonObject1.put("CVOUCHCODE_U8",jsonObject.get("CVOUCHCODE"));
+			jsonObject1.put("DDATE",jsonObject.get("DDATE"));
+			jsonArrays2.add(jsonObject1);
+		});
+//		System.out.println("测试合并推送面辅料结算单  \n"+jsonArrays2);
 		text(jsonArrays1,"测试合并推送面辅料采购发票");
 		JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"purinvoice_import");//采购发-票单
 		Map<String,String> codeMaps2 = result(resturnJsonArrays,"采购发票",account);
+		JSONArray resturnJsonArrays2 = InterfaceConnUtils.doPost(jsonArrays1,"purchasesettle_import");//结算单
+		Map<String,String> codeMaps3 = result(resturnJsonArrays2,"结算单",account);
 		for (String code1 : codeMaps.keySet()){
 			List<SyPackingListFabric> listFabricList=codeMaps.get(code1);
 			for (SyPackingListFabric fabric : listFabricList){
@@ -3186,6 +3205,19 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						fabric.setSaleInvoiceCode(fabric.getSaleInvoiceCode()+";"+codeMaps2.get(code1));
 					}
 				}
+				if (codeMaps3.get(code1).indexOf("失败")>-1){
+					if(fabric.getSaleInvoiceError()==null){
+						fabric.setSaleInvoiceError(codeMaps3.get(code1));
+					}else{
+						fabric.setSaleInvoiceError(fabric.getSaleInvoiceError()+";"+codeMaps3.get(code1));
+					}
+				}else{
+					if(fabric.getSaleInvoiceCode()==null){
+						fabric.setSaleInvoiceCode(codeMaps3.get(code1));
+					}else{
+						fabric.setSaleInvoiceCode(fabric.getSaleInvoiceCode()+";"+codeMaps3.get(code1));
+					}
+				}
 			}
 		}
 		return "推送成功";
@@ -3199,15 +3231,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	public Map<String,List<String>> getSuppliers(List<SyPackingListFabric> listTailorings){
 		Map<String,List<String>> mapLists=new HashMap<>();
 		for (SyPackingListFabric tailoring : listTailorings){
-			if(tailoring.getRdrecord32Code()==null){
-				continue;
-			}
-			if(mapLists.containsKey(tailoring.getSupplierCode())){
-				mapLists.get(tailoring.getSupplierCode()).add(tailoring.getRdrecord32Code());
+			if(mapLists.containsKey("nbsy")){
+				mapLists.get("nbsy").add(tailoring.getRdrecord32Code());
 			}else{
 				List<String> list=new ArrayList<>();
 				list.add(tailoring.getRdrecord32Code());
-				mapLists.put(tailoring.getSupplierCode(),list);
+				mapLists.put("nbsy",list);
 			}
 		}
 		return mapLists;