From f4f3c04ba37cec6739370c4aa0b9622493de8a23 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 25 三月 2022 20:34:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas

---
 src/main/java/zy/cloud/wms/manager/controller/QualityController.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 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 0a974ff..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,10 @@
 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.*;
 
 @RestController
@@ -87,6 +90,26 @@
         return R.ok();
     }
 
+    @RequestMapping("/quality/orderNo/init1")
+    @ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
+    public R initOrderNo() {
+        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")
 	@ManagerAuth
     public R update(Quality quality){

--
Gitblit v1.9.1