11

啊鑫

2025-05-07 dff0470bf77f3fa525a9d1f1f761dd9609072205

 src/main/java/com/gs/xiaomi/service/XM104Service.java

@@ -5,6 +5,8 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.gs.xiaomi.config.DataAcquisitionConfiguration;
import com.gs.xiaomi.dto.*;
import com.gs.xiaomi.entity.DeliveryDetail;
@@ -20,6 +22,11 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;

@Service
@Transactional(rollbackFor = Exception.class)
@@ -73,7 +80,9 @@
            //获取所有的ASN号
            List<EtHeader> etHeaders = deliveryNo.getEtHeaders();

            etHeaders.forEach(etHeader -> {
            List<EtHeader> collect = etHeaders.stream().filter(distinctByKey(EtHeader::getZzasn)).collect(Collectors.toList());

            collect.forEach(etHeader -> {

                log.info("1.获取到送货单号: {}", etHeader.getZzasn());

@@ -114,10 +123,39 @@
        return bizDocumentResult;
    }

    private <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
        Map<Object, Boolean> seen = new ConcurrentHashMap<>();
        return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
    }

    private void setDeliveryMain(BizDocumentResult result) {
        List<EtHeader> etHeaders = result.getEtHeaders();

        etHeaders.forEach(etHeader -> {

            LambdaQueryWrapper<DeliveryMain> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.eq(DeliveryMain::getZzasn, etHeader.getZzasn());

            DeliveryMain one = deliveryMainService.getOne(queryWrapper, false);

            if (one != null) {
                deliveryMainService.removeById(one.getId());

                LambdaUpdateWrapper<DeliveryDetail> updateWrapper = new LambdaUpdateWrapper<>();
                updateWrapper.eq(DeliveryDetail::getPid, one.getId());
                deliveryDetailService.remove(updateWrapper);

                //PackageDetail
                LambdaUpdateWrapper<PackageDetail> updateWrapper1 = new LambdaUpdateWrapper<>();
                updateWrapper1.eq(PackageDetail::getPid, one.getId());
                packageDetailService.remove(updateWrapper1);

                //LogisticsPackage
                LambdaUpdateWrapper<LogisticsPackage> updateWrapper2 = new LambdaUpdateWrapper<>();
                updateWrapper2.eq(LogisticsPackage::getPid, one.getId());
                logisticsPackageService.remove(updateWrapper2);
            }

            DeliveryMain deliveryMain = new DeliveryMain();

            BeanUtil.copyProperties(etHeader, deliveryMain);
@@ -170,6 +208,7 @@

            }

            //deliveryMainService.callPdaReceiptBtn("送货单签收[BTNOK[PL017[" + etHeader.getZzasn(), "");
        });
    }

@@ -188,4 +227,17 @@
            return false;
        }
    }

    public boolean manualSynchronizationByDate(NumbericalDto numbericalDto) {
        try {
            BizDocument doc = new BizDocument();
            doc.setLifnr(DataAcquisitionConfiguration.LIFNR);
            doc.setBizDate(numbericalDto.getDate());
            getXM104(doc);
            return true;
        } catch (Exception e) {
            log.error("【手动读取ASN异常】 异常: {}", e.getMessage(), e);
            return false;
        }
    }
}