发票推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -615,6 +615,7 @@ public class SyPackingListFabricController implements Job {
 				 message = syPackingListFabricService.pushInvoice(listFabrics1);//推送103销售发票
 				 message = syPackingListFabricService.pushInvoiceTwo(listFabrics2);//推送102销售发票
 				 message = syPackingListFabricService.pushInvoiceOne(listFabrics2);//推送101采购发票
+				 message = syPackingListFabricService.pushInvoiceOne(listFabrics1);//推送101采购发票
 			 }catch (Exception e){
 				 e.printStackTrace();
 			 }

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

@@ -3051,6 +3051,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			return "无可推送数据!";
 		}
 		Map<String,List<String>> customers=getSuppliers(listFabrics);//key：供应商编码，value：入库单单据号
+		System.out.println("listFabricCustomers  "+customers);
 //		System.out.println("customers  "+customers);
 		Map<String,List<SyPackingListFabricItem>> listFabricItemMaps=getListFabricItemMaps(customers,listFabrics);//key：供应商编码，value：子表数据
 		Map<String,List<SyPackingListFabric>> listFabricMaps=getListFabricMaps(customers,listFabrics);//key：供应商编码，value：主表数据
@@ -3239,9 +3240,11 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			if(mapLists.containsKey(tailoring.getCdepCode())){
 				mapLists.get(tailoring.getCdepCode()).add(tailoring.getRdrecord32Code());
 			}else{
-				List<String> list=new ArrayList<>();
-				list.add(tailoring.getRdrecord32Code());
-				mapLists.put(tailoring.getCdepCode(),list);
+				if (tailoring.getCdepCode()!=null){
+					List<String> list=new ArrayList<>();
+					list.add(tailoring.getRdrecord32Code());
+					mapLists.put(tailoring.getCdepCode(),list);
+				}
 			}
 		}
 		return mapLists;
@@ -3419,7 +3422,15 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		for (SyPackingListFabric syPackingListFabric : listFabrics){
 			if(syPackingListFabric.getDocumentNo().substring(0,3).equals("102")){
 				ids.add(syPackingListFabric.getDocumentNo().substring(3));
-				String rdrecord01Code=syPackingListTailoringItemMapper.getRdrecord01Code(syPackingListFabric.getDocumentNo().substring(3));
+				String rdrecord01Code=syPackingListTailoringItemMapper.getRdrecord01Code(syPackingListFabric.getDocumentNo().substring(3),"0000000002");
+				syPackingListFabric.setRdrecord32Code(rdrecord01Code);
+				String cdepCode=syPackingListTailoringItemMapper.getRdrecord01(rdrecord01Code);
+				syPackingListFabric.setCdepCode(cdepCode);
+			}
+			if(syPackingListFabric.getDocumentNo().substring(0,3).equals("103")){
+				ids.add(syPackingListFabric.getDocumentNo().substring(3));
+				String rdrecord01Code=syPackingListTailoringItemMapper.getRdrecord01Code(syPackingListFabric.getDocumentNo().substring(3),"0000000001");
+				System.out.println("rdrecord01Code     "+rdrecord01Code);
 				syPackingListFabric.setRdrecord32Code(rdrecord01Code);
 				String cdepCode=syPackingListTailoringItemMapper.getRdrecord01(rdrecord01Code);
 				syPackingListFabric.setCdepCode(cdepCode);

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

@@ -57,7 +57,7 @@ public interface SyPackingListTailoringItemMapper extends BaseMapper<SyPackingLi
 	 */
 	List<SyPackingListTailoringItem> getSrmPushExtraList(@Param("prePackingIdList")List<String> prePackingIdList);
 
-	String getRdrecord01Code(String substring);
+	String getRdrecord01Code(@Param("substring")String substring,@Param("accid")String accid);
 
 	String getRdrecord01(String substring);
 }

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

@@ -424,7 +424,7 @@
 	<select id="getRdrecord01Code"  parameterType="String" resultType="String">
         SELECT A.cvoucherno FROM UFDATA_103_2021.dbo.HY_DZ_K7_SYNERGISMLOGDT  A
         LEFT JOIN UFDATA_103_2021.dbo.HY_DZ_K7_SYNERGISMLOGDT B ON A.id=B.id AND A.ilineno=B.ilineno+1
-        WHERE B.cvoucherno=#{value } AND B.accid='0000000002'
+        WHERE B.cvoucherno=#{substring} AND B.accid=#{accid}
     </select>
 
 	<select id="getRdrecord01"  parameterType="String" resultType="String">