From 4b6e6d95ae6fbbccc4351db366b99fa05288877f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 六月 2025 10:09:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 174 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 133 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index de90edd..d769423 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -37,6 +37,7 @@
import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@@ -58,6 +59,8 @@
private LocOwnerService locOwnerService;
@Autowired
private OrderLogService orderLogService;
+ @Autowired
+ private OrderDetlLogService orderDetlLogService;
@RequestMapping(value = "/order/all")
@ManagerAuth
@@ -71,74 +74,127 @@
return R.ok().add(stockStatis);
}
-// @RequestMapping(value = "/order/export")
-// @ManagerAuth
-// public void orderExport(HttpServletResponse response,OrderExport orderExport) throws IOException {
-// List<OrderDetl> orderNo = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderExport.getOrderNo()));
-//
-// response.setContentType("application/vnd.ms-excel");
-// response.setCharacterEncoding("utf-8");
-// String templateFileName =
-// this.getClass().getClassLoader().getResource("ru.xlsx").getPath();;
-//
-// String fileName = "complexFill" + System.currentTimeMillis() + ".xlsx";
-//
-// response.setHeader("Content-disposition", "attachment;filename=" + fileName);
-// ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build();
-// WriteSheet writeSheet = EasyExcel.writerSheet().build();
-// // 杩欓噷娉ㄦ剰 鍏ュ弬鐢ㄤ簡forceNewRow 浠ｈ〃鍦ㄥ啓鍏ist鐨勬椂鍊欎笉绠ist涓嬮潰鏈夋病鏈夌┖琛� 閮戒細鍒涘缓涓�琛岋紝鐒跺悗涓嬮潰鐨勬暟鎹線鍚庣Щ鍔ㄣ�傞粯璁� 鏄痜alse锛屼細鐩存帴浣跨敤涓嬩竴琛岋紝濡傛灉娌℃湁鍒欏垱寤恒��
-// // forceNewRow 濡傛灉璁剧疆浜唗rue,鏈変釜缂虹偣 灏辨槸浠栦細鎶婃墍鏈夌殑鏁版嵁閮芥斁鍒板唴瀛樹簡锛屾墍浠ユ厧鐢�
-// // 绠�鍗曠殑璇� 濡傛灉浣犵殑妯℃澘鏈塴ist,涓攍ist涓嶆槸鏈�鍚庝竴琛岋紝涓嬮潰杩樻湁鏁版嵁闇�瑕佸～鍏� 灏卞繀椤昏缃� forceNewRow=true 浣嗘槸杩欎釜灏变細鎶婃墍鏈夋暟鎹斁鍒板唴瀛� 浼氬緢鑰楀唴瀛�
-// // 濡傛灉鏁版嵁閲忓ぇ list涓嶆槸鏈�鍚庝竴琛� 鍙傜収涓嬩竴涓�
-// FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
-// excelWriter.fill(orderNo, fillConfig, writeSheet);
-//// excelWriter.fill(orderNo, fillConfig, writeSheet);
-// Map<String, Object> map = new HashMap<String, Object>();
-// map.put("date", "2019骞�10鏈�9鏃�13:28:28");
-// map.put("total", 1000);
-// excelWriter.fill(map, writeSheet);
-// excelWriter.finish();
-//
-//
-// }
@RequestMapping("/download_excel")
- public void downloadExcel(HttpServletResponse response,@RequestParam String orderNo) throws IOException {
+ public void downloadExcel(HttpServletResponse response,
+ @RequestParam String orderNo,
+ @RequestParam Integer type,
+ @RequestParam String name,
+ @RequestParam String threeCode) throws IOException {
+
+ //鑾峰彇鍗曟嵁绫诲瀷
+ DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_id", type));
+ if (docType.getPakin()==1 && docType.getPakout()==0){
+ type = 1;
+ } else if (docType.getPakin()==0 && docType.getPakout()==1) {
+ type = 2;
+ }else {
+ throw new CoolException("鍗曟嵁绫诲瀷鏈夎");
+ }
+ //璁剧疆http杩斿洖澶村拰鏂囦欢鍚�
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
String fileName = "Order " + orderNo + ".xlsx";
response.setHeader("Content-disposition", "attachment;filename=" + fileName);
+ //excel鍐欏叆鐨勬暟鎹�
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("orderNo", orderNo);
+ map.put("name",name);
+ map.put("threeCode",threeCode);
+
OutputStream outputStream = response.getOutputStream();
- orderExport(outputStream, orderNo);
+ orderExport(outputStream,type,map);
outputStream.flush();
outputStream.close();
}
- public void orderExport(OutputStream outputStream, String orderNo) throws IOException {
- List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ public void orderExport(OutputStream outputStream,Integer type,Map<String, Object> map) throws IOException {
- String templateFileName = this.getClass().getClassLoader().getResource("ru.xlsx").getPath();
+ //鑾峰彇璁㈠崟鏄庣粏鏁版嵁
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", map.get("orderNo")));
+ List<OrderDetlLog> orderDetlLogs = new ArrayList<>();
+ if (Cools.isEmpty(orderDetls)){
+ orderDetlLogs = orderDetlLogService.selectList(new EntityWrapper<OrderDetlLog>().eq("order_no", map.get("orderNo")));
+ }
+ //鑾峰彇妯＄増璺緞
+ String templateFileName = null ;
+ if (type == 1){
+ templateFileName = this.getClass().getClassLoader().getResource("ru.xlsx").getPath();
+ } else if (type ==2 ) {
+ templateFileName = this.getClass().getClassLoader().getResource("cu.xlsx").getPath();
+ }
+
+ //鎶婃枃浠跺啓鍏ュ埌outputStream涓�
ExcelWriter excelWriter = EasyExcel.write(outputStream).withTemplate(templateFileName).build();
WriteSheet writeSheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
- excelWriter.fill(orderDetls, fillConfig, writeSheet);
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("date", "2019骞�10鏈�9鏃�13:28:28");
- map.put("orderNo", orderNo);
+
+ //鎬昏鏁伴噺锛岄噸閲�
+ BigDecimal sumWeight = new BigDecimal(0);
+ BigDecimal sumAnfme = new BigDecimal(0);
+
+ if (Cools.isEmpty(orderDetls)){
+ //搴忓彿
+ int i = 1;
+ for (OrderDetlLog orderDetlLog:orderDetlLogs){
+ orderDetlLog.setThreeCode(map.get("threeCode").toString());
+ orderDetlLog.setDanger(i);
+ i++;
+ if (Cools.isEmpty(orderDetlLog.getWeight())){
+ orderDetlLog.setWeight(0.0);
+ }
+ sumWeight = sumWeight.add(BigDecimal.valueOf(orderDetlLog.getWeight()));
+ sumAnfme = sumAnfme.add(BigDecimal.valueOf(orderDetlLog.getAnfme()));
+ }
+ //鍐欏叆orderDetlLogs涓殑鏁版嵁
+ excelWriter.fill(orderDetlLogs, fillConfig, writeSheet);
+ map.put("comp",orderDetlLogs.get(0).getOwner$());
+ map.put("sumVol",sumWeight);
+ map.put("sumAnfme",sumAnfme);
+ }else {
+ int i = 1;
+ for (OrderDetl orderDetl:orderDetls){
+ orderDetl.setThreeCode(map.get("threeCode").toString());
+ orderDetl.setDanger(i);
+ i++;
+ if (Cools.isEmpty(orderDetl.getWeight())){
+ orderDetl.setWeight(0.0);
+ }
+ sumWeight = sumWeight.add(BigDecimal.valueOf(orderDetl.getWeight()));
+ sumAnfme = sumAnfme.add(BigDecimal.valueOf(orderDetl.getAnfme()));
+
+ }
+ excelWriter.fill(orderDetls, fillConfig, writeSheet);
+ map.put("comp",orderDetls.get(0).getOwner$());
+ map.put("sumVol",sumWeight);
+ map.put("sumAnfme",sumAnfme);
+ }
+ Date date = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
+
+ map.put("time",dateFormat.format(date));
+
+ //鍐欏叆map涓殑鏁版嵁
excelWriter.fill(map, writeSheet);
excelWriter.finish();
}
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo
+ , @RequestParam(required = false) Integer settle) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
}
- wrapper.le("settle", 2).eq("status", 1);
+ if (!Cools.isEmpty(settle)) {
+ wrapper.eq("settle", settle);
+ }else {
+ wrapper.le("settle", 2);
+ }
+ wrapper.eq("status", 1);
wrapper.orderBy("create_time", false);
List<Order> orders = orderService.selectList(wrapper);
// 淇濈暀鍑哄簱鍗�
@@ -625,6 +681,42 @@
return R.ok();
}
+ @RequestMapping(value = "/order/report")
+ @ManagerAuth(memo = "涓婃姤")
+ public R report(@RequestParam String orderNo) {
+ Order order = orderService.selectByNo(orderNo);
+ if(Cools.isEmpty(order)){
+ return R.parse(BaseRes.EMPTY);
+ }
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ if (Cools.isEmpty(orderDetls)) {
+ return R.parse(BaseRes.EMPTY);
+ }
+ int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
+ int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
+ if (wrkCount > 0 || pakinCount > 0) {
+ throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
+ }
+ Boolean boo=true;
+ for (OrderDetl orderDetl : orderDetls) {
+ if(!orderDetl.getQty().equals(orderDetl.getWorkQty())){
+ return R.error("浣滀笟鏁伴噺鍜屽畬鎴愭暟閲忎笉涓�鑷存棤娉曚笂鎶ョ墿鏂欑紪鍙凤細"+orderDetl.getMatnr());
+ }
+ if((Cools.isEmpty(orderDetl.getPrice())&&orderDetl.getQty()>0)||!orderDetl.getPrice().equals(orderDetl.getQty())){
+ boo=false;
+ }
+ if(Cools.isEmpty(orderDetl.getPrice())){
+ orderDetl.setPrice(0.0);
+ orderDetlService.updateById(orderDetl);
+ }
+ }
+ if(boo){
+ return R.error("娌℃湁闇�瑕佷笂浼犵殑鏁版嵁");
+ }
+ order.setMemo("0");//鐘舵�佽浆鎹㈡垚寮�濮嬩笅鎺�
+ orderService.updateById(order);
+ return R.ok();
+ }
}
--
Gitblit v1.9.1