Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/controller/ivt/OutboundController.java

@@ -1,8 +1,11 @@
 package com.dk.mdm.controller.ivt;
 
+import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.ivt.Outbound;
 import com.dk.common.service.BaseService;
+import com.dk.mdm.model.query.ivt.OutboundQuery;
+import com.dk.mdm.model.response.ivt.OutboundResponse;
 import com.dk.mdm.model.vo.ivt.OutboundVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -10,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.ivt.OutboundService;
 
+import java.util.Map;
+
 @Api(tags = "出库单API接口")
 @RestController
 @RequestMapping("/ivt/outbound")
@@ -23,6 +28,27 @@ public class OutboundController{
     private OutboundService outboundService;
 
     /**
+     * @desc : 条件查询
+     * @author : 付斌
+     * @date : 2023/1/9 10:36
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"list_by"})
+    public ResponseResultVO<PageList<OutboundResponse>> selectByCond(@RequestBody OutboundQuery outboundQuery) {
+        return outboundService.selectByCond(outboundQuery);
+    }
+
+    /**
+     * @desc   : 查询明细信息
+     * @author : 付斌
+     * @date   : 2024-03-07 16:36
+     */
+    @PostMapping({"select_outbound_info_by_id/{id}"})
+    public ResponseResultVO<Map<String, Object>> selectOutboundInfoById(@PathVariable String id) {
+        return outboundService.selectOutboundInfoById(id);
+    }
+
+    /**
      * @desc : 新建出库单
      * @author : 付斌
      * @date : 2023/1/9 10:48

src/main/java/com/dk/mdm/controller/sale/OutReturnController.java

@@ -1,18 +1,20 @@
 package com.dk.mdm.controller.sale;
 
+import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.sale.OutReturn;
 import com.dk.common.service.BaseService;
+import com.dk.mdm.model.query.sale.OutReturnQuery;
+import com.dk.mdm.model.response.sale.OutReturnResponse;
 import com.dk.mdm.model.vo.sale.OutReturnVO;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.sale.OutReturnService;
 
+import java.util.Map;
+
 @Api(tags = "出库退货API接口")
 @RestController
 @RequestMapping("/sale/outReturn")
@@ -26,6 +28,27 @@ public class OutReturnController{
     private OutReturnService outReturnService;
 
     /**
+     * @desc : 条件查询
+     * @author : 付斌
+     * @date : 2023/1/9 10:36
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"list_by"})
+    public ResponseResultVO<PageList<OutReturnResponse>> selectByCond(@RequestBody OutReturnQuery outReturnQuery) {
+        return outReturnService.selectByCond(outReturnQuery);
+    }
+
+    /**
+     * @desc   : 查询明细信息
+     * @author : 付斌
+     * @date   : 2024-03-07 16:36
+     */
+    @PostMapping({"select_out_return_info_by_id/{id}"})
+    public ResponseResultVO<Map<String, Object>> selectOutReturnInfoById(@PathVariable String id) {
+        return outReturnService.selectOutReturnInfoById(id);
+    }
+
+    /**
      * @desc : 新建退货
      * @author : 付斌
      * @date : 2023/1/9 10:48

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.java

@@ -18,13 +18,13 @@ public interface OutboundItemMapper extends BaseMapper<OutboundItem>{
      * @author : 付斌
      * @date   : 2024-02-28 10:18
      */
-    List<OutboundItemResponse> selectByCond(OutboundItemQuery orderQuery);
+    List<OutboundItemResponse> selectByCond(OutboundItemQuery outboundItemQuery);
 
     /**
      * @desc   : 根据条件进行查询（数量）
      * @author : 付斌
      * @date   : 2024-02-28 10:19
      */
-    Long countByCond(OutboundItemQuery orderQuery);
+    Long countByCond(OutboundItemQuery outboundItemQuery);
 }
 

src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.java

