From 63a0de547069fce19536b278ccd412a211ce8b11 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期三, 23 三月 2022 08:48:50 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/QualityController.java | 9 +++++++++
src/main/webapp/static/js/quality/quality.js | 40 ++++++++++++++++++++--------------------
src/main/webapp/views/quality/quality.html | 6 +++---
3 files changed, 32 insertions(+), 23 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..650f4f8 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/QualityController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/QualityController.java
@@ -19,6 +19,7 @@
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.manager.service.ReceiveDetlService;
+import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@@ -87,6 +88,14 @@
return R.ok();
}
+ @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);
+ }
+
@RequestMapping(value = "/quality/update/auth")
@ManagerAuth
public R update(Quality quality){
diff --git a/src/main/webapp/static/js/quality/quality.js b/src/main/webapp/static/js/quality/quality.js
index e1ac6c5..33657d5 100644
--- a/src/main/webapp/static/js/quality/quality.js
+++ b/src/main/webapp/static/js/quality/quality.js
@@ -341,23 +341,23 @@
return billNO;
}
-// function initOrderNo1() {
-// $.ajax({
-// url: baseUrl+"/work/orderNo/init1",
-// headers: {'token': localStorage.getItem('token')},
-// async: false,
-// method: 'GET',
-// success: function (res) {
-// if (res.code === 200){
-// $('#billNo').val(res.data)
-// } else if (res.code === 403){
-// top.location.href = baseUrl+"/";
-// } else {
-// notice.error({
-// title: '娑堟伅閫氱煡',
-// message: res.msg
-// });
-// }
-// }
-// });
-// }
\ No newline at end of file
+function initOrderNo1() {
+ $.ajax({
+ url: baseUrl+"/quality/orderNo/init1",
+ headers: {'token': localStorage.getItem('token')},
+ async: false,
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ $('#billNo').val(res.data)
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ notice.error({
+ title: '娑堟伅閫氱煡',
+ message: res.msg
+ });
+ }
+ }
+ });
+}
\ No newline at end of file
diff --git a/src/main/webapp/views/quality/quality.html b/src/main/webapp/views/quality/quality.html
index 57d63db..6629a8d 100644
--- a/src/main/webapp/views/quality/quality.html
+++ b/src/main/webapp/views/quality/quality.html
@@ -61,7 +61,7 @@
</body>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
- <form id="detail" lay-filter="detail" class="layui-form admin-form">
+ <div id="detail" lay-filter="detail" class="layui-form admin-form">
<input name="id" type="hidden">
<div class="layui-row">
<div class="layui-col-md12">
@@ -134,11 +134,11 @@
</div>
<hr class="layui-bg-gray">
<div class="layui-form-item text-right">
-<!-- <button class="layui-btn layui-btn-primary" id="autoNo" onclick="initOrderNo1()">缂栧彿鑷姩鐢熸垚</button>-->
+ <button class="layui-btn layui-btn-primary" id="autoNo" onclick="initOrderNo1()">缂栧彿鑷姩鐢熸垚</button>
<button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
</div>
- </form>
+ </div>
</script>
</html>
--
Gitblit v1.9.1