From d2adac4e369165ec523c23e7ffd19fc5775d43b5 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 11 四月 2022 08:14:14 +0800
Subject: [PATCH] Changes
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 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 3729af4..c1f4a6d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -16,8 +16,11 @@
import zy.cloud.wms.manager.entity.param.*;
import zy.cloud.wms.manager.entity.result.KeyValueVo;
import zy.cloud.wms.manager.service.*;
+import zy.cloud.wms.manager.utils.AddZero;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -37,7 +40,11 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private OrderService orderService;
+ @Autowired
+ private PickoutService pickoutService;
+ @Autowired
+ private ReceiveService receiveService;
@RequestMapping("/stock/pakin")
@ManagerAuth(memo = "鍏ュ簱")
public R stockPakin(@RequestBody PakinParam number) {
@@ -77,9 +84,13 @@
@RequestMapping("/stock/out/print")
@ManagerAuth(memo = "鎷ｈ揣鍗曟墦鍗�")
public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
+ return workService.stockOutPrint(stockOutParam, getUserId(), getHostId());
+ }
-
- return workService.stockInPrint(stockOutParam, getUserId(), getHostId());
+ @RequestMapping("/pick/out/print")
+ @ManagerAuth(memo = "PickOut鎵撳嵃鎷ｈ揣鍗�")
+ public R pickOutPrint(@RequestBody Pickout pickout){
+ return pickoutService.stockOutPrint(pickout,getUserId(), getHostId());
}
@RequestMapping("/stock/allot")
@@ -144,19 +155,47 @@
@RequestMapping("/orderNo/init")
@ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
public R initOrderNo() {
- long nextId = snowflakeIdWorker.nextId();
- String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
- if (orderService.selectByOrderNo(orderNo, getHostId()) != null) {
- return R.error("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
+ String billNo = "QC-" + new SimpleDateFormat("yyyyMMdd").format(new Date())+"-";
+ String currNum = receiveService.getCurrNum(billNo);
+ String orderNo=null;
+ if (!Cools.isEmpty(currNum)) {
+ String[] split = currNum.split("-");
+ if (split.length < 2){
+ orderNo= billNo + "0001";
+ }
+ Integer newNum = Integer.parseInt(split[2]) +1;
+ String format = AddZero.addZeroForNum(newNum + "", 4);
+ orderNo = billNo + format;
+ }else {
+ orderNo = billNo + "0001";
}
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 = "鐢熸垚閿�鍞鍗�")
+ public R initReceive(@RequestBody InitOrderParam param) {
+ return workService.initReceive(param, getUserId(), getHostId());
+ }
@RequestMapping("/order/init")
@ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
public R initOrder(@RequestBody InitOrderParam param) {
return workService.initOrder(param, getUserId(), getHostId());
}
+
@RequestMapping("/stock/transfer")
@ManagerAuth(memo = "搴撳瓨璋冩嫧")
@@ -206,6 +245,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