From 669fe984048785873c20fbd0ce8abb3cd52c1fce Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 29 四月 2025 15:22:24 +0800
Subject: [PATCH] 新增出库单优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index 84681bd..6724931 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -3,10 +3,13 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
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.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.api.entity.enums.OrderType;
+import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -15,7 +18,11 @@
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.Matnr;
+import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
+import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -30,6 +37,7 @@
import javax.mail.Multipart;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
@Api(tags = "ASN鍏ュ簱閫氱煡鍗�")
@@ -37,13 +45,18 @@
@Autowired
private AsnOrderService asnOrderService;
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrder/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);
- return R.ok().add(asnOrderService.page(pageParam, pageParam.buildWrapper(true)));
+ QueryWrapper<AsnOrder> queryWrapper = pageParam.buildWrapper(true);
+ List<String> asList = Arrays.asList(OrderType.ORDER_OUT.type);
+ queryWrapper.notIn("type", asList);
+ return R.ok().add(asnOrderService.page(pageParam, queryWrapper));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@@ -130,16 +143,48 @@
if (!ids.isEmpty()) {
orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, ids));
} else {
- orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>());
+ orders = asnOrderService.list(new LambdaQueryWrapper<>());
}
} else {
- orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>());
+ orders = asnOrderService.list();
}
- ExcelUtil.build(ExcelUtil.create(orders, AsnOrder.class), response);
+ List<AsnOrderTemplate> orderTemplates = new ArrayList<>();
+ for (AsnOrder order : orders) {
+ List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
+ for (AsnOrderItem item : orderItems) {
+ if (Objects.isNull(item)) {
+ continue;
+ }
+ AsnOrderTemplate template = new AsnOrderTemplate();
+ template.setCode(order.getCode())
+ .setType(OrderType.getValType(order.getType()))
+ .setWkType(OrderWorkType.getWorkDesc(order.getWkType()))
+ .setExceStatus(AsnExceStatus.getExceStatus(order.getExceStatus()))
+ .setAnfme(item.getAnfme() + "")
+ .setMaktx(item.getMaktx())
+ .setMemo(item.getMemo())
+ .setMatnrCode(item.getMatnrCode())
+ .setPoCode(item.getPoCode())
+ .setSplrName(item.getSplrName())
+ .setPoId(order.getPoId() + "")
+ .setTrackCode(item.getTrackCode())
+ .setBarcode(item.getBarcode())
+ .setPackName(item.getPackName())
+ .setPlatItemId(item.getPlatItemId())
+ .setSplrBatch(item.getSplrBatch())
+ .setSplrCode(item.getSplrCode())
+ .setStockUnit(item.getStockUnit())
+ .setPurQty(item.getPurQty() + "")
+ .setPurUnit(item.getPurUnit());
+ orderTemplates.add(template);
+ }
+ }
+ ExcelUtil.build(ExcelUtil.create(orderTemplates, AsnOrderTemplate.class), response);
}
/**
* 璐ㄦ涓婃姤
+ *
* @param orders
* @return
*/
@@ -160,7 +205,7 @@
@PostMapping("/asnOrder/matnr/list")
@ApiOperation("鐗╂枡鑾峰彇璁㈠崟")
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
- public R getListByMatnr(@RequestBody Map<String, String> params){
+ public R getListByMatnr(@RequestBody Map<String, String> params) {
if (Objects.isNull(params)) {
return R.error("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
}
@@ -173,7 +218,7 @@
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) throws Exception {
if (Objects.isNull(params)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return asnOrderService.saveOrderAndItems(params, getLoginUserId());
}
--
Gitblit v1.9.1