From 190cce54d568a96b5bedd5af6a9a7314aa61accc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 20 六月 2023 09:42:41 +0800
Subject: [PATCH] #自动完成工作档时优化拣货单相关
---
src/main/java/com/zy/asrs/controller/OrderController.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 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..518712b 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;
@@ -17,6 +19,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 +99,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 +185,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 +381,34 @@
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);
+
+ 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(), OrderDetl.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .includeColumnFiledNames(includeColumnFiledNames)
+ .sheet("琛�1")
+ .doWrite(list);
+ }
+
}
--
Gitblit v1.9.1