diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/repository/mapper/ElectronicSignatureMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/repository/mapper/ElectronicSignatureMapper.java index e7090f590..5c29d4feb 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/repository/mapper/ElectronicSignatureMapper.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/repository/mapper/ElectronicSignatureMapper.java @@ -79,6 +79,27 @@ public interface ElectronicSignatureMapper extends BaseMapper" + + "UPDATE NGWL_TEST_OMS.ELECTRONIC_SIGNATURE SET " + + "SIGNATURE_STATUS = 2, " + + "SIGNATURE_TIME = #{signatureTime}, " + + "SIGNATURE_PIC = #{signaturePic}, " + + "EVIDENCE_PICS = #{evidencePics}, " + + "SIGNATURE_REMARK = #{signatureRemark}, " + + "SIGNATURE_MODE = #{signatureMode}, " + + "UPDATE_TIME = #{signatureTime} " + + "WHERE ORDER_ID IN " + + "#{id}" + + " AND DEL_FLAG = 1 AND SIGNATURE_STATUS = 1" + + "") + int batchUpdateSignByOrder(@Param("signatureIds") List signatureIds, + @Param("signatureTime") Date signatureTime, + @Param("signaturePic") String signaturePic, + @Param("evidencePics") String evidencePics, + @Param("signatureRemark") String signatureRemark, + @Param("signatureMode") Integer signatureMode); + /** * 根据签名ID列表批量查询 */ diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/service/ElectronicSignatureDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/service/ElectronicSignatureDomainService.java index ff5b98e1d..26facb3d5 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/service/ElectronicSignatureDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/service/ElectronicSignatureDomainService.java @@ -250,7 +250,7 @@ public class ElectronicSignatureDomainService { evidencePicsStr = String.join(",", dto.getEvidencePics()); } - int updated = electronicSignatureMapper.batchUpdateSign( + int updated = electronicSignatureMapper.batchUpdateSignByOrder( signatureIds, now, dto.getSignaturePic(), evidencePicsStr, @@ -259,38 +259,38 @@ public class ElectronicSignatureDomainService { log.info("批量签名:OMS电子签名表更新 {} 条", updated); // 3. 按订单类型分组,调用WMS更新入/出库表 - if (wmsServiceFeign != null) { - try { - // 分组:IN-入库、OUT-出库 - List inOrderIds = signatureList.stream() - .filter(s -> "IN".equals(s.getOrderType())) - .map(ElectronicSignature::getOrderId) - .distinct() - .collect(Collectors.toList()); - List outOrderIds = signatureList.stream() - .filter(s -> "OUT".equals(s.getOrderType())) - .map(ElectronicSignature::getOrderId) - .distinct() - .collect(Collectors.toList()); - - // 构建 WMS 批量签名 DTO(一次调用同时处理入库+出库) - SignatureBatchFeignDTO wmsDto = new SignatureBatchFeignDTO(); - wmsDto.setInOrderIds(inOrderIds.isEmpty() ? null : inOrderIds); - wmsDto.setOutOrderIds(outOrderIds.isEmpty() ? null : outOrderIds); - wmsDto.setSignatureStatus(2); - wmsDto.setSignatureTime(now); - wmsDto.setSignaturePic(dto.getSignaturePic()); - wmsDto.setEvidencePics(evidencePicsStr); - wmsDto.setSignatureRemark(dto.getSignatureRemark()); - - log.info("批量签名:调用WMS更新入/出库单,入库{}条,出库{}条", - inOrderIds.size(), outOrderIds.size()); - wmsServiceFeign.batchSignWms(wmsDto); - } catch (Exception e) { - log.error("批量签名:调用WMS更新入/出库表失败", e); - // WMS更新失败不影响OMS表更新结果,仅记录日志 - } - } +// if (wmsServiceFeign != null) { +// try { +// // 分组:IN-入库、OUT-出库 +// List inOrderIds = signatureList.stream() +// .filter(s -> "IN".equals(s.getOrderType())) +// .map(ElectronicSignature::getOrderId) +// .distinct() +// .collect(Collectors.toList()); +// List outOrderIds = signatureList.stream() +// .filter(s -> "OUT".equals(s.getOrderType())) +// .map(ElectronicSignature::getOrderId) +// .distinct() +// .collect(Collectors.toList()); +// +// // 构建 WMS 批量签名 DTO(一次调用同时处理入库+出库) +// SignatureBatchFeignDTO wmsDto = new SignatureBatchFeignDTO(); +// wmsDto.setInOrderIds(inOrderIds.isEmpty() ? null : inOrderIds); +// wmsDto.setOutOrderIds(outOrderIds.isEmpty() ? null : outOrderIds); +// wmsDto.setSignatureStatus(2); +// wmsDto.setSignatureTime(now); +// wmsDto.setSignaturePic(dto.getSignaturePic()); +// wmsDto.setEvidencePics(evidencePicsStr); +// wmsDto.setSignatureRemark(dto.getSignatureRemark()); +// +// log.info("批量签名:调用WMS更新入/出库单,入库{}条,出库{}条", +// inOrderIds.size(), outOrderIds.size()); +// wmsServiceFeign.batchSignWms(wmsDto); +// } catch (Exception e) { +// log.error("批量签名:调用WMS更新入/出库表失败", e); +// // WMS更新失败不影响OMS表更新结果,仅记录日志 +// } +// } return updated; }