From 298b0fc5c2e2e7725cdf0a2f0a0650cd5d66f873 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 13 七月 2023 11:24:06 +0800
Subject: [PATCH] #小数加减法bug修复

---
 src/main/java/com/zy/asrs/controller/OrderController.java |   81 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 244d8de..1ae4d6b 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,5 +1,7 @@
 package com.zy.asrs.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -7,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;
@@ -17,6 +21,9 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.*;
 
 @RestController
@@ -94,14 +101,10 @@
     @ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
     @Transactional
     public R formAdd(@RequestBody OrderDomainParam param){
-        int payment = 0;
         String prefix = "";
         DocType docType = docTypeService.selectById(param.getDocType());
         if(!Cools.isEmpty(docType)){
             prefix = docType.getPakin() == 1 ? "RK" : "CK";
-        }
-        if (prefix.equals("CK")){
-            payment = 1;
         }
         if(Cools.isEmpty(param.getOrderNo())){
             param.setOrderNo(prefix + snowflakeIdWorker.nextId());
@@ -184,7 +187,9 @@
                 orderDetl.setUpdateTime(now);
                 orderDetl.setStatus(1);
                 orderDetl.setQty(0.0D);
-                orderDetl.setPayment(payment);
+                if(orderDetl.getPayment() == null){
+                    orderDetl.setPayment(1);
+                }
                 orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
                 if (!orderDetlService.insert(orderDetl)) {
                     throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -378,4 +383,70 @@
         return R.ok();
     }
 
+    @RequestMapping(value = "/order/printExport/auth")
+    //   @ManagerAuth(memo = "鐩樼偣鍗曞鍑�")
+    public void export(HttpServletResponse response, @RequestParam String orderNo) throws IOException {
+        //浠庢暟鎹簱鏌ヨ鏁版嵁
+        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");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName+ orderNo + ".xlsx");
+        Set<String> includeColumnFiledNames = new HashSet<String>();
+        includeColumnFiledNames.add("orderNo");
+        includeColumnFiledNames.add("matnr");
+        includeColumnFiledNames.add("maktx");
+        includeColumnFiledNames.add("specs");
+        includeColumnFiledNames.add("owner");
+        includeColumnFiledNames.add("payment");
+        includeColumnFiledNames.add("anfme");
+        includeColumnFiledNames.add("qty");
+        includeColumnFiledNames.add("workQty");
+        includeColumnFiledNames.add("weight");
+        EasyExcel.write(response.getOutputStream(), OrderDetlVo.class)
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                .includeColumnFiledNames(includeColumnFiledNames)
+                .sheet("琛�1")
+                .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());
+            orderDetls.add(o);
+        }
+        return R.ok(orderDetls);
+    }
+
+
+
 }

--
Gitblit v1.9.1