@@ -2,15 +2,32 @@ package com.dk.mdm.mapper.ivt;
 
 import com.dk.mdm.model.pojo.ivt.Outbound;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.ivt.OutboundQuery;
 import com.dk.mdm.model.response.ivt.OutboundResponse;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 *  出库单 Mapper
 */
 @Repository
 public interface OutboundMapper extends BaseMapper<Outbound>{
     /**
+     * @desc   : 根据条件进行查询
+     * @author : 付斌
+     * @date   : 2024-02-28 10:18
+     */
+    List<OutboundResponse> selectByCond(OutboundQuery outboundQuery);
+
+    /**
+     * @desc   : 根据条件进行查询（数量）
+     * @author : 付斌
+     * @date   : 2024-02-28 10:19
+     */
+    Long countByCond(OutboundQuery outboundQuery);
+
+    /**
      * @desc   : 根据Id进行查询
      * @author : 付斌
      * @date   : 2024-03-03 9:25

src/main/java/com/dk/mdm/mapper/sale/OutReturnItemMapper.java

@@ -2,13 +2,29 @@ package com.dk.mdm.mapper.sale;
 
 import com.dk.mdm.model.pojo.sale.OutReturnItem;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.sale.OutReturnItemQuery;
+import com.dk.mdm.model.response.sale.OutReturnItemResponse;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 *  出库退货明细 Mapper
 */
 @Repository
 public interface OutReturnItemMapper extends BaseMapper<OutReturnItem>{
-	
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 付斌
+     * @date   : 2024-02-28 10:18
+     */
+    List<OutReturnItemResponse> selectByCond(OutReturnItemQuery outReturnItemQuery);
+
+    /**
+     * @desc   : 根据条件进行查询（数量）
+     * @author : 付斌
+     * @date   : 2024-02-28 10:19
+     */
+    Long countByCond(OutReturnItemQuery outReturnItemQuery);
 }
 

src/main/java/com/dk/mdm/mapper/sale/OutReturnMapper.java

@@ -2,13 +2,36 @@ package com.dk.mdm.mapper.sale;
 
 import com.dk.mdm.model.pojo.sale.OutReturn;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.sale.OutReturnQuery;
+import com.dk.mdm.model.response.sale.OutReturnResponse;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 *  出库退货 Mapper
 */
 @Repository
 public interface OutReturnMapper extends BaseMapper<OutReturn>{
-	
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 付斌
+     * @date   : 2024-02-28 10:18
+     */
+    List<OutReturnResponse> selectByCond(OutReturnQuery outReturnQuery);
+
+    /**
+     * @desc   : 根据条件进行查询（数量）
+     * @author : 付斌
+     * @date   : 2024-02-28 10:19
+     */
+    Long countByCond(OutReturnQuery outReturnQuery);
+
+    /**
+     * @desc   : 根据Id进行查询
+     * @author : 付斌
+     * @date   : 2024-03-03 9:25
+     */
+    OutReturnResponse selectById(String id);
 }
 

src/main/java/com/dk/mdm/service/ivt/OutboundService.java

@@ -2,8 +2,10 @@ package com.dk.mdm.service.ivt;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.dk.common.exception.BaseBusinessException;
+import com.dk.common.infrastructure.annotaiton.Pagination;
 import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.infrastructure.enums.ErrorCodeEnum;
+import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
@@ -20,6 +22,7 @@ import com.dk.mdm.model.pojo.ivt.OutboundItem;
 import com.dk.mdm.model.pojo.sale.Order;
 import com.dk.mdm.model.pojo.sale.OrderItem;
 import com.dk.mdm.model.query.ivt.OutboundItemQuery;
+import com.dk.mdm.model.query.ivt.OutboundQuery;
 import com.dk.mdm.model.response.ivt.OutboundItemResponse;
 import com.dk.mdm.model.response.ivt.OutboundResponse;
 import com.dk.mdm.model.response.sale.OrderResponse;
@@ -84,6 +87,35 @@ public class OutboundService extends BaseService<Outbound> {
 	private OutboundItemConvert outboundItemConvert;
 
 	/**
+	 * @desc : 条件查询
+	 * @author : 付斌
+	 * @date : 2023/1/9 10:40
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<OutboundResponse>> selectByCond(OutboundQuery outboundQuery) {
+		return super.mergeListWithCount(outboundQuery, outboundMapper.selectByCond(outboundQuery),
+				outboundMapper.countByCond(outboundQuery));
+	}
+
+	/**
+	 * @desc : 查询订单明细（货物、收款、附件）
+	 * @author : 付斌
+	 * @date : 2024-02-28 13:25
+	 */
+	@Pagination
+	public ResponseResultVO<Map<String, Object>> selectOutboundInfoById(String id) {
+		Map<String, Object> result = new HashMap<>();
+		// 商品明细
+		List<OutboundItemResponse> outboundItem = outboundItemMapper.selectByCond(new OutboundItemQuery().setOutId(id));
+		result.put("outboundItem", outboundItem);
+
+		// 收款
+
+		// 附件
+		return ResponseResultUtil.success(result);
+	}
+	
+	/**
 	 * @desc : 新建方法
 	 * @author : 付斌
 	 * @date : 2023/1/9 10:49

src/main/java/com/dk/mdm/service/sale/OutReturnService.java

@@ -2,8 +2,10 @@ package com.dk.mdm.service.sale;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.dk.common.exception.BaseBusinessException;
+import com.dk.common.infrastructure.annotaiton.Pagination;
 import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.infrastructure.enums.ErrorCodeEnum;
+import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
@@ -19,7 +21,11 @@ import com.dk.mdm.model.pojo.sale.OutReturnItem;
 import com.dk.mdm.mapper.sale.OutReturnMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.sale.OutReturnItemQuery;
+import com.dk.mdm.model.query.sale.OutReturnQuery;
 import com.dk.mdm.model.response.sale.OrderResponse;
+import com.dk.mdm.model.response.sale.OutReturnItemResponse;
+import com.dk.mdm.model.response.sale.OutReturnResponse;
 import com.dk.mdm.model.vo.sale.OutReturnItemVO;
 import com.dk.mdm.model.vo.sale.OutReturnVO;
 import com.dk.mdm.service.common.CommonService;
@@ -28,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -78,6 +85,35 @@ public class OutReturnService extends BaseService<OutReturn> {
     private OutReturnItemConvert outReturnItemConvert;
 
     /**
+     * @desc : 条件查询
+     * @author : 付斌
+     * @date : 2023/1/9 10:40
+     */
+    @Pagination
+    public ResponseResultVO<PageList<OutReturnResponse>> selectByCond(OutReturnQuery outReturnQuery) {
+        return super.mergeListWithCount(outReturnQuery, outReturnMapper.selectByCond(outReturnQuery),
+                outReturnMapper.countByCond(outReturnQuery));
+    }
+
+    /**
+     * @desc : 查询订单明细（货物、收款、附件）
+     * @author : 付斌
+     * @date : 2024-02-28 13:25
+     */
+    @Pagination
+    public ResponseResultVO<Map<String, Object>> selectOutReturnInfoById(String id) {
+        Map<String, Object> result = new HashMap<>();
+        // 商品明细
+        List<OutReturnItemResponse> outReturnItem = outReturnItemMapper.selectByCond(new OutReturnItemQuery().setReturnId(id));
+        result.put("outReturnItem", outReturnItem);
+
+        // 收款
+
+        // 附件
+        return ResponseResultUtil.success(result);
+    }
+
+    /**
      * @desc : 新建方法
      * @author : 付斌
      * @date : 2023/1/9 10:49