面辅料推送调整

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

@@ -3409,7 +3409,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	public List<String> getList2(List<SyPackingListFabric> listFabrics){
 		List<String> ids=new ArrayList<>();//获取出库单号
 		for (SyPackingListFabric syPackingListFabric : listFabrics){
-			if(syPackingListFabric.getDocumentNo().substring(0,3).equals("102")){
+			String account=syPackingListFabric.getDocumentNo().substring(0,3);
+			if(account.equals("102")&&(syPackingListFabric.getSaleInvoiceCode()==null||syPackingListFabric.getSaleInvoiceCode().indexOf(account+"销售发票")==-1)){
 				ids.add(syPackingListFabric.getDocumentNo().substring(3));
 				syPackingListFabric.setRdrecord32Code(syPackingListFabric.getDocumentNo().substring(3));
 			}
@@ -3420,14 +3421,16 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	public List<String> getList3(List<SyPackingListFabric> listFabrics){
 		List<String> ids=new ArrayList<>();//获取出库单号
 		for (SyPackingListFabric syPackingListFabric : listFabrics){
-			if(syPackingListFabric.getDocumentNo().substring(0,3).equals("102")){
+			String account=syPackingListFabric.getDocumentNo().substring(0,3);
+			String account1="101";
+			if(account.equals("102")&&(syPackingListFabric.getSaleInvoiceCode()==null||syPackingListFabric.getSaleInvoiceCode().indexOf(account1+"采购发票")==-1)){
 				ids.add(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")){
+			if(account.equals("103")&&(syPackingListFabric.getSaleInvoiceCode()==null||syPackingListFabric.getSaleInvoiceCode().indexOf(account1+"采购发票")==-1)){
 				ids.add(syPackingListFabric.getDocumentNo().substring(3));
 				String rdrecord01Code=syPackingListTailoringItemMapper.getRdrecord01Code(syPackingListFabric.getDocumentNo().substring(3),"0000000001");
 				System.out.println("rdrecord01Code     "+rdrecord01Code);