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/mapper/AsnOrderItemMapper.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java
index 25d621b..ce58bca 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java
@@ -1,24 +1,33 @@
package com.vincent.rsf.server.manager.mapper;
+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.toolkit.Constants;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.InOrderAndItem;
+import com.vincent.rsf.server.manager.entity.OutOrderAndItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
+import java.util.List;
import java.util.Map;
@Mapper
@Repository
-public interface AsnOrderItemMapper extends BaseMapper<AsnOrderItem> {
+public interface AsnOrderItemMapper extends BaseMapper<WkOrderItem> {
- IPage<Map<String, Object>> resultForMap(PageParam<AsnOrderItem, BaseParam> pages, @Param(Constants.WRAPPER) QueryWrapper<AsnOrderItem> buildWrapper);
+ IPage<Map<String, Object>> resultForMap(PageParam<WkOrderItem, BaseParam> pages, @Param(Constants.WRAPPER) QueryWrapper<WkOrderItem> buildWrapper);
-// List<Map<String, Object>> resultForMap(long pageParam, @Param(Constants.WRAPPER) QueryWrapper<AsnOrderItem> ew);
+ WkOrderItem resultById(@Param(Constants.WRAPPER) LambdaQueryWrapper<WkOrderItem> buildWrapper);
+ List<InOrderAndItem> queryFullOrder();
+
+ IPage<InOrderAndItem> queryFullOrderWithPaging(PageParam<WkOrderItem, BaseParam> pageParam, @Param(Constants.WRAPPER) QueryWrapper<WkOrderItem> wrapper);
+
+ IPage<OutOrderAndItem> queryFullOutOrderWithPaging(PageParam<WkOrderItem, BaseParam> pageParam, @Param(Constants.WRAPPER) QueryWrapper<WkOrderItem> wrapper);
}
--
Gitblit v1.9.1