From 3ed6292b3d3436b880338a86a67d9199225edfb6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 02 十一月 2023 10:09:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 936ebe1..d11c842 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -15,13 +15,18 @@
import com.zy.asrs.entity.result.OrderDetlVo;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
+import com.zy.common.config.AdminInterceptor;
import com.zy.common.model.DetlDto;
+import com.zy.common.utils.BarcodeUtils;
+import com.zy.common.utils.QrCode;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
@@ -127,6 +132,15 @@
if (orderLog != null) {
return R.error("鍗曟嵁缂栧彿鍦ㄥ巻鍙叉。涓凡瀛樺湪");
}
+ OrderDetl orderDetl1 = new OrderDetl();
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ if (orderDetl1.getId() == null){
+ orderDetl1.sync(orderDetl);
+ }
+ if (orderDetl1.getOwner() != orderDetl.getOwner()){
+ return R.error("鍚屼釜鍗曟嵁涓彧鑳藉瓨鍦ㄤ竴涓揣涓讳唬鐮�");
+ }
+ }
Date now = new Date();
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
@@ -217,6 +231,17 @@
if (order == null || order.getStatus() == 0) {
return R.error("璁㈠崟涓嶅瓨鍦�");
}
+
+ OrderDetl orderDetl1 = new OrderDetl();
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ if (orderDetl1.getId() == null){
+ orderDetl1.sync(orderDetl);
+ }
+ if (orderDetl1.getOwner() != orderDetl.getOwner()){
+ return R.error("鍚屼釜鍗曟嵁涓彧鑳藉瓨鍦ㄤ竴涓揣涓讳唬鐮�");
+ }
+ }
+
Date now = new Date();
Long userId = getUserId();
// 淇敼涓绘。
@@ -401,9 +426,8 @@
locCheckEntityWrapper.eq("order_no",orderNo);
List<OrderDetl> list = orderDetlService.selectList(locCheckEntityWrapper);
List<OrderDetlVo> orderDetlVos=new ArrayList<>();
- OrderDetlVo orderDetlVo=new OrderDetlVo();
- for (OrderDetl o:
- list) {
+ for (OrderDetl o:list) {
+ OrderDetlVo orderDetlVo=new OrderDetlVo();
orderDetlVo.setOrderNo(o.getOrderNo());
orderDetlVo.setMatnr(o.getMatnr());
orderDetlVo.setMaktx(o.getMaktx());
@@ -459,6 +483,41 @@
return R.ok(orderDetls);
}
+ @RequestMapping(value = "/order/print2/auth")
+ @ManagerAuth(memo = "璁㈠崟缂栫爜鎵撳嵃")
+ public R manPakOutPrint(@RequestParam(value = "param[]") String[] param) {
+ if(Cools.isEmpty(param)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ List<OrderDetl> res = new ArrayList<>();
+ for (String orderNo : param){
+ res = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ }
+ return R.ok().add(res);
+ }
+ @RequestMapping(value = "/order/code/auth")
+// @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
+ public R manPakOutCodeBarcode(@RequestParam(defaultValue = "2") Integer type
+ , @RequestParam String param
+ , HttpServletResponse response) throws Exception {
+ AdminInterceptor.cors(response);
+ if (Cools.isEmpty(param)){
+ return R.parse(BaseRes.EMPTY);
+ }
+ BufferedImage img;
+ if (type == 1) {
+ img = BarcodeUtils.encode(param);
+ } else {
+ img = QrCode.createImg(param);
+ }
+ if (!ImageIO.write(img, "jpg", response.getOutputStream())) {
+ throw new IOException("Could not write an image of format jpg");
+ }
+ response.getOutputStream().flush();
+ response.getOutputStream().close();
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1