成衣装箱单

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

@@ -1985,7 +1985,7 @@ public class SyPackingListTailoringController implements Job {
 			 //List<SyPackingListFabricItem> listFabricItems=syPackingListFabricItemService.queryByList(id);//获取托书下所有的主表信
 			 Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(listTailorings.get(0).getId());//获取一些日期信息
 			 Map<String,List<SyPackingListTailoring>> listMap=new HashMap<>();
-			 Map<String,List<String>> listStrMap=new HashMap<>();
+			 //Map<String,List<String>> listStrMap=new HashMap<>();
 			 for (SyPackingListTailoring tailoring : listTailorings){
 				if (!tailoring.getPushState().equals("1")&&!tailoring.getPushState().equals("4")){
 					codeMaps.put("error","需要装箱单全部推送成功，才能推送发票");//失败信息
@@ -2015,20 +2015,20 @@ public class SyPackingListTailoringController implements Job {
 					tailoring.setEndCustomer(syOrderData.getEndCustomer());
 				}
 				tailoring.setSyPackingListTailoringItemList(tailoringItemList);
-				if (tailoring.getPushState().equals("1")){
+				//if (tailoring.getPushState().equals("1")){
 					if(listMap.containsKey(tailoring.getOmpoAccount())){
 						listMap.get(tailoring.getOmpoAccount()).add(tailoring);
 
-						listStrMap.get(tailoring.getOmpoAccount()).add(tailoring.getId());
+						//listStrMap.get(tailoring.getOmpoAccount()).add(tailoring.getId());
 					}else{
 						List<SyPackingListTailoring> listTailorings1=new ArrayList<>();
 						listTailorings1.add(tailoring);
 						listMap.put(tailoring.getOmpoAccount(),listTailorings1);
-						List<String> stringList=new ArrayList<>();
-						stringList.add(tailoring.getId());
-						listStrMap.put(tailoring.getOmpoAccount(),stringList);
+						//List<String> stringList=new ArrayList<>();
+						//stringList.add(tailoring.getId());
+						//listStrMap.put(tailoring.getOmpoAccount(),stringList);
 					}
-				}
+				//}
 			 }
 			 String message="";
 			 for (String key : listMap.keySet()){
@@ -2049,28 +2049,44 @@ public class SyPackingListTailoringController implements Job {
 					try{
 						if(i==0){
 							maps.put("account","103");//账套号
-							message+=syPackingListTailoringService.pushInvoice3(listMap.get(key), maps);
+							message+=syPackingListTailoringService.pushInvoice3(listTailorings, maps);
 						}else if(i==1){
 							maps.put("account","102");//账套号
-							message+=syPackingListTailoringService.pushInvoice2(listMap.get(key), maps);
+							message+=syPackingListTailoringService.pushInvoice2(listTailorings, maps);
 						}else if(i==2){
 							maps.put("account","101");//账套号
-							message+=syPackingListTailoringService.pushInvoice1(listMap.get(key), maps);
+							message+=syPackingListTailoringService.pushInvoice1(listTailorings, maps);
 						}
 					}catch (Exception e){
 						e.printStackTrace();
+						String msg2= null;
+						try {
+							msg2 = getExceptionStr(e);
+						} catch (IOException ex) {
+							ex.printStackTrace();
+						}
+						System.out.println("托书发票推送报错");
+						log.info("托书发票推送报错\t"+msg2);
 					}
 
 					try{
 						if(i==0){
-							message+=syPackingListTailoringService.pushInvoice6(listMap.get(key), maps);
+							message+=syPackingListTailoringService.pushInvoice6(listTailorings, maps);
 						}else if(i==1){
-							message+=syPackingListTailoringService.pushInvoice5(listMap.get(key), maps);
+							message+=syPackingListTailoringService.pushInvoice5(listTailorings, maps);
 						}else if(i==2){
-							message+=syPackingListTailoringService.pushInvoice4(listMap.get(key), maps);
+							message+=syPackingListTailoringService.pushInvoice4(listTailorings, maps);
 						}
 					}catch (Exception e){
 						e.printStackTrace();
+						String msg2= null;
+						try {
+							msg2 = getExceptionStr(e);
+						} catch (IOException ex) {
+							ex.printStackTrace();
+						}
+						System.out.println("托书发票推送报错");
+						log.info("托书发票推送报错\t"+msg2);
 					}
 				}
 			}