面辅料调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -567,6 +567,7 @@ public class SyPackingListFabricController implements Job {
 			 List<SyPackingListFabric> listFabrics=syPackingListFabricService.queryByList(id);
 			 List<SyPackingListFabric> listFabrics1=new ArrayList<>();
 			 List<SyPackingListFabric> listFabrics2=new ArrayList<>();
+			 List<SyPackingListFabric> listFabrics3=new ArrayList<>();
 			 if(listFabrics.size()==0){
 				 codeMaps.put("error","未在装箱单找到对应单据");//失败信息
 				 return "未在装箱单找到对应单据";
@@ -583,6 +584,9 @@ public class SyPackingListFabricController implements Job {
 				 if (fabric.getDocumentNo().substring(0,3).equals("102")){
 					 listFabrics2.add(fabric);
 				 }
+				 if (fabric.getDocumentNo().substring(0,2).equals("ML")){
+					 listFabrics3.add(fabric);
+				 }
 				 fabric.setSaleInvoiceError("");
 				 ////System.out.println("madate\t"+mapdate);
 				 if(mapdate!=null){
@@ -616,6 +620,7 @@ public class SyPackingListFabricController implements Job {
 				 message = syPackingListFabricService.pushInvoiceTwo(listFabrics2);//推送102销售发票
 				 message = syPackingListFabricService.pushInvoiceOne(listFabrics2);//推送101采购发票
 				 message = syPackingListFabricService.pushInvoiceOne(listFabrics1);//推送101采购发票
+				 message = syPackingListFabricService.pushInvoiceFor(listFabrics3);//推送101采购发票
 			 }catch (Exception e){
 				 e.printStackTrace();
 			 }
@@ -649,6 +654,7 @@ public class SyPackingListFabricController implements Job {
 			 }
 			 syPackingListFabricService.updateBatchById(listFabrics1);
 			 syPackingListFabricService.updateBatchById(listFabrics2);
+			 syPackingListFabricService.updateBatchById(listFabrics3);
 			 codeMaps.put("message",msgs.stream().distinct().collect(Collectors.toList()));//推送成功消息
 			 codeMaps.put("error",errors.stream().distinct().collect(Collectors.toList()));//推送失败信息
 			 if(errors.size()==0){

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

@@ -96,6 +96,9 @@ public interface ISyPackingListFabricService extends IService<SyPackingListFabri
 	//根据托书主表id，推送对应装箱单销售发票并返回推送信息
 	String pushInvoiceTwo(List<SyPackingListFabric> listFabrics);
 
+	//根据托书主表id，推送对应装箱单销售发票并返回推送信息
+	String pushInvoiceFor(List<SyPackingListFabric> listFabrics);
+
 	//根据托书主表id，推送对应装箱单采购发票并返回推送信息
 	String pushInvoiceOne(List<SyPackingListFabric> listFabrics);
 

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

@@ -3146,6 +3146,65 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		return "推送成功";
 	}
 
+	@Override
+	@DS("multi-one")
+	public String pushInvoiceFor(List<SyPackingListFabric> listFabrics) {
+		List<String> ids=new ArrayList<>();//获取出库单号
+		JSONArray jsonArrays2=new JSONArray();
+		Map<String,List<SyPackingListFabric>> codeMaps=new HashMap<>();//key：传入销售发票单id，value：主表数据
+		for (SyPackingListFabric syPackingListFabric : listFabrics){
+			String recordingCode=syPackingListFabric.getRecordingCode();
+			String code=syPackingListFabric.getSaleInvoiceCode();
+			System.out.println("recordingCode\t"+recordingCode);
+			System.out.println("code\t"+code);
+			if(recordingCode!=null&&code!=null&&recordingCode.indexOf("101账套采购发票单")>-1&&code.indexOf("101结算单")==-1 ){
+				String documentNo=recordingCode.substring(recordingCode.indexOf("101账套采购发票单")+11,recordingCode.indexOf("101账套采购发票单")+22);
+				System.out.println("101账套采购发票单号\t"+documentNo);
+				if (!ids.contains(documentNo)){
+					List<SyPackingListFabric> fabricList=new ArrayList<>();
+					fabricList.add(syPackingListFabric);
+					codeMaps.put(documentNo,fabricList);
+					ids.add(documentNo);
+					JSONObject  jsonObject1=new JSONObject();
+					jsonObject1.put("CACCID","101");
+					jsonObject1.put("CMAKER","进出口平台管理员");
+					jsonObject1.put("CVOUCHCODE_U8",documentNo);
+					jsonObject1.put("DDATE",syPackingListFabric.getTheFinalShippingDate().substring(0,10));
+					jsonArrays2.add(jsonObject1);
+				}else{
+					List<SyPackingListFabric> fabricList=codeMaps.get(documentNo);
+					fabricList.add(syPackingListFabric);
+					codeMaps.put(documentNo,fabricList);
+				}
+			}
+		}
+		System.out.println("结算单codeMaps\t"+codeMaps);
+		System.out.println("结算单jsonArrays2\t"+jsonArrays2);
+		if (jsonArrays2.size()>0){
+			JSONArray resturnJsonArrays2 = InterfaceConnUtils.doPost(jsonArrays2,"purchasesettle_import");//结算单
+			Map<String,String> codeMaps3 = result(resturnJsonArrays2,"结算单","101");
+
+			for (String code1 : codeMaps.keySet()){
+				List<SyPackingListFabric> listFabricList=codeMaps.get(code1);
+				for (SyPackingListFabric fabric : listFabricList){
+					if (codeMaps3.get(code1).indexOf("失败")>-1|| 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 "推送成功";
+	}
 
 	/**
 	 * 合并批量推送采购发票单

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

@@ -2741,7 +2741,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		}
 		System.out.println("销售发票jsonArrays1\t"+jsonArrays1);
 		text(jsonArrays1,"测试合并推送成衣销售发票");
-		/*JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"saleinvoice_import");//销售发-票单
+		JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"saleinvoice_import");//销售发-票单
 		Map<String,String> codeMaps2 = result(resturnJsonArrays,"销售发票",account);
 		for (String code1 : codeMaps.keySet()){
 			List<SyPackingListTailoring> listTailoringList=codeMaps.get(code1);
@@ -2764,7 +2764,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					}
 				}
 			}
-		}*/
+		}
 		return "推送成功";
 	}