面辅料推送记录多个订单号行号

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -18,6 +18,7 @@ import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem;
 import org.jeecg.modules.spapl.mapper.SyPreAssembledPackingListItemMapper;
 import org.jeecg.modules.spapl.mapper.SyPreAssembledPackingListMapper;
+import org.jeecg.modules.spapl.service.ISyPreAssembledPackingListItemService;
 import org.jeecg.modules.spapl.service.ISyPreAssembledPackingListService;
 import org.jeecg.modules.spapl.vo.PackingHeaderVo;
 import org.jeecg.modules.spapl.vo.PackingLineVo;
@@ -651,6 +652,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					syPreAssembledPackingList.setSyOrderDataId(syShippingDetails.getSyOrderDataId());
 				}
 				lists.add(syPreAssembledPackingList);
+				//syPreAssembledPackingListItemService.saveBatch(listItems);
 				syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);//修改汇总数据
 			}
 			bool=true;
@@ -661,9 +663,13 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		}
 		//System.out.println("listItem"+listItems);
 		//System.out.println("lists"+lists);
+		//saveBatch(lists);
 		return bool;
 	}
 
+	@Autowired
+	private ISyPreAssembledPackingListItemService syPreAssembledPackingListItemService;
+
 	@Override
 	public String excelTest(List<SyPreAssembledPackingList> mains) {
 		String strs="";

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/Order.java

@@ -0,0 +1,9 @@
+package org.jeecg.modules.splfi.entity;
+
+import lombok.Data;
+
+@Data
+public class Order {
+    private String orderNumber;//订单号
+    private String irowno;//行号
+}

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

@@ -33,6 +33,7 @@ import org.jeecg.modules.openApi.service.ISenYuDataSourceTwo;
 import org.jeecg.modules.spapl.entity.SizeTable;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem;
+import org.jeecg.modules.splfi.entity.Order;
 import org.jeecg.modules.splfi.entity.SyPackingListFabric;
 import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
 import org.jeecg.modules.splfi.mapper.SyPackingListFabricItemMapper;
@@ -969,7 +970,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		JSONArray mapLists=new JSONArray();
 		//账套号
 		if (main!=null){
-			Map<String,String> mapSort=new HashMap<>();
+			Map<String, Order> mapSort=new HashMap<>();
 
 			String createBy="进出口平台管理员";
 			//String createDate=main.getCreateTime().toString();
@@ -1183,8 +1184,13 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "ID='"+item.getOmpoIdItem()+"'","ID");
 					}else{
 						if(orderData!=null&&orderData.containsKey("id")){
-							orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "poid='"+orderData.get("id")+"' and ivouchrowno='"+
-									((Map<String,String>)mapt.get("itemSort")).get(item.getId())+"'","ID");//根据行号获取信息
+							Order mapItem1=(Order)((Map<String,Order>)mapt.get("itemSort")).get((item.getId()));//获取订单号
+							System.out.println("获取订单号\t"+mapItem1.getOrderNumber());
+
+							Map<String,Object> orderData2=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapItem1.getOrderNumber()+"'","POID");//委外订单号判断 第一次
+
+							orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "poid='"+orderData2.get("id")+"' and ivouchrowno='"+
+									mapItem1.getIrowno()+"'","ID");//根据行号获取信息
 						}
 					}
 					if(orderDataItem!=null){
@@ -1285,7 +1291,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				if(orderDataItem!=null&&orderDataItem.containsKey("iSOsID")&&orderDataItem.get("iSOsID")!=null){
 					Map<String,Object> orderDataItem2=syPackingListTailoringMapper.getSoMainItem(orderDataItem.get("iSOsID").toString());
 					System.out.println("销售订单\n"+orderDataItem2);
-					mapSort.put(item.getId(),orderDataItem2.get("irowno").toString());
+					Order order=new Order();
+					order.setIrowno(orderDataItem2.get("irowno").toString());
+					order.setOrderNumber(orderDataItem2.get("cSOCode").toString());
+					mapSort.put(item.getId(),order);
 					mapItem3.put("ITAXUNITPRICE",orderDataItem2.get("iTaxUnitPrice"));//原币含税单价（如果传空，取来源单据）（以含税单价为准自动计算相关价格及金额）
 					mapItem3.put("ITAXRATE",orderDataItem2.get("iTaxRate"));//税率（如果传空，取来源单据，无来源单据，取存货档案对应的销项税率）
 					mapItem3.put("SOAUTOIDCOL","ISOSID");//来源单据明细ID对应字段名(如果取销售订单主键，需传固定值ISOSID)

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

@@ -163,7 +163,7 @@
     </select>
 
     <select id="getSoMainItem" parameterType="java.lang.String" resultType="java.util.HashMap">
-        select iTaxUnitPrice,iTaxRate,irowno,AutoID,id,iSOsID    from SO_SODetails where iSOsID=#{id}
+        select iTaxUnitPrice,iTaxRate,irowno,AutoID,id,iSOsID ,cSOCode   from SO_SODetails where iSOsID=#{id}
     </select>
 
     <select id="getOrderDataId" parameterType="java.lang.String" resultType="java.lang.String">