diff --git a/lms/nladmin-system/pom.xml b/lms/nladmin-system/pom.xml
index 470acd41e..31885a1f6 100644
--- a/lms/nladmin-system/pom.xml
+++ b/lms/nladmin-system/pom.xml
@@ -380,6 +380,13 @@
jcifs
1.3.17
+
+
+
+ com.alibaba
+ easyexcel
+ 2.2.6
+
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java
index 3e88d2db8..8cbd99c80 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.springframework.data.domain.Pageable;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.Map;
public interface CheckOutBillService {
@@ -168,4 +170,10 @@ public interface CheckOutBillService {
* 发货信息保存
*/
void moneySubmit(JSONObject whereJson);
+
+ /**
+ * 下载发货单Excel
+ * @param whereJson /
+ */
+ void downloadExcel(HttpServletResponse response, Map whereJson) throws IOException;
}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
index 85600eb57..b4dcb58aa 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
@@ -12,6 +12,8 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.Map;
@RestController
@@ -201,4 +203,12 @@ public class CheckOutBillController {
checkOutBillService.moneySubmit(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
+
+ @Log("下载发货单Excel")
+ @ApiOperation("下载发货单Excel")
+ @GetMapping(value = "/downloadExcel")
+ public ResponseEntity