From e9f4a368fd3845a38eb54d3d18d77e96e5767b61 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 05 九月 2023 10:47:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 1ebddbd..d3390f0 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -12,6 +13,7 @@
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.OrderDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -28,6 +30,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.text.SimpleDateFormat;
import java.util.*;
@Slf4j
@@ -269,6 +272,15 @@
List<WrkTraceVo> wrkTraceVos = new ArrayList<>();
List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNoGroupByMatnrOfSum(order.getOrderNo());
for (WrkDetl wrkDetl : wrkDetls) {
+ if (isJSON(wrkDetl.getOrderNo())) {
+ List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+ for (OrderDto one : orderDtoList) {
+ if (one.getOrderNo().equals(order.getOrderNo())) {
+ wrkDetl.setAnfme(one.getAnfme());
+ break;
+ }
+ }
+ }
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
if (wrkMast == null) {
WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
@@ -369,6 +381,22 @@
return R.ok();
}
+ @RequestMapping(value = "/order/exportOrder/auth")
+ @ManagerAuth(memo = "瀵煎嚭璁㈠崟")
+ @Transactional
+ public R exportOrder(@RequestParam Long orderId){
+ List<String> fields = new ArrayList<>();
+ fields.add("orderNo");
+ fields.add("matnr");
+ fields.add("maktx");
+ fields.add("specs");
+ fields.add("anfme");
+ fields.add("qty");
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ List<OrderDetl> orderDetls = orderDetlService.selectList(wrapper.eq("order_id",orderId));
+ return R.ok(exportSupport(orderDetls, fields));
+ }
+
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
@@ -451,6 +479,12 @@
Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));
// 涓嬪崟鏃堕棿
String timeStr = dataFormatter.formatCellValue(row.getCell(4));
+
+ if (Cools.isEmpty(timeStr)) {
+ timeStr = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(now);
+ }
+ // 鍗曟嵁绫诲瀷
+ Long orderType = Long.parseLong(dataFormatter.formatCellValue(row.getCell(5)));
Date time = null;
try {
time = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss_F);
@@ -473,7 +507,7 @@
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
uuid, // 璁㈠崟缂栧彿
timeStr, // 鍗曟嵁鏃ユ湡
- 14L, // 鍗曟嵁绫诲瀷
+ orderType, // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
null, //
null, // 璋冩嫧椤圭洰缂栧彿
@@ -535,5 +569,4 @@
}
return R.ok("瀵煎叆鎴愬姛");
}
-
}
--
Gitblit v1.9.1