OMS的签名表以及详情，WMS的批量签名

2026-07-28 15:43:38 +08:00
parent e77937fb89
commit c1e062082a
30 changed files with 1227 additions and 10 deletions
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;

-@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://127.0.0.1:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface OmsServiceFeign {


@@ -66,4 +66,8 @@ public interface OmsServiceFeign {
    @ApiOperation("批量推送")
    @PostMapping("/reservationStockOutOrderApi/batchPushByNumber")
    public AjaxResult batchPushByNumber(@RequestBody List<String> numberList);
+
+    @ApiOperation("保存电子签名记录")
+    @PostMapping("/electronicSignatureApi/saveSignature")
+    public AjaxResult saveSignature(@RequestBody ElectronicSignatureSyncDTO saveDTO);
 }
@@ -0,0 +1,108 @@
+package com.mhd.system.api.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 电子签名同步DTO（WMS端通过Feign调用OMS）
+ */
+@Data
+public class ElectronicSignatureSyncDTO {
+
+    @ApiModelProperty("订单ID")
+    private Long orderId;
+
+    @ApiModelProperty("订单号")
+    private String orderNumber;
+
+    @ApiModelProperty("订单类型：IN-入库 OUT-出库")
+    private String orderType;
+
+    @ApiModelProperty("组织ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("仓库ID")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("创建人")
+    private Long createBy;
+
+    @ApiModelProperty("创建人姓名")
+    private String createByName;
+
+    @ApiModelProperty("物料明细列表")
+    private List<MaterialDetailItem> materialDetailList;
+
+    @Data
+    public static class MaterialDetailItem {
+
+        @ApiModelProperty("物料基础信息ID")
+        private Long materialBaseInfoId;
+
+        @ApiModelProperty("物料编码")
+        private String materialCode;
+
+        @ApiModelProperty("物料名称")
+        private String materialName;
+
+        @ApiModelProperty("数量")
+        private BigDecimal quantity;
+
+        @ApiModelProperty("单位代码")
+        private String unitCode;
+
+        @ApiModelProperty("单位名称")
+        private String unitName;
+
+        @ApiModelProperty("批次号")
+        private String batchNumber;
+
+        @ApiModelProperty("LOT编号")
+        private String lotNumber;
+
+        @ApiModelProperty("仓库ID")
+        private Long warehouseId;
+
+        @ApiModelProperty("仓库编码")
+        private String warehouseCode;
+
+        @ApiModelProperty("仓库名称")
+        private String warehouseName;
+
+        @ApiModelProperty("库区ID")
+        private Long storageSectionId;
+
+        @ApiModelProperty("库区编码")
+        private String storageSectionCode;
+
+        @ApiModelProperty("库区名称")
+        private String storageSectionName;
+
+        @ApiModelProperty("库位ID")
+        private Long storageLocationId;
+
+        @ApiModelProperty("库位编码")
+        private String storageLocationCode;
+
+        @ApiModelProperty("库位名称")
+        private String storageLocationName;
+
+        @ApiModelProperty("业务唯一ID")
+        private Long uniqueId;
+    }
+}