销售发票、采购发票分组

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

@@ -221,6 +221,11 @@ public class SyPackingListFabric implements Serializable {
 	@TableField(exist = false)
 	private String rdrecord32Code;
 
+	/*rdrecord32Code*/
+	@ApiModelProperty(value = "暂存部门编码")
+	@TableField(exist = false)
+	private String cdepCode;
+
 	/**业务员*/
 	@Excel(name = "业务员 Merchandiser", width = 15)
 	@ApiModelProperty(value = "业务员")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricMapper.xml

@@ -193,7 +193,7 @@
 
 
     <select id="getCustomers"  parameterType="java.lang.String" resultType="java.util.HashMap">
-         select cCusCode,ccode  from rdrecord32
+         select cCusCode,ccode,cDepCode from rdrecord32
         where ccode in
         <foreach collection="codes" item="value" index="index" open="(" separator="," close=")">
             #{value}

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

@@ -2888,7 +2888,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		if(codes.size()==0){
 			return "推送失败,未查询到对应的出库单号!";
 		}
-		Map<String,List<String>> customers=getCustomers(codes);//key：供应商编码，value：出库单id
+		Map<String,List<String>> customers=getCustomers2(codes);//key：供应商编码，value：出库单id
 		Map<String,List<SyPackingListFabricItem>> listFabricItemMaps=getListFabricItemMaps(customers,listFabrics);//key：供应商编码，value：子表数据
 		Map<String,List<SyPackingListFabric>> listFabricMaps=getListFabricMaps(customers,listFabrics);//key：供应商编码，value：主表数据
 		Map<String,List<SyPackingListFabric>> codeMaps=new HashMap<>();//key：传入销售发票单id，value：主表数据
@@ -3237,12 +3237,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	public Map<String,List<String>> getSuppliers(List<SyPackingListFabric> listTailorings){
 		Map<String,List<String>> mapLists=new HashMap<>();
 		for (SyPackingListFabric tailoring : listTailorings){
-			if(mapLists.containsKey("nbsy")){
-				mapLists.get("nbsy").add(tailoring.getRdrecord32Code());
+			if(mapLists.containsKey(tailoring.getCdepCode())){
+				mapLists.get(tailoring.getCdepCode()).add(tailoring.getRdrecord32Code());
 			}else{
 				List<String> list=new ArrayList<>();
 				list.add(tailoring.getRdrecord32Code());
-				mapLists.put("nbsy",list);
+				mapLists.put(tailoring.getCdepCode(),list);
 			}
 		}
 		return mapLists;
@@ -3335,6 +3335,23 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		return mapLists;
 	}
 
+	public Map<String,List<String>> getCustomers2(List<String> codes){
+		List<Map<String,Object>> customers=syPackingListFabricMapper.getCustomers(codes.toArray(new String[codes.size()]));
+		Map<String,List<String>> mapLists=new HashMap<>();
+		//System.out.println("customers.size\t"+customers.size());
+		//System.out.println("customers\t"+customers);
+		for (Map<String,Object> map : customers){
+			if(mapLists.containsKey(map.get("cDepCode"))){
+				mapLists.get(map.get("cDepCode").toString()).add(map.get("ccode").toString());
+			}else{
+				List<String> list=new ArrayList<>();
+				list.add(map.get("ccode").toString());
+				mapLists.put(map.get("cDepCode").toString(),list);
+			}
+		}
+		return mapLists;
+	}
+
 	public Map<String,List<SyPackingListFabric>> getListFabricMaps(Map<String,List<String>> customers,List<SyPackingListFabric> listFabrics){
 		Map<String,List<SyPackingListFabric>> mapLists=new HashMap<>();
 		for (String customer: customers.keySet()){
@@ -3405,6 +3422,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				ids.add(syPackingListFabric.getDocumentNo().substring(3));
 				String rdrecord01Code=syPackingListTailoringItemMapper.getRdrecord01Code(syPackingListFabric.getDocumentNo().substring(3));
 				syPackingListFabric.setRdrecord32Code(rdrecord01Code);
+				String cdepCode=syPackingListTailoringItemMapper.getRdrecord01(rdrecord01Code);
+				syPackingListFabric.setCdepCode(cdepCode);
 			}
 		}
 		return ids;

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

@@ -58,4 +58,6 @@ public interface SyPackingListTailoringItemMapper extends BaseMapper<SyPackingLi
 	List<SyPackingListTailoringItem> getSrmPushExtraList(@Param("prePackingIdList")List<String> prePackingIdList);
 
 	String getRdrecord01Code(String substring);
+
+	String getRdrecord01(String substring);
 }

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

@@ -427,4 +427,7 @@
         WHERE B.cvoucherno=#{value } AND B.accid='0000000002'
     </select>
 
+	<select id="getRdrecord01"  parameterType="String" resultType="String">
+        SELECT cDepCode FROM RdRecord01 where ccode=#{value}
+    </select>
 </mapper>

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

@@ -276,7 +276,7 @@
     </select>
 
     <select id="getOmOrPo" parameterType="java.lang.String" resultType="java.util.HashMap">
-        select cvencode,nflat,cPayCode,${id} as id,cexch_name as cexchname,cBusType  from ${tableName}
+        select cvencode,nflat,cPayCode,${id} as id,cexch_name as cexchname,cBusType,cDepCode  from ${tableName}
         where  ${orderName}
     </select>