From 1948b092d9c104e84dac8abaf6a6346403fc8450 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 12 八月 2024 11:05:09 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 88 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
index bd67231..326c0ef 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
@@ -5,9 +5,13 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.MatField;
import com.zy.asrs.wms.asrs.entity.OrderType;
+import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
import com.zy.asrs.wms.asrs.entity.param.CreateOrderParam;
import com.zy.asrs.wms.asrs.entity.param.UpdateOrderParam;
+import com.zy.asrs.wms.asrs.entity.template.OrderTemplate;
+import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
@@ -21,6 +25,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
@@ -33,6 +38,8 @@
private OrderService orderService;
@Autowired
private OrderTypeService orderTypeService;
+ @Autowired
+ private MatFieldService matFieldService;
@PreAuthorize("hasAuthority('asrs:order:list')")
@PostMapping("/order/page")
@@ -142,10 +149,10 @@
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(Order::getId, condition);
+ wrapper.like(Order::getOrderNo, condition);
}
orderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ item -> vos.add(new KeyValVo(item.getId(), item.getOrderNo()))
);
return R.ok().add(vos);
}
@@ -153,7 +160,82 @@
@PreAuthorize("hasAuthority('asrs:order:list')")
@PostMapping("/order/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(orderService.list(), Order.class), response);
+ String ioModel = map.getOrDefault("ioModel", "").toString();
+ List<Order> list = orderService.list();
+ if (!Cools.isEmpty(ioModel)) {
+ LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
+ ArrayList<Long> types = new ArrayList<>();
+ for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, ioModel.equals("in") ? 1 : 2))) {
+ types.add(orderType.getId());
+ }
+ wrapper.in(Order::getOrderType, types);
+ list = orderService.list(wrapper);
+ }
+ ExcelUtil.build(ExcelUtil.create(list, Order.class), response);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:order:list')")
+ @PostMapping("/order/exportTemplate")
+ public void exportTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ArrayList<OrderTemplate> list = new ArrayList<>();
+ List<MatField> locFields = matFieldService.getLocFields();
+ ExcelUtil.build(ExcelUtil.create(list, OrderTemplate.class, locFields), response);
+ }
+
+ @PostMapping("/order/upload")
+ public R upload(@RequestParam("file") MultipartFile file) {
+ List<OrderTemplate> list = ExcelUtil.parseExcelFile(file, OrderTemplate.class);
+
+ HashMap<String, Object> map = new HashMap<>();
+ for (OrderTemplate orderTemplate : list) {
+ if (!map.containsKey(orderTemplate.getOrderNo())) {
+ OrderType orderType = orderTypeService.getOne(new LambdaQueryWrapper<OrderType>().eq(OrderType::getName, orderTemplate.getOrderType()));
+ if (orderType == null) {
+ throw new CoolException("璁㈠崟绫诲瀷涓嶅瓨鍦�");
+ }
+
+ HashMap<String, Object> paramMap = new HashMap<>();
+ ArrayList<HashMap<String, Object>> paramList = new ArrayList<>();
+ paramList.add(paramMap);
+
+ paramMap.put("matnr", orderTemplate.getMatnr());
+ paramMap.put("batch", orderTemplate.getBatch());
+ paramMap.put("anfme", orderTemplate.getAnfme());
+ paramMap.put("memo", orderTemplate.getMemo());
+ paramMap.putAll(orderTemplate.getDynamicFields());
+
+ CreateOrderParam orderParam = new CreateOrderParam();
+ orderParam.setOrderNo(orderTemplate.getOrderNo());
+ orderParam.setOrderType(orderType.getId());
+ orderParam.setOrderSettle(OrderSettleType.INIT.val());
+ orderParam.setList(paramList);
+
+ map.put(orderTemplate.getOrderNo(), orderParam);
+ }else {
+ CreateOrderParam orderParam = (CreateOrderParam) map.get(orderTemplate.getOrderNo());
+
+ HashMap<String, Object> paramMap = new HashMap<>();
+ paramMap.put("matnr", orderTemplate.getMatnr());
+ paramMap.put("batch", orderTemplate.getBatch());
+ paramMap.put("anfme", orderTemplate.getAnfme());
+ paramMap.put("memo", orderTemplate.getMemo());
+ paramMap.putAll(orderTemplate.getDynamicFields());
+
+ List<HashMap<String, Object>> paramList = orderParam.getList();
+ paramList.add(paramMap);
+
+ orderParam.setList(paramList);
+ map.put(orderTemplate.getOrderNo(), orderParam);
+ }
+ }
+
+ ArrayList<CreateOrderParam> orderParams = new ArrayList<>();
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ CreateOrderParam orderParam = (CreateOrderParam) entry.getValue();
+ orderParams.add(orderParam);
+ }
+ orderService.createOrder(orderParams);
+ return R.ok();
}
}
--
Gitblit v1.9.1