修改提交

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/vo/OrderDTO.java

@@ -0,0 +1,42 @@
+package com.trade.purchase.order.vo;
+
+import com.trade.purchase.order.entity.OrderItems;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单明细表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-09-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "OrderDTO对象", description = "订单明细")
+public class OrderDTO extends OrderItems {
+	private static final long serialVersionUID = 1L;
+
+	private String orderNo;
+
+	private String billNo;
+
+	private Long corpId;
+
+	private String priceCategory;
+
+	private String itemType;
+
+	private BigDecimal purchaseQuantity;
+
+	private BigDecimal billWeight;
+
+	private BigDecimal invoiceWeight;
+
+	private BigDecimal price;
+
+	private BigDecimal amount;
+
+}

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -19,6 +19,7 @@ import com.trade.purchase.order.service.IOrderFeesService;
 import com.trade.purchase.order.service.IOrderFilesService;
 import com.trade.purchase.order.service.IOrderItemsService;
 import com.trade.purchase.order.service.IOrderService;
+import com.trade.purchase.order.vo.OrderDTO;
 import com.trade.purchase.order.vo.OrderVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -296,4 +297,21 @@ public class PurchaseOrderController extends BladeController {
 	{
 		return orderService.getSysNo(prefix);
 	}
+
+	@GetMapping("getItemListByConditions")
+	@ApiOperation(value = "收发单-获取商品明细", notes = "收发单-获取商品明细")
+	public R getItemListByConditions(@RequestParam(name = "current", defaultValue = "1") Integer current,
+									 @RequestParam(name = "size", defaultValue = "10") Integer size,
+									 @RequestParam(name = "tradeType", required = true) String tradeType,
+									 @RequestParam(name = "orderNo", required = false) String orderNo,
+									 @RequestParam(name = "corpId", required = false) Long corpId,
+									 @RequestParam(name = "startDate", required = false) String  startDate,
+									 @RequestParam(name = "endDate", required = false) String  endDate
+									 )
+	{
+		Page<OrderDTO> page=new Page<>(current,size);
+		IPage<OrderDTO> iPage = orderService.listOrderItem(page, tradeType, orderNo, corpId, startDate, endDate);
+		return R.data(iPage);
+	}
+
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderItemsMapper.java

@@ -4,7 +4,9 @@ package com.trade.purchase.order.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.trade.purchase.order.entity.OrderItems;
+import com.trade.purchase.order.vo.OrderDTO;
 import com.trade.purchase.order.vo.OrderItemsVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -25,4 +27,6 @@ public interface OrderItemsMapper extends BaseMapper<OrderItems> {
 	 */
 	List<OrderItemsVO> selectOrderItemsPage(IPage page, OrderItemsVO orderItems);
 
+	IPage<OrderDTO>  listOrderItem(IPage<OrderDTO> iPage, @Param("tradeType") String tradeType,@Param("orderNo") String orderNo,@Param("corpId")  Long corpId,@Param("startDate")  String startDate, @Param("endDate") String endDate);
+
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderItemsMapper.xml

@@ -58,4 +58,37 @@
         select * from business_order_items where is_deleted = 0
     </select>
 
+    <select id="listOrderItem" resultType="com.trade.purchase.order.vo.OrderDTO">
+        SELECT
+        a.order_no as orderNo,
+        b.bill_no as billNo,
+        a.corp_id as corpId,
+        b.price_category as priceCategory,
+        b.item_type as itemType,
+        b.purchase_quantity as purchaseQuantity,
+        b.bill_weight as billWeight,
+        b.invoice_weight as invoiceWeight,
+        b.price as price,
+        b.amount as amount
+        FROM
+        business_order a,
+        business_order_items b
+        WHERE
+        a.id = b.pid
+        and b.purchase_quantity>b.actual_quantity
+        and a.bill_type='CG'
+        and a.trade_type=#{tradeType}
+        and a.is_deleted=0
+        and b.is_deleted=0
+        <if test="orderNo!=null and orderNo != ''">
+            and a.order_no like concat(concat('%',  #{orderNo}),'%')
+        </if>
+        <if test="corpId!=null">
+            and a.corp_id = #{corpId}
+        </if>
+        <if test="startDate != null and endDate != null">
+            and a.create_time between #{startDate} and #{endDate}
+        </if>
+    </select>
+
 </mapper>

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/IOrderService.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.trade.purchase.order.dto.OrderSubmitDto;
 import com.trade.purchase.order.entity.Order;
+import com.trade.purchase.order.vo.OrderDTO;
 import com.trade.purchase.order.vo.OrderVO;
 import lombok.Synchronized;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.tool.api.R;
 
 /**
@@ -88,4 +90,6 @@ public interface IOrderService extends IService<Order> {
 	 */
 	void check(OrderVO order);
 
+	IPage<OrderDTO>  listOrderItem(IPage<OrderDTO> iPage, String tradeType, String orderNo,  Long corpId,  String startDate,String endDate);
+
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -13,8 +13,10 @@ import com.trade.purchase.order.component.IOrderSave;
 import com.trade.purchase.order.dto.OrderSubmitDto;
 import com.trade.purchase.order.entity.*;
 import com.trade.purchase.order.enums.OrderTypeEnum;
+import com.trade.purchase.order.mapper.OrderItemsMapper;
 import com.trade.purchase.order.mapper.OrderMapper;
 import com.trade.purchase.order.service.IOrderService;
+import com.trade.purchase.order.vo.OrderDTO;
 import com.trade.purchase.order.vo.OrderItemsVO;
 import com.trade.purchase.order.vo.OrderVO;
 import io.seata.spring.annotation.GlobalTransactional;
@@ -64,6 +66,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 	private OrderMapper orderMapper;
 	private IStockGoodsClient stockGoodsClient;
+	private OrderItemsMapper orderItemsMapper;
 
 
 
@@ -429,6 +432,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		//todo 推送
 	}
 
+	@Override
+	public IPage<OrderDTO> listOrderItem(IPage<OrderDTO> iPage, String tradeType, String orderNo, Long corpId, String startDate, String endDate)
+	{
+		return orderItemsMapper.listOrderItem(iPage,tradeType,orderNo,corpId,startDate,endDate);
+	}
+
 	/**
 	 * 获取订单明细数据
 	 *