evidencePics;
+
+ @ApiModelProperty("签名备注")
+ private String signatureRemark;
+
+ @ApiModelProperty("签名方式：1-电子签名 2-附件上传 3-扫二维码 4-系统自动")
+ private Integer signatureMode;
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/electronicSignature/ElectronicSignatureApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/electronicSignature/ElectronicSignatureApi.java
index 981173f92..fde87cd6d 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/electronicSignature/ElectronicSignatureApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/electronicSignature/ElectronicSignatureApi.java
@@ -8,6 +8,7 @@ import com.mhd.oms.domain.electronicSignature.entity.ElectronicSignature;
import com.mhd.oms.domain.electronicSignature.entity.ElectronicSignatureMaterialDetail;
import com.mhd.oms.domain.electronicSignature.repository.todo.ElectronicSignatureDO;
import com.mhd.oms.domain.electronicSignature.service.ElectronicSignatureDomainService;
+import com.mhd.oms.interfaces.dto.electronicSignature.ElectronicSignatureBatchSignDTO;
import com.mhd.oms.interfaces.dto.electronicSignature.ElectronicSignatureQueryDTO;
import com.mhd.oms.interfaces.dto.electronicSignature.ElectronicSignatureSaveDTO;
import com.mhd.oms.interfaces.dto.electronicSignature.ElectronicSignatureVO;
@@ -96,6 +97,35 @@ public class ElectronicSignatureApi extends BaseController {
return AjaxResult.success(vo);
}
+ /**
+ * 勾选记录批量签名
+ *
+ * 前端勾选多条待签名的电子签名记录，传入签名ID列表（signatureIds）、签名图片（signaturePic）、
+ * 签名备注（signatureRemark）、签名方式（signatureMode），后端：
+ *
+ * - 更新 OMS ELECTRONIC_SIGNATURE 表：signatureStatus=2(已签名)、signatureTime=当前时间、signaturePic、evidencePics、signatureRemark、signatureMode
+ * - 通过 Feign 调用 WMS 更新 stock_in_order / stock_out_order 表的对应签名字段
+ *
+ */
+ @ApiOperation("批量签名（勾选记录后批量更新签名状态为已签名）")
+ @PostMapping("/batchSign")
+ public AjaxResult batchSign(@RequestBody ElectronicSignatureBatchSignDTO dto) {
+ if (dto.getSignatureIds() == null || dto.getSignatureIds().isEmpty()) {
+ return AjaxResult.error("请选择需要签名的记录");
+ }
+ try {
+ int count = electronicSignatureDomainService.batchSign(dto);
+ if (count > 0) {
+ return AjaxResult.success("批量签名成功，共更新 " + count + " 条记录");
+ } else {
+ return AjaxResult.error("批量签名失败：未找到有效的待签名记录");
+ }
+ } catch (Exception e) {
+ log.error("批量签名失败", e);
+ return AjaxResult.error("批量签名失败：" + e.getMessage());
+ }
+ }
+
private ElectronicSignatureDO toDO(ElectronicSignatureSaveDTO dto) {
ElectronicSignatureDO signatureDO = new ElectronicSignatureDO();
BeanUtils.copyProperties(dto, signatureDO, "materialDetailList");
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockSignature/StockSignatureApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockSignature/StockSignatureApi.java
new file mode 100644
index 000000000..c686d681d
--- /dev/null
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockSignature/StockSignatureApi.java
@@ -0,0 +1,85 @@
+package com.mhd.wms.interfaces.facadeApi.stockSignature;
+
+import com.mhd.common.core.web.controller.BaseController;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.system.api.domain.SignatureBatchFeignDTO;
+import com.mhd.wms.application.service.stockInOrder.StockInOrderApplicationService;
+import com.mhd.wms.application.service.stockOutOrder.StockOutOrderApplicationService;
+import com.mhd.wms.interfaces.dto.signature.BatchSignatureDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 库存签名API（供OMS端Feign调用，统一更新WMS入/出库单签名字段）
+ *
+ * OMS端批量签名后，通过Feign调用此API，
+ * 更新WMS stock_in_order / stock_out_order 表的签名状态、签名时间、签名图片、签名备注。
+ */
+@Slf4j
+@RestController
+@RequestMapping("/stockSignatureApi")
+@Api(tags = "库存签名（OMS→WMS）")
+public class StockSignatureApi extends BaseController {
+
+ @Autowired
+ private StockInOrderApplicationService stockInOrderApplicationService;
+
+ @Autowired
+ private StockOutOrderApplicationService stockOutOrderApplicationService;
+
+ /**
+ * 批量签名（OMS→WMS）
+ *
+ * 接收SignatureBatchFeignDTO，映射为BatchSignatureDTO后，分别调用
+ * StockInOrderApplicationService.batchSignature 和
+ * StockOutOrderApplicationService.batchSignature。
+ */
+ @ApiOperation("OMS批量签名-更新WMS入/出库单签名字段")
+ @PostMapping("/batchSign")
+ public AjaxResult batchSign(@RequestBody SignatureBatchFeignDTO dto) {
+ if (dto == null) {
+ return AjaxResult.error("请求参数不能为空");
+ }
+ boolean hasIn = dto.getInOrderIds() != null && !dto.getInOrderIds().isEmpty();
+ boolean hasOut = dto.getOutOrderIds() != null && !dto.getOutOrderIds().isEmpty();
+ if (!hasIn && !hasOut) {
+ return AjaxResult.error("请指定入库单ID列表或出库单ID列表");
+ }
+
+ // 映射 SignatureBatchFeignDTO → BatchSignatureDTO
+ BatchSignatureDTO batchDTO = new BatchSignatureDTO();
+ batchDTO.setInOrderIds(dto.getInOrderIds());
+ batchDTO.setOutOrderIds(dto.getOutOrderIds());
+ batchDTO.setSignatureStatus(dto.getSignatureStatus() != null ? dto.getSignatureStatus() : 2);
+ batchDTO.setSignatureTime(dto.getSignatureTime());
+ batchDTO.setSignaturePic(dto.getSignaturePic());
+ batchDTO.setSignatureRemark(dto.getSignatureRemark());
+ // evidencePics: Feign DTO中是comma-separated String → List
+ if (dto.getEvidencePics() != null && !dto.getEvidencePics().isEmpty()) {
+ batchDTO.setEvidencePics(java.util.Arrays.asList(dto.getEvidencePics().split(",")));
+ }
+
+ String msg = "";
+ if (hasIn) {
+ AjaxResult inResult = stockInOrderApplicationService.batchSignature(batchDTO);
+ log.info("OMS→WMS批量入库签名完成：{}条，结果：{}", dto.getInOrderIds().size(),
+ inResult != null ? inResult.get("msg") : "OK");
+ msg += "入库签名完成";
+ }
+ if (hasOut) {
+ AjaxResult outResult = stockOutOrderApplicationService.batchSignature(batchDTO);
+ log.info("OMS→WMS批量出库签名完成：{}条，结果：{}", dto.getOutOrderIds().size(),
+ outResult != null ? outResult.get("msg") : "OK");
+ if (!msg.isEmpty()) msg += "，";
+ msg += "出库签名完成";
+ }
+
+ return AjaxResult.success(msg);
+ }
+}