From 0b4036950ca61835a29ed0a13379a68af652fa59 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 26 十二月 2023 10:30:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 70 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 518712b..e1ec863 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -9,8 +9,10 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
+import com.zy.asrs.entity.result.OrderDetlVo;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.DetlDto;
@@ -21,6 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.*;
@@ -92,7 +95,16 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
public R head(@RequestParam Long orderId){
- return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
+ List<OrderDetl> orderDetls1 = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetls){
+ double v = orderDetl.getAnfme() - orderDetl.getWorkQty();
+ double v1 = new BigDecimal(v).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ if (v1!=0.0){
+ orderDetls1.add(orderDetl);
+ }
+ }
+ return R.ok().add(orderDetls1);
}
@RequestMapping(value = "/order/form/add/auth")
@@ -157,14 +169,7 @@
}
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
- if (Cools.isEmpty(orderDetl.getOwner())){
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�,璇疯緭鍏ヨ揣涓荤紪鍙�");
- }else {
- LocOwner locOwner = locOwnerService.selectById(orderDetl.getOwner());
- if (Cools.isEmpty(locOwner)){
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�,璇疯緭鍏ュ瓨鍦ㄧ殑璐т富缂栧彿锛堟暣鏁帮級");
- }
- }
+
if (orderDetl.getBatch() == null) {
orderDetl.setBatch("");
}
@@ -185,9 +190,6 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
- if(orderDetl.getPayment() == null){
- orderDetl.setPayment(1);
- }
orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -388,7 +390,22 @@
EntityWrapper<OrderDetl> locCheckEntityWrapper = new EntityWrapper<>();
locCheckEntityWrapper.eq("order_no",orderNo);
List<OrderDetl> list = orderDetlService.selectList(locCheckEntityWrapper);
-
+ List<OrderDetlVo> orderDetlVos=new ArrayList<>();
+ OrderDetlVo orderDetlVo=new OrderDetlVo();
+ for (OrderDetl o:
+ list) {
+ orderDetlVo.setOrderNo(o.getOrderNo());
+ orderDetlVo.setMatnr(o.getMatnr());
+ orderDetlVo.setMaktx(o.getMaktx());
+ orderDetlVo.setSpecs(o.getSpecs());
+ orderDetlVo.setOwner(o.getOwner$());
+ orderDetlVo.setPayment(o.getPayment$());
+ orderDetlVo.setAnfme(o.getAnfme());
+ orderDetlVo.setQty(o.getQty());
+ orderDetlVo.setWorkQty(o.getWorkQty());
+ orderDetlVo.setWeight(o.getWeight());
+ orderDetlVos.add(orderDetlVo);
+ }
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("鍗曟嵁", "UTF-8");
@@ -404,11 +421,34 @@
includeColumnFiledNames.add("qty");
includeColumnFiledNames.add("workQty");
includeColumnFiledNames.add("weight");
- EasyExcel.write(response.getOutputStream(), OrderDetl.class)
+ EasyExcel.write(response.getOutputStream(), OrderDetlVo.class)
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
.includeColumnFiledNames(includeColumnFiledNames)
.sheet("琛�1")
- .doWrite(list);
+ .doWrite(orderDetlVos);
}
+ @RequestMapping(value = "/order/list/all")
+ public R orderList() {
+
+ return R.ok(orderService.selectAllorderNo());
+ }
+
+ //璁㈠崟缁勬墭2
+ @RequestMapping(value = "/order/list/orderNo")
+ public R orderListorderNo(@RequestParam String orderNo) {
+ //鏁伴噺淇敼鎴愪负瀹屾垚鏁伴噺
+ List<OrderDetl> orderDetl1=orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",orderNo));
+ List<OrderDetl> orderDetls= new ArrayList<OrderDetl>();
+ for (OrderDetl o: orderDetl1) {
+ o.setAnfme(o.getAnfme()-o.getWorkQty());
+ BigDecimal c1 = new BigDecimal(o.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ o.setAnfme(c1.doubleValue());
+ orderDetls.add(o);
+ }
+ return R.ok(orderDetls);
+ }
+
+
+
}
--
Gitblit v1.9.1