From d17c089f1d7ff3be848b05161917346e7f664a1d Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 26 四月 2022 15:17:53 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 652fe69..08f5b58 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;
@@ -42,6 +43,8 @@
@Autowired
private PickoutService pickoutService;
+ @Autowired
+ private ReceiveService receiveService;
@RequestMapping("/stock/pakin")
@ManagerAuth(memo = "鍏ュ簱")
public R stockPakin(@RequestBody PakinParam number) {
@@ -152,12 +155,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);
}
@@ -238,8 +248,11 @@
@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));
+
+ List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>()
+ .eq("host_id", "2")
+ .orderBy("create_time", false)
+ .eq("doc_class",docClass));
return R.ok().add(docTypes);
}
--
Gitblit v1.9.1