From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 135 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 121 insertions(+), 14 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 7a1dbf9..4992fa8 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
@@ -1,14 +1,20 @@
package com.zy.asrs.wms.asrs.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.CacheData;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -17,10 +23,12 @@
import com.zy.asrs.wms.asrs.service.OrderService;
import com.zy.asrs.wms.system.controller.BaseController;
import com.zy.asrs.wms.utils.ExcelUtil;
+import com.zy.asrs.wms.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
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,9 +41,12 @@
private OrderService orderService;
@Autowired
private OrderTypeService orderTypeService;
+ @Autowired
+ private MatFieldService matFieldService;
@PreAuthorize("hasAuthority('asrs:order:list')")
@PostMapping("/order/page")
+ @CacheData(tableName = {"man_order"})
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
@@ -44,62 +55,96 @@
@PreAuthorize("hasAuthority('asrs:order:list')")
@PostMapping("/order/in/page")
+ @CacheData(tableName = {"man_order", "man_order_type"})
public R pageIn(@RequestBody Map<String, Object> map) {
String condition = map.getOrDefault("condition", "").toString();
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
// QueryWrapper<Order> wrapper = pageParam.buildWrapper(true);
- LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
+ QueryWrapper<Order> wrapper = new QueryWrapper<>();
ArrayList<Long> types = new ArrayList<>();
for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 1))) {
types.add(orderType.getId());
}
- wrapper.in(Order::getOrderType, types);
+ wrapper.in("order_type", types);
if (!Cools.isEmpty(condition)) {
wrapper.and(wrapper1 -> {
- wrapper1.or().like(Order::getOrderNo, condition);
- wrapper1.or().like(Order::getMemo, condition);
+ wrapper1.or().like("order_no", condition);
+ wrapper1.or().like("memo", condition);
});
}
+
+ Object paramObj = map.get("_param");
+ if (paramObj != null) {
+ Map param = (Map) paramObj;
+ for (Object value : param.entrySet()) {
+ Map.Entry entry = (Map.Entry) value;
+ String paramKey = Utils.toSymbolCase(entry.getKey().toString(), '_');
+ if (entry.getValue() != null) {
+ wrapper.like(paramKey, entry.getValue());
+ }
+ }
+ }
+
return R.ok().add(orderService.page(pageParam, wrapper));
}
@PreAuthorize("hasAuthority('asrs:order:list')")
@PostMapping("/order/out/page")
+ @CacheData(tableName = {"man_order", "man_order_type"})
public R pageOut(@RequestBody Map<String, Object> map) {
String condition = map.getOrDefault("condition", "").toString();
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
// QueryWrapper<Order> wrapper = pageParam.buildWrapper(true);
- LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
+ QueryWrapper<Order> wrapper = new QueryWrapper<>();
ArrayList<Long> types = new ArrayList<>();
for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 2))) {
types.add(orderType.getId());
}
- wrapper.in(Order::getOrderType, types);
+ wrapper.in("order_type", types);
+
+ if (map.containsKey("orderOut")) {
+ wrapper.isNull("wave_id");
+ }
if (!Cools.isEmpty(condition)) {
wrapper.and(wrapper1 -> {
- wrapper1.or().like(Order::getOrderNo, condition);
- wrapper1.or().like(Order::getMemo, condition);
+ wrapper1.or().like("order_no", condition);
+ wrapper1.or().like("memo", condition);
});
}
+
+ Object paramObj = map.get("_param");
+ if(paramObj != null) {
+ Map param = (Map) paramObj;
+ for (Object value : param.entrySet()) {
+ Map.Entry entry = (Map.Entry) value;
+ String paramKey = Utils.toSymbolCase(entry.getKey().toString(), '_');
+ if (entry.getValue() != null) {
+ wrapper.like(paramKey, entry.getValue());
+ }
+ }
+ }
+
return R.ok().add(orderService.page(pageParam, wrapper));
}
@PreAuthorize("hasAuthority('asrs:order:list')")
@PostMapping("/order/list")
+ @CacheData(tableName = {"man_order"})
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(orderService.list());
}
@PreAuthorize("hasAuthority('asrs:order:list')")
@GetMapping("/order/{id}")
+ @CacheData(tableName = {"man_order"})
public R get(@PathVariable("id") Long id) {
return R.ok().add(orderService.getById(id));
}
@@ -154,15 +199,20 @@
@PostMapping("/order/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
String ioModel = map.getOrDefault("ioModel", "").toString();
- List<Order> list = orderService.list();
+ map.remove("ioModel");
+
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
+ QueryWrapper<Order> queryWrapper = pageParam.buildWrapper(true);
+
+ List<Order> list = orderService.list(queryWrapper);
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);
+ queryWrapper.in("order_type", types);
+ list = orderService.list(queryWrapper);
}
ExcelUtil.build(ExcelUtil.create(list, Order.class), response);
}
@@ -170,8 +220,65 @@
@PreAuthorize("hasAuthority('asrs:order:list')")
@PostMapping("/order/exportTemplate")
public void exportTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ArrayList<Order> list = new ArrayList<>();
- ExcelUtil.build(ExcelUtil.create(list, Order.class), response);
+ 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