From 5d2de26fe8fec9900bae351666e0afb442bb0f79 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 22 一月 2026 13:42:13 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java | 91 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 82 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
index e2c3536..ec1d805 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
@@ -1,9 +1,9 @@
package com.vincent.rsf.server.manager.controller;
-
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;
@@ -14,11 +14,14 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Companys;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
+import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
+import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -31,6 +34,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@Api(tags = "ASN鍗曟槑缁�")
@RestController
@@ -38,6 +42,9 @@
@Autowired
private AsnOrderItemService asnOrderItemService;
+
+ @Autowired
+ private AsnOrderService asnOrderService;
@Autowired
private CompanysService companysService;
@@ -48,8 +55,76 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
- /**鎷兼帴鎵╁睍瀛楁*/
+ /** 鎷兼帴鎵╁睍瀛楁 */
PageParam<WkOrderItem, BaseParam> page = asnOrderItemService.page(pageParam, pageParam.buildWrapper(true));
+ List<WkOrderItem> records = page.getRecords();
+ for (WkOrderItem record : records) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ }
+ page.setRecords(records);
+ return R.ok(page);
+ }
+
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
+ @PostMapping("/asnOrderItem/in/page")
+ public R pageIn(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ // 鏌ヨtype涓�"in"鐨勮鍗旾D鍒楄〃
+ List<Long> orderIds = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getType, OrderType.ORDER_IN.type)
+ .select(WkOrder::getId))
+ .stream()
+ .map(WkOrder::getId)
+ .collect(Collectors.toList());
+ // 鏋勫缓鏌ヨ鏉′欢锛屽叧鑱攁snOrder琛ㄧ瓫閫塼ype涓篿n鐨勬暟鎹�
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true);
+ if (!orderIds.isEmpty()) {
+ wrapper.in("order_id", orderIds);
+ } else {
+ // 濡傛灉娌℃湁绗﹀悎鏉′欢鐨勮鍗曪紝杩斿洖绌虹粨鏋�
+ wrapper.eq("1", "0");
+ }
+ /** 鎷兼帴鎵╁睍瀛楁 */
+ PageParam<WkOrderItem, BaseParam> page = asnOrderItemService.page(pageParam, wrapper);
+ List<WkOrderItem> records = page.getRecords();
+ for (WkOrderItem record : records) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ }
+ page.setRecords(records);
+ return R.ok(page);
+ }
+
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
+ @PostMapping("/asnOrderItem/out/page")
+ public R pageOut(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ // 鏌ヨtype涓�"in"鐨勮鍗旾D鍒楄〃
+ List<Long> orderIds = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
+ .select(WkOrder::getId))
+ .stream()
+ .map(WkOrder::getId)
+ .collect(Collectors.toList());
+ // 鏋勫缓鏌ヨ鏉′欢锛屽叧鑱攁snOrder琛ㄧ瓫閫塼ype涓篿n鐨勬暟鎹�
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true);
+ if (!orderIds.isEmpty()) {
+ wrapper.in("order_id", orderIds);
+ } else {
+ // 濡傛灉娌℃湁绗﹀悎鏉′欢鐨勮鍗曪紝杩斿洖绌虹粨鏋�
+ wrapper.eq("1", "0");
+ }
+ /** 鎷兼帴鎵╁睍瀛楁 */
+ PageParam<WkOrderItem, BaseParam> page = asnOrderItemService.page(pageParam, wrapper);
List<WkOrderItem> records = page.getRecords();
for (WkOrderItem record : records) {
if (!Objects.isNull(record.getFieldsIndex())) {
@@ -68,7 +143,7 @@
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
- @PostMapping({"/asnOrderItem/many/{ids}", "/asnOrderItems/many/{ids}"})
+ @PostMapping({ "/asnOrderItem/many/{ids}", "/asnOrderItems/many/{ids}" })
public R many(@PathVariable Long[] ids) {
return R.ok().add(asnOrderItemService.listByIds(Arrays.asList(ids)));
}
@@ -95,7 +170,6 @@
return R.ok("Save Success");
}
-
@PreAuthorize("hasAuthority('manager:asnOrder:update')")
@OperationLog("Update ASN鍗曟嵁")
@PostMapping("/asnOrderItem/update")
@@ -104,7 +178,7 @@
wkOrderItem.setUpdateTime(new Date());
if (!Objects.isNull(wkOrderItem.getSplrName()) && StringUtils.isNotBlank(wkOrderItem.getSplrName())) {
Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
- .eq(Companys::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val)
+ .eq(Companys::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val)
.eq(Companys::getId, wkOrderItem.getSplrName()));
if (!Objects.isNull(companys)) {
wkOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
@@ -135,8 +209,7 @@
wrapper.like(WkOrderItem::getId, condition);
}
asnOrderItemService.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.getId())));
return R.ok().add(vos);
}
@@ -161,7 +234,6 @@
ExcelUtil.build(ExcelUtil.create(orderItems, WkOrderItem.class, true), response);
}
-
@PostMapping("/asnOrderItem/generate/barcode")
@ApiOperation("鐢熸垚ASN鏍囩")
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@@ -174,6 +246,7 @@
/**
* ASN鍗曟嵁鏄庣粏瀵煎叆
+ *
* @param file
* @return
*/
@@ -182,7 +255,7 @@
@PreAuthorize("hasAuthority('manager:asnOrder:update')")
public R importExcel(@RequestParam(value = "file") MultipartFile file) throws Exception {
if (Objects.isNull(file)) {
- return R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
+ return R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
}
HashMap<String, Object> hashMap = new HashMap<>();
return asnOrderItemService.excelImport(file, hashMap, getLoginUserId());
--
Gitblit v1.9.1