tjx
昨天 b00edf4891b49f400263601492c3dc819cb7c8a9
src/main/java/com/gs/xky/service/XkyService.java
@@ -97,13 +97,22 @@
    private void processBatchDeliveries(List<XkyEntity> batchDeliveries) {
        batchDeliveries.forEach(deliveryNo -> {
            try {
                if ("6".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
                if ("6".equals(deliveryNo.getStatus()) || "8".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
                    log.info("【processBatchDeliveries】移除送货单: {}", deliveryNo.getDeliveryNo());
                    remove1(deliveryNo);
                } else if ("1".equals(deliveryNo.getStatus()) && ("2".equals(deliveryNo.getLogisticsStatus()) || "1".equals(deliveryNo.getLogisticsStatus()))) {
                    log.info("【processBatchDeliveries】处理送货单: {}, 物流状态: {}", deliveryNo.getDeliveryNo(), deliveryNo.getLogisticsStatus());
                    XkyDetail detail = getDetail(deliveryNo.getDeliveryNo());
                    deliveryNoticeService.saveDeliveryNotice(detail);
                    // 数据插入后,处理PO_ERP_NO为null的记录
                    try {
                        deliveryNoticeService.setDeliveryNotice();
                        log.info("【processBatchDeliveries】PO_ERP_NO null值处理完成: {}", deliveryNo.getDeliveryNo());
                    } catch (Exception e) {
                        log.error("【processBatchDeliveries】处理PO_ERP_NO null值异常: {}, 异常: {}", deliveryNo.getDeliveryNo(), e.getMessage(), e);
                    }
                    List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
                    barcodeInformationService.SaveBarcodeInformation(barcodeDeliveryNos, deliveryNo.getDeliveryNo());
                    //已送达的才自动转换为MES到货单
@@ -146,6 +155,13 @@
                    .set(MesInvItemArn::getSyncMsg, "SRM手动删除送货单");
            mesInvItemArnService.update(updateWrapper);
            //MesInvItemArnDetail
            LambdaUpdateWrapper<MesInvItemArnDetail> deleteWrapper = new LambdaUpdateWrapper<>();
            deleteWrapper.eq(MesInvItemArnDetail::getMid, mesInvItemArn.getId())
                    .set(MesInvItemArnDetail::getReturnFlag, 1);
            mesInvItemArnDetailService.update(deleteWrapper);
            // 删除MesQaItemsDetect01表的数据
            mesQaItemsDetect01Service.removeQa(mesInvItemArn.getBillNo());
        }