From 1064200ae079272bbe8fe10c9ca5f3f86d954227 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 02 七月 2020 14:22:42 +0800
Subject: [PATCH] #
---
src/main/webapp/views/trayCode/tray.html | 29 +++++++++-----
src/main/java/com/zy/asrs/controller/TrayCodeController.java | 47 +++++++++++++++++++++--
2 files changed, 61 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TrayCodeController.java b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
index 4e8f415..4c039be 100644
--- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
@@ -10,16 +10,14 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.TrayCode;
import com.zy.asrs.service.TrayCodeService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class TrayCodeController extends BaseController {
@@ -126,4 +124,45 @@
return R.ok();
}
+ @RequestMapping(value = "/trayCode/print/preview")
+ @ManagerAuth
+ public R printPreview(@RequestParam String startNo,
+ @RequestParam Integer count,
+ @RequestParam Integer type) {
+ if (count <= 0) {
+ return R.error("鏁伴噺蹇呴』澶т簬闆�");
+ }
+ List<String> res = new ArrayList<>();
+ for (int i = 0; i<count; i++) {
+ res.add(String.valueOf(Integer.parseInt(startNo)+i));
+ }
+ return R.ok().add(res);
+ }
+
+ @RequestMapping(value = "/trayCode/print/auth")
+ @ManagerAuth(memo = "鎵樼洏鐮佹墦鍗�")
+ public R print(@RequestParam String startNo,
+ @RequestParam Integer count,
+ @RequestParam Integer type){
+ if (count <= 0) {
+ return R.error("鏁伴噺蹇呴』澶т簬闆�");
+ }
+ for (int i = 0; i<count; i++) {
+ TrayCode trayCode = new TrayCode(
+ String.valueOf(Integer.parseInt(startNo)+i), // 搴忓垪鍙穂闈炵┖]
+ i==0?"Y":"N", // 璧峰
+ i==count-1?"Y":"N", // 缁堟
+ null, // 澶囨敞
+ new Date(), // 淇敼鏃堕棿
+ getUserId(), // 淇敼浜哄憳
+ new Date(), // 娣诲姞鏃堕棿
+ getUserId() // 娣诲姞浜哄憳
+ );
+ if (!trayCodeService.insert(trayCode)) {
+ throw new CoolException("淇濆瓨搴忓垪鍙峰け璐�");
+ }
+ }
+ return R.ok();
+ }
+
}
diff --git a/src/main/webapp/views/trayCode/tray.html b/src/main/webapp/views/trayCode/tray.html
index f76affe..2b37552 100644
--- a/src/main/webapp/views/trayCode/tray.html
+++ b/src/main/webapp/views/trayCode/tray.html
@@ -10,12 +10,6 @@
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<link rel="stylesheet" href="../../static/css/print.css" media="all">
- <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
- <script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
- <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
- <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
- <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<style>
.layui-form {
padding: 25px 30px 0 0;
@@ -42,6 +36,9 @@
text-align: right;
margin: 20px 0;
}
+ .layui-form-radio>i:hover, .layui-form-radioed>i {
+ color: #007bff;
+ }
.layui-btn {
height: 36px;
line-height: 36px;
@@ -64,14 +61,14 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鏁伴噺:</label>
<div class="layui-input-block">
- <input name="count" placeholder="璇疯緭鍏ユ暟閲�" class="layui-input" lay-verify="required|number" autocomplete="off">
+ <input name="count" type="number" placeholder="璇疯緭鍏ユ暟閲�" class="layui-input" lay-verify="required|number" autocomplete="off">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鐮佺被鍨�:</label>
<div class="layui-input-block">
- <input type="radio" name="sex" value="1" title="鏉″舰鐮�" checked="">
- <input type="radio" name="sex" value="2" title="浜岀淮鐮�">
+ <input type="radio" name="type" value="1" title="鏉″舰鐮�" checked="">
+ <input type="radio" name="type" value="2" title="浜岀淮鐮�">
</div>
</div>
<div class="layui-form-item cool-button-contain">
@@ -80,12 +77,22 @@
</div>
</form>
</body>
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script>
layui.use(['form'], function() {
- var $ = layui.jquery;
- var form = layui.form;
+ let $ = layui.jquery;
+ let form = layui.form;
form.on('submit(print)', function (data) {
+ http.post(baseUrl + '/trayCode/print/preview', data.field, function (res) {
+
+ console.log(res.data)
+ })
});
$('#cancel').click(function () {
--
Gitblit v1.9.1