托书发票推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -1972,8 +1972,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			 }else{
 				 itemList =syShippingOrderMapper.qeuryItemInfoTa(entity.getId());
 			 }
-
-			 //集合转map
+			 List<String> stringIds=new ArrayList<>();
+ 			 //集合转map
 			 for (SyShippingOrderItem li : itemList) {
 				 totalNetWeight = totalNetWeight.add(li.getGrossWeight());
 				 Field[] fieldsList = li.getClass().getDeclaredFields();
@@ -1983,6 +1983,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 mapList.put(field.getName(), field.get(li));
 				 }
 				 listmap.add(mapList);
+				 stringIds.add(li.getTailoringFabricItemId());
 			 }
 
 			 //总毛重可能不对，重新替换
@@ -2026,11 +2027,24 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 return result;
 
 			 }
+//			 System.out.println("listmap.size\t"+listmap.size());
+//			 System.out.println("listmap\n"+listmap);
+			 List<SyPackingListFabricItem> fabricEntitys = syPackingListFabricItemService.listByIds(stringIds);
+			 List<SyPackingListTailoringItem> tailoringEntitys = syPackingListTailoringItemService.listByIds(stringIds);
+			 Map<String,SyPackingListFabricItem> fabricItemMaps=new HashMap<>();
+			 Map<String,SyPackingListTailoringItem> tailoringItemMaps=new HashMap<>();
+			 fabricEntitys.forEach(f->{
+				 fabricItemMaps.put(f.getId(),f);
+			 });
+			 tailoringEntitys.forEach(t->{
+				 tailoringItemMaps.put(t.getId(),t);
+			 });
+
 			 //查询装箱单子表，获取销售订单主表ID
 			 for (Map<String, Object> li : listmap) {
+				 SyPackingListFabricItem fabricEntity=fabricItemMaps.get(li.get("tailoringFabricItemId").toString());
+				 SyPackingListTailoringItem tailoringEntity=tailoringItemMaps.get(li.get("tailoringFabricItemId").toString());
 				 //查面料
-				 SyPackingListFabricItem fabricEntity = syPackingListFabricItemService.getById(li.get("tailoringFabricItemId").toString());
-				 SyPackingListTailoringItem tailoringEntity = syPackingListTailoringItemService.getById(li.get("tailoringFabricItemId").toString());
 				 if (oConvertUtils.isNotEmpty(fabricEntity)) {
 					 //获取业务员编码、销售部门编码、客户简称
 					 li.put("orderId", fabricEntity.getSyOrderDataId());// = syShippingOrderMapper.querySOMain();
@@ -2195,6 +2209,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		 String message="";
 
 		 try {
+//			List<String> stringIds=Arrays.asList(ids);
+//		 	List<SyShippingOrder> entitys = syShippingOrderService.listByIds(stringIds);
 		 	for(String id : ids){
 				 SimpleDateFormat sf = new SimpleDateFormat("yyyy-M-dd 00:00:00.000");
 
@@ -2244,6 +2260,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 }
 
 				 //集合转map
+				 List<String> stringIds=new ArrayList<>();
 				 for (SyShippingOrderItem li : itemList) {
 					 totalNetWeight = totalNetWeight.add(li.getGrossWeight());
 					 Field[] fieldsList = li.getClass().getDeclaredFields();
@@ -2253,6 +2270,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 						 mapList.put(field.getName(), field.get(li));
 					 }
 					 listmap.add(mapList);
+					 stringIds.add(li.getTailoringFabricItemId());
 				 }
 
 				 //总毛重可能不对，重新替换
@@ -2298,11 +2316,22 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 continue;
 
 				 }
-				 //查询装箱单子表，获取销售订单主表ID
+				List<SyPackingListFabricItem> fabricEntitys = syPackingListFabricItemService.listByIds(stringIds);
+				List<SyPackingListTailoringItem> tailoringEntitys = syPackingListTailoringItemService.listByIds(stringIds);
+				Map<String,SyPackingListFabricItem> fabricItemMaps=new HashMap<>();
+				Map<String,SyPackingListTailoringItem> tailoringItemMaps=new HashMap<>();
+				fabricEntitys.forEach(f->{
+					fabricItemMaps.put(f.getId(),f);
+				});
+				tailoringEntitys.forEach(t->{
+					tailoringItemMaps.put(t.getId(),t);
+				});
+
+				//查询装箱单子表，获取销售订单主表ID
 				 for (Map<String, Object> li : listmap) {
 					 //查面料
-					 SyPackingListFabricItem fabricEntity = syPackingListFabricItemService.getById(li.get("tailoringFabricItemId").toString());
-					 SyPackingListTailoringItem tailoringEntity = syPackingListTailoringItemService.getById(li.get("tailoringFabricItemId").toString());
+					 SyPackingListFabricItem fabricEntity=fabricItemMaps.get(li.get("tailoringFabricItemId").toString());
+					 SyPackingListTailoringItem tailoringEntity=tailoringItemMaps.get(li.get("tailoringFabricItemId").toString());
 					 if (oConvertUtils.isNotEmpty(fabricEntity)) {
 						 //获取业务员编码、销售部门编码、客户简称
 						 li.put("orderId", fabricEntity.getSyOrderDataId());// = syShippingOrderMapper.querySOMain();

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

@@ -2694,7 +2694,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		//List<SyPackingListFabricItem> listFabricItems=syPackingListFabricItemMapper.queryByList(id); totalPrice
 		//List<SyPackingListFabric> listFabrics=syPackingListFabricMapper.queryByList(id);//获取托书下所有的主表信息
 		List<String> codes=getList(listFabrics);//获取出库单号
-		//System.out.println("面辅料查看出库单号\t"+codes);
+		System.out.println("103面辅料查看出库单号\t"+codes);
 		if(codes.size()==0){
 			return "推送失败,未查询到对应的出库单号!";
 		}
@@ -2863,6 +2863,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			//System.out.println("互相插入数据时用的时间：" + (endTime - startTime) + "ms");
 		}
 		text(jsonArrays1,"测试合并推送面辅料销售发票");
+		System.out.println("103销售发票JSON\t"+jsonArrays1);
 		JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"saleinvoice_import");//销售发票单
 		Map<String,String> codeMaps2 = result(resturnJsonArrays);
 		for (String code1 : codeMaps.keySet()){
@@ -2892,7 +2893,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	@DS("multi-two")
 	public String pushInvoiceTwo(List<SyPackingListFabric> listFabrics) {
 		List<String> codes=getList2(listFabrics);//获取出库单号
-		System.out.println("面辅料查看出库单号\t"+codes);
+		System.out.println("102面辅料查看出库单号\t"+codes);
 		if(codes.size()==0){
 			return "推送失败,未查询到对应的出库单号!";
 		}
@@ -3028,7 +3029,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 //		System.out.println("测试合并推送面辅料销售发票  \n"+jsonArrays1);
 		text(jsonArrays1,"测试合并推送面辅料销售发票");
-//		System.out.println("102销售发票\t"+jsonArrays1);
+		System.out.println("102销售发票JSON\t"+jsonArrays1);
 		JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"saleinvoice_import");//销售发票单
 		Map<String,String> codeMaps2 = result2(resturnJsonArrays);
 		for (String code1 : codeMaps.keySet()){
@@ -3415,7 +3416,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						}
 					}
 				}
-			}else if(syPackingListFabric.getDocumentNo().substring(0,3).equals("103")){
+			}else if(syPackingListFabric.getDocumentNo().substring(0,3).equals("103")&&syPackingListFabric.getSaleInvoiceCode()==null){
 				ids.add(syPackingListFabric.getDocumentNo().substring(3));
 				syPackingListFabric.setRdrecord32Code(syPackingListFabric.getDocumentNo().substring(3));
 			}