From 46607139e955ca266e24bd8561bca1f93a650178 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 22 三月 2022 18:23:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index 42162dc..38f9604 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -79,9 +79,7 @@
@RequestMapping("/stock/out/print")
@ManagerAuth(memo = "鎷ｈ揣鍗曟墦鍗�")
public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
-
-
- return workService.stockInPrint(stockOutParam, getUserId(), getHostId());
+ return workService.stockOutPrint(stockOutParam, getUserId(), getHostId());
}
@RequestMapping("/stock/allot")
@@ -180,6 +178,7 @@
return workService.initOrder(param, getUserId(), getHostId());
}
+
@RequestMapping("/stock/transfer")
@ManagerAuth(memo = "搴撳瓨璋冩嫧")
public R stockTransfer(@RequestBody AsrsTransferParam number) {
@@ -228,6 +227,13 @@
eq("host_id", getHostId()).orderBy("create_time", false).eq("doc_class",docClass));
return R.ok().add(docTypes);
}
+ @RequestMapping("docType/out/get")
+ @ManagerAuth
+ public R getDocOutTypeData(Integer docClass){
+ List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("status", 1).
+ eq("host_id", getHostId()).orderBy("create_time", false).eq("doc_class",docClass));
+ return R.ok().add(docTypes);
+ }
// 鑾峰彇鎵�鏈夊鎴�
@RequestMapping("/cstmr/all/get")
--
Gitblit v1.9.1