From 98cac850db801e84dff4387eb12b08921c436472 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 25 三月 2022 20:33:50 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 22 ++++++++++++++++------
1 files changed, 16 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 38f9604..8a71d2d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -16,6 +16,7 @@
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;
@@ -40,6 +41,8 @@
@Autowired
private OrderService orderService;
+ @Autowired
+ private ReceiveService receiveService;
@RequestMapping("/stock/pakin")
@ManagerAuth(memo = "鍏ュ簱")
public R stockPakin(@RequestBody PakinParam number) {
@@ -144,12 +147,19 @@
@RequestMapping("/orderNo/init")
@ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
public R initOrderNo() {
- 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("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
+ 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);
}
--
Gitblit v1.9.1