Merge remote-tracking branch 'origin/master'

YYC

2025-09-22 ee96821fc7990857ad6477690a5758f8c0ebaa66

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java

@@ -17,9 +17,12 @@
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.text.ParseException;
import java.util.*;
import java.util.stream.Collectors;

@@ -112,6 +115,9 @@
                if (inoutData.getRecordStatus().equals("DEL") || inoutData.getRecordStatus().equals("ERROR")) {
                    continue;
                }
                if (!inoutData.getProgress().equals("RECORD")){
                    continue;
                }
                ids = new ArrayList<>();
                wjlx = "";
                //获取出入库业务单号信息
@@ -171,13 +177,19 @@
                                num = 1;
                                idsNum ++;
                            }
                            bizTag = sysData.getBizTag();
                        }else {
                            if(num > 8){
                                num = 1;
                                idsNum ++;
                            }
                            bizTag = null;
                        }
                        //2024-05-23 此处暂时设置名称长度限制，后期调整后可删除
                        if(sysData.getCreateTime().after(DateUtils.parseDate("2024-04-18",new String[]{"yyyy-MM-dd"}))){
                            if(StringUtils.isNotEmpty(inoutData.getTransType()) && inoutData.getTransType().equals("3")){
                                bizTag = sysData.getBizTag();
                            }else {
                                bizTag = null;
                            }
                        }
                        if(idsNum == ids.size()){
                            break;