推送发票调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -2149,16 +2149,6 @@ public class SyPackingListTailoringController implements Job {
 				 maps.put("maps",mapd);
 
 				 for (int i=0;i<3;i++){
-			 	 /*if(maps.get("account").equals("103")){
-					message+=syPackingListTailoringService.pushInvoice3(listTailorings, maps);
-					message+=syPackingListTailoringService.pushInvoice6(listTailorings, maps);
-				 }else if(maps.get("account").equals("102")){
-					message+=syPackingListTailoringService.pushInvoice2(listTailorings, maps);
-					message+=syPackingListTailoringService.pushInvoice5(listTailorings, maps);
-				 }else if(maps.get("account").equals("101")){
-					message+=syPackingListTailoringService.pushInvoice1(listTailorings, maps);
-					message+=syPackingListTailoringService.pushInvoice6(listTailorings, maps);
-				 }*/
 					try{
 						if(i==0){
 							maps.put("account","103");//账套号

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringMapper.xml

@@ -420,10 +420,8 @@
 		      (select salesman from sy_packing_list_tailoring_item
 		     where sy_packing_list_tailoring_id=sy_packing_list_tailoring.id limit 1) salesman1
 		from sy_packing_list_tailoring
-		where del_flag=0 and id in
-		(select tailoring_fabric_id
-		from sy_shipping_order_item
-		where sy_shipping_order_item_id=#{value }
+		where del_flag=0 and id in(select tailoring_fabric_id
+		from sy_shipping_order_item where sy_shipping_order_item_id=#{value}
 		and del_flag=0)  /*and sale_Invoice_Code is null and sale_Invoice_error is null*/
 	</select>
 

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

@@ -2157,11 +2157,17 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	 * @return
 	 */
 	public String pushInvoices(List<SyPackingListTailoring> listTailorings,Map<String,Object> maps) {
-		List<String> codes=getList(listTailorings,maps.get("account").toString());//获取出库单号
+		//删除入库单号记录
+		for (SyPackingListTailoring tailoring : listTailorings){
+			tailoring.setRdrecord32Code(null);
+		}
+
+		String account=maps.get("account").toString();
+		List<String> codes=getList(listTailorings,account);//获取出库单号
+//		System.out.println("account   "+account+"   入库单codes  "+codes);
 		if(codes.size()==0){
 			return "无可推送数据!";
 		}
-		String account=maps.get("account").toString();
 		Map<String,List<String>> customers=getSuppliers(listTailorings);//key：供应商编码，value：出库单单据号
 		if(account.equals("102")){
 			customers=getSuppliers2(codes,listTailorings);//key：供应商编码，value：出库单id
@@ -2301,11 +2307,16 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			}
 //			jsonObject.put("IORIMONEY",item.getUnitPrice());//金额
 			jsonObject1.put("DETAILList",jsonArrays);
-			jsonArrays1.add(jsonObject1);
+			if (syPackingListTailoring.getOmpoAccount().equals(account) && maps.get("isAhaa").toString().equals("国内") ){//国内托书的初始账套不进行推送
+
+			}else{
+				jsonArrays1.add(jsonObject1);
+			}
 		}
-		if( account.equals(maps.get("account1").toString()) && maps.get("isAhaa").toString().equals("国内")){//国内托书的初始账套不进行推送
 
-		}else{
+
+
+		if( jsonArrays1.size()>0 ){//国内托书的初始账套不进行推送
 			text(jsonArrays1,"测试合并推送成衣采购发票");
 			JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"purinvoice_import");//采购发-票单
 			Map<String,String> codeMaps2 =new HashMap<>();
@@ -2439,7 +2450,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			}
 			JSONArray jsonArrays=new JSONArray();
 			List<Object> autoIds=new ArrayList<>();
-			//String iTaxRate=syPackingListTailoringItemMapper.getItaxRate(syPackingListTailoring.getRdrecord32Code());
 			for (SyPackingListTailoringItem item : listFabricItems){
 				JSONObject  jsonObject=new JSONObject();
 				jsonObject.put("IQUANTITY",item.getTotal());//净重