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/QualityController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/QualityController.java b/src/main/java/zy/cloud/wms/manager/controller/QualityController.java
index 650f4f8..6d0eb4f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/QualityController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/QualityController.java
@@ -18,7 +18,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.manager.service.ReceiveDetlService;
+import zy.cloud.wms.manager.utils.AddZero;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -91,9 +93,21 @@
@RequestMapping("/quality/orderNo/init1")
@ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
public R initOrderNo() {
- SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss");
- String orderNo = " QC-" + String.valueOf(dateformat.format(new Date()));
- return R.ok().add(orderNo);
+ String billNo = "QC-" + new SimpleDateFormat("yyyyMMdd").format(new Date())+"-";
+ String currNum = qualityService.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(value = "/quality/update/auth")
--
Gitblit v1.9.1