From 14f6548120b5d7f58ae2082454508a26ddac1db8 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 25 二月 2026 14:01:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 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 ec1d805..c21ac86 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
@@ -4,6 +4,8 @@
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.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -14,12 +16,11 @@
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.*;
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.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.CompanysService;
@@ -32,6 +33,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -48,6 +50,9 @@
@Autowired
private CompanysService companysService;
+ @Resource
+ private AsnOrderItemMapper asnOrderItemMapper;
+
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
@@ -104,6 +109,19 @@
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
+ @PostMapping("/asnOrderItemFull/in/page")
+ public R pageInFull(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true, null, "create_time", "mi");
+ wrapper.eq("mo.type", OrderType.ORDER_IN.type);
+
+ IPage<InOrderAndItem> page = asnOrderItemMapper.queryFullOrderWithPaging(pageParam, wrapper);
+ 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);
@@ -137,6 +155,19 @@
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @ApiOperation("鍒嗛〉鑾峰彇鍑哄簱鍒楄〃")
+ @PostMapping("/asnOrderItemFull/out/page")
+ public R pageOutFull(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true, null, "create_time", "mi");
+ wrapper.eq("mo.type", OrderType.ORDER_OUT.type);
+
+ IPage<OutOrderAndItem> page = asnOrderItemMapper.queryFullOutOrderWithPaging(pageParam, wrapper);
+ return R.ok(page);
+ }
+
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrderItem/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(asnOrderItemService.list());
--
Gitblit v1.9.1