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 | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 adccc5e..38f9604 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -17,7 +17,9 @@
import zy.cloud.wms.manager.entity.result.KeyValueVo;
import zy.cloud.wms.manager.service.*;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -77,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")
@@ -145,12 +145,27 @@
@ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
public R initOrderNo() {
long nextId = snowflakeIdWorker.nextId();
- String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
+ SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String orderNo = "AT-" + String.valueOf(dateformat.format(new Date()));
+ //String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
if (orderService.selectByOrderNo(orderNo, getHostId()) != null) {
return R.error("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
}
return R.ok().add(orderNo);
}
+
+// @RequestMapping("/orderNo/init1")
+// @ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
+// public R initOrderNo1() {
+// long nextId = snowflakeIdWorker.nextId();
+// SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss");
+// String orderNo = "AT-" + String.valueOf(dateformat.format(new Date()));
+// //String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
+// if (orderService.selectByOrderNo(orderNo, getHostId()) != null) {
+// return R.error("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
+// }
+// return R.ok().add(orderNo);
+// }
@RequestMapping("/receive/init")
@ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
@@ -162,6 +177,7 @@
public R initOrder(@RequestBody InitOrderParam param) {
return workService.initOrder(param, getUserId(), getHostId());
}
+
@RequestMapping("/stock/transfer")
@ManagerAuth(memo = "搴撳瓨璋冩嫧")
@@ -211,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