From 24c05b946691b22695cb0dbaa4db86479b7df0eb Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 27 Jul 2024 12:41:18 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/oms/web/Oms2cWaybillController.java    | 11 +++++++++++
 .../com/xdadan/erp/oms/domain/vo/WaybillOrder.java    |  5 +++++
 .../xdadan/erp/oms/service/svc/IRpcWaybillSvc.java    |  6 ++++++
 3 files changed, 22 insertions(+)

diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
index 5a5e8b8..47b69e2 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
@@ -13,6 +13,7 @@ package com.xdadan.erp.oms.web;
 
 import java.io.*;
 import java.util.*;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import cn.hutool.core.collection.CollectionUtil;
@@ -121,6 +122,16 @@ public class Oms2cWaybillController extends BaseController
         return this.iRpcWaybillSvc.draftSubmitOrderByOms(emisWaybillSave);
     }
 
+    /**
+     * 导出进仓单模板
+     * @return
+     */
+    @Log(title = "导出进仓单", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportWarehouseInTpl")
+    public AjaxResult exportWarehouseInTpl(WaybillOrder waybillOrder)  {
+        return this.iRpcWaybillSvc.exportWarehouseInTpl(waybillOrder);
+    }
+
     /**
      * 使用远程调用注意：统一使用api中心进行运费试算
      * @param waybillOrder
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/WaybillOrder.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/WaybillOrder.java
index c1f1d01..7582f18 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/WaybillOrder.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/WaybillOrder.java
@@ -46,6 +46,11 @@ public class WaybillOrder  implements Serializable {
     /* 订单号 */
     private String orderSn;
 
+    /* 订单备注  */
+    private String orderRemark;
+
+
+
     /* 子单号,逗号隔开 */
     private String billCodeSub;
 
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java
index 5703f64..24c6b0d 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java
@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import javax.servlet.http.HttpServletResponse;
+
 @FeignClient(name = "IRpcWaybillSvc",url = "${service.provider.url}",configuration = {FeignErrorDecoder.class})
 public interface IRpcWaybillSvc {
 
@@ -66,4 +68,8 @@ public interface IRpcWaybillSvc {
                                             @RequestParam("ownerSiteCode")String ownerSiteCode,
                                             @RequestParam("searchValue")String searchValue);
 
+
+    @PostMapping(value = "/apiweb/emisWaybill/exportWarehouseInTpl")
+    public AjaxResult exportWarehouseInTpl(@RequestBody WaybillOrder waybillOrder);
+
 }
\ No newline at end of file