From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro
---
src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml | 99 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml b/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
new file mode 100644
index 0000000..267de0b
--- /dev/null
+++ b/src/main/resources/mapper/account/purchase/AccountPaymentApplicationMapper.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.purchase.AccountPaymentApplicationMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.purchase.AccountPaymentApplication">
+ <id column="id" property="id" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="dept_id" property="deptId" />
+ <result column="supplier_id" property="supplierId" />
+ <result column="stock_in_record_ids" property="stockInRecordIds" />
+ <result column="invoice_application_no" property="invoiceApplicationNo" />
+ <result column="payment_method" property="paymentMethod" />
+ <result column="payment_content" property="paymentContent" />
+ <result column="apply_date" property="applyDate" />
+ <result column="remark" property="remark" />
+ <result column="status" property="status" />
+ <result column="payment_amount" property="paymentAmount" />
+ </resultMap>
+ <select
+ id="listPageAccountPaymentApplication"
+ resultType="com.ruoyi.account.bean.vo.purchase.AccountPaymentApplicationVo">
+ select * from (select apa.*,
+ sm.supplier_name,
+ GROUP_CONCAT(sir.inbound_batches SEPARATOR ',') AS inboundBatches
+ from account_payment_application apa
+ left join supplier_manage sm on apa.supplier_id = sm.id
+ left join stock_in_record sir on FIND_IN_SET(sir.id, apa.stock_in_record_ids) > 0
+ GROUP BY apa.id)A
+ <where>
+ <if test="req.supplierId != null">
+ AND A.supplier_id = #{req.supplierId}
+ </if>
+ <if test="req.invoiceApplicationNo != null and req.invoiceApplicationNo != ''">
+ AND A.invoice_application_no LIKE CONCAT('%',#{req.invoiceApplicationNo},'%')
+ </if>
+ <if test="req.status != null">
+ AND A.status = #{req.status}
+ </if>
+ <if test="req.startDate != null and req.endDate != null">
+ AND A.apply_date BETWEEN #{req.startDate} AND #{req.endDate}
+ </if>
+ </where>
+ order by A.id desc
+ </select>
+
+ <select id="getInboundBatchesBySupplier"
+ resultType="com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo">
+ SELECT
+ sir.id,
+ sir.inbound_batches,
+ pl.supplier_name,
+ DATE(sir.create_time) AS inboundDate,
+ p.product_name,
+ pm.model as specification_model,
+ sir.stock_in_num * slp.tax_inclusive_unit_price AS InboundAmount,
+ pl.purchase_contract_number
+ FROM stock_in_record sir
+ -- 10 绫诲瀷鎵嶅叧鑱旇川妫�琛�
+ LEFT JOIN quality_inspect qi ON sir.record_type = 10 AND sir.record_id = qi.id
+ -- 鍔ㄦ�佸叧鑱旈噰璐紙鑷姩閫傞厤 7 鍜� 10锛�
+ LEFT JOIN purchase_ledger pl
+ ON pl.id = IF(sir.record_type = 7, sir.record_id, qi.purchase_ledger_id)
+ -- 浜у搧鍏宠仈涓嶅姩
+ LEFT JOIN sales_ledger_product slp ON pl.id = slp.sales_ledger_id
+ LEFT JOIN product_model pm ON sir.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
+ -- 鏉′欢
+ WHERE sir.approval_status = 1 AND slp.type = 2
+ AND sir.record_type IN ('7','10')
+ and pl.supplier_id=#{supplierId}
+
+ and sir.id NOT IN (
+ SELECT DISTINCT SUBSTRING_INDEX(SUBSTRING_INDEX(a.stock_in_record_ids, ',', n.n), ',', -1)
+ FROM account_payment_application a
+ CROSS JOIN (
+ SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL
+ SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6
+ ) n
+ WHERE n.n <= CHAR_LENGTH(a.stock_in_record_ids) - CHAR_LENGTH(REPLACE(a.stock_in_record_ids, ',', '')) + 1
+ and a.status!=2
+ )
+
+ order by sir.id DESC
+ </select>
+
+ <select id="existsByStockInRecordId" resultType="java.lang.Boolean">
+ SELECT COUNT(*) > 0
+ FROM account_payment_application
+ WHERE status != 2
+ <foreach collection="stockInRecordIds" item="id" open="(" separator=" OR " close=")">
+ FIND_IN_SET(#{id}, stock_in_record_ids)
+ </foreach>
+ </select>
+
+</mapper>
--
Gitblit v1.9.3