经销商获取历史销售或者采购价格

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/dealer/DealerOrderController.java

@@ -452,5 +452,22 @@ public class DealerOrderController extends BladeController {
 		}
 		return R.data(orderItemsService.lotNo(itemId,storageId,tradeType));
 	}
+	/**
+	 * 经销商获取历史采购或者销售价格
+	 * @param itemId 商品id
+	 * @param typeId 是否获取最新价格 为空是 不为空为否
+	 * @param billType 采购价格或者销售价格
+	 * @param tradeType 贸易类型 国内 进口 出口 经销商
+	 * @return
+	 */
+	@GetMapping("/historyPrice")
+	@ApiOperationSupport(order = 14)
+	@ApiOperation(value = "经销商获取历史采购或者销售价格", notes = "传入order")
+	public R<List<Map<String,Object>>> historyPrice(@RequestParam(value = "itemId") Long itemId,
+											 @RequestParam(value = "typeId", required = false)  Long typeId,
+											 @RequestParam(value = "billType")  String billType,
+											@RequestParam(value = "tradeType")  String tradeType) {
+		return R.data(orderItemsService.historyPrice(itemId,typeId,billType,tradeType));
+	}
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderItemsMapper.java

@@ -80,6 +80,22 @@ public interface OrderItemsMapper extends BaseMapper<OrderItems> {
 	 * @param tradeType
 	 * @return
 	 */
-	List<Map<String, Object>> lotNo(@Param("itemId")Long itemId, @Param("storageId")Long storageId, @Param("tradeType")String tradeType);
+	List<Map<String, Object>> lotNo(@Param("itemId")Long itemId,
+									@Param("storageId")Long storageId,
+									@Param("tradeType")String tradeType,
+									@Param("tenantId")String tenantId);
+	/**
+	 * 经销商获取历史采购或者销售价格
+	 * @param itemId 商品id
+	 * @param typeId 是否获取最新价格 为空是 不为空为否
+	 * @param billType 采购价格或者销售价格
+	 * @param tradeType 贸易类型 国内 进口 出口 经销商
+	 * @return
+	 */
+	List<Map<String, Object>> historyPrice(@Param("itemId")Long itemId,
+										   @Param("typeId")Long typeId,
+										   @Param("billType")String billType,
+										   @Param("tradeType")String tradeType,
+										   @Param("tenantId")String tenantId);
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderItemsMapper.xml

@@ -213,5 +213,28 @@ WHERE
 	AND b.item_id = #{itemId}
 	AND a.storage_id = #{storageId}
 	AND a.trade_type = #{tradeType}
+	And a.tenant_id = #{tenantId}
+    </select>
+    <select id="historyPrice" resultType="map">
+    SELECT
+	a.busines_date AS businesDate,
+    IFNULL(b.price,0)AS price,
+	b.remarks AS remarks
+FROM
+	business_order a,
+	business_order_items b
+WHERE
+	b.pid = a.id
+	AND a.is_deleted = 0
+	AND b.is_deleted = 0
+	AND a.bill_type = #{billType}
+	AND b.item_id = #{itemId}
+	AND a.trade_type = #{tradeType}
+	And a.tenant_id = #{tenantId}
+	ORDER BY a.busines_date DESC,b.create_time DESC
+	<if test="typeId != null">
+        LIMIT 1
+    </if>
+
     </select>
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderItemsService.java

@@ -103,4 +103,14 @@ public interface IOrderItemsService extends IService<OrderItems> {
 	 */
 	List<Map<String,Object>> lotNo(Long itemId,Long storageId,String tradeType);
 
+	/**
+	 * 经销商获取历史采购或者销售价格
+	 * @param itemId 商品id
+	 * @param typeId 是否获取最新价格 为空是 不为空为否
+	 * @param billType 采购价格或者销售价格
+	 * @param tradeType 贸易类型 国内 进口 出口 经销商
+	 * @return
+	 */
+	List<Map<String,Object>> historyPrice(Long itemId,Long typeId,String billType,String tradeType);
+
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderItemsServiceImpl.java

@@ -330,7 +330,12 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 
 	@Override
 	public List<Map<String, Object>> lotNo(Long itemId, Long storageId, String tradeType) {
-		return baseMapper.lotNo(itemId,storageId,tradeType);
+		return baseMapper.lotNo(itemId,storageId,tradeType,SecureUtil.getTenantId());
+	}
+
+	@Override
+	public List<Map<String, Object>> historyPrice(Long itemId, Long typeId, String billType,String tradeType) {
+		return baseMapper.historyPrice(itemId,typeId,billType,tradeType,SecureUtil.getTenantId());
 	}
 
 }