From 2da79f8364653941c59c3a6f5aec261ab9ea22ac Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 02 七月 2020 15:36:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TrayCodeController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 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..e404fc4 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<Map<String, Object>> res = new ArrayList<>();
+ for (int i = 0; i<count; i++) {
+ res.add(Cools.add("item", 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();
+ }
+
}
--
Gitblit v1.9.1