协客云的三个接口修改

啊鑫

2025-02-15 ccbf66ef68ea3c96d81dd2c456824900b5020eeb

 src/main/java/com/gs/xky/service/XkyService.java

@@ -10,6 +10,8 @@
import com.gs.xky.dto.XkyDetail;
import com.gs.xky.dto.XkyEntity;
import com.gs.xky.entity.DeliveryNotice;
import com.gs.xky.entity.DeliveryNoticeDetail;
import com.gs.xky.entity.TblBarcodeInformation;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -28,6 +30,7 @@
    private final DeliveryNoticeService deliveryNoticeService;

    private final TblBarcodeInformationService barcodeInformationService;
    private final DeliveryNoticeDetailService deliveryNoticeDetailService;

    public void GetSaveDetail() throws IOException {
        long currentTimeMillis = System.currentTimeMillis();
@@ -35,15 +38,15 @@
        XkyCommonParam param = XkyCommonParam.GetInit();

        // 计算五分钟前的时间戳
        long startDate = currentTimeMillis - (65 * 60 * 1000); // 5 分钟 = 5 * 60 * 1000 毫秒
        long startDate = currentTimeMillis - (5 * 60 * 1000); // 5 分钟 = 5 * 60 * 1000 毫秒

        // 创建 BodyParam 对象并赋值
        BodyParam bodyParam = new BodyParam();
        bodyParam.setStartDate(startDate);
        bodyParam.setEndDate(currentTimeMillis);
        bodyParam.setErpCode(DataAcquisitionConfiguration.TEST_ERP_CODE);
        bodyParam.setStatus(new int[]{1});
        bodyParam.setLogisticsStatus(2);
        bodyParam.setStatus(new int[]{1, 4, 6});
//        bodyParam.setLogisticsStatus(2);

        param.setBody(bodyParam);

@@ -55,19 +58,39 @@

        LambdaUpdateWrapper<DeliveryNotice> deliveryNoticeWrapper = new LambdaUpdateWrapper<>();

        LambdaUpdateWrapper<DeliveryNoticeDetail> updateWrapper = new LambdaUpdateWrapper<>();

        LambdaUpdateWrapper<TblBarcodeInformation> updateWrapper1 = new LambdaUpdateWrapper<>();

        deliveryNoList.forEach(deliveryNo -> {
            try {

                if ("4".equals(deliveryNo.getStatus()) || "8".equals(deliveryNo.getStatus())) {
                if ("6".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
                    deliveryNoticeWrapper.clear();
                    updateWrapper.clear();
                    updateWrapper1.clear();
                    deliveryNoticeWrapper.eq(DeliveryNotice::getDeliveryNo, deliveryNo.getDeliveryNo());
                    deliveryNoticeService.remove(deliveryNoticeWrapper);

                    DeliveryNotice one = deliveryNoticeService.getOne(deliveryNoticeWrapper, false);

                    if (deliveryNoticeService.remove(deliveryNoticeWrapper)) {

                        updateWrapper.eq(DeliveryNoticeDetail::getPid, one.getId());
                        deliveryNoticeDetailService.remove(updateWrapper);

                        updateWrapper1.eq(TblBarcodeInformation::getDeliveryNo, deliveryNo.getDeliveryNo());
                        barcodeInformationService.remove(updateWrapper1);
                    }

                } else if ("2".equals(deliveryNo.getLogisticsStatus())) {
                    XkyDetail detail = getDetail(deliveryNo.getDeliveryNo());
                    deliveryNoticeService.saveDeliveryNotice(detail);
                    List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
                    barcodeInformationService.SaveBarcodeInformation(barcodeDeliveryNos, deliveryNo.getDeliveryNo());

                    deliveryNoticeService.callPdaReceiptBtn("送货单签收[BTNOK[PL017[" + deliveryNo.getDeliveryNo(), "");
                }

                XkyDetail detail = getDetail(deliveryNo.getDeliveryNo());
                deliveryNoticeService.saveDeliveryNotice(detail);
                List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
                barcodeInformationService.SaveBarcodeInformation(barcodeDeliveryNos, deliveryNo.getDeliveryNo());
            } catch (IOException e) {
                throw new RuntimeException(e);
            }