product-inventory-management-after.git

			@@ -46,7 +46,8 @@
			t2.tax_rate,
			t2.tax_inclusive_unit_price,
			(t1.inbound_num * t2.tax_inclusive_unit_price) as taxInclusiveTotalPrice,
			(t1.inbound_num * t2.tax_inclusive_unit_price - t1.inbound_num * t2.tax_inclusive_unit_price * t2.tax_rate / 100) as taxExclusiveTotalPrice,
			(t1.inbound_num * t2.tax_inclusive_unit_price - t1.inbound_num * t2.tax_inclusive_unit_price * t2.tax_rate /
			100) as taxExclusiveTotalPrice,
			t1.inbound_batches,
			t1.inbound_num,
			t1.inbound_num as inboundNum0,
			@@ -72,15 +73,17 @@
			</where>
			</select>
			<select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
			select
			t3.supplier_name,
			select t3.supplier_name,
			t3.purchase_contract_number,
			case when t2.product_category is null then t5.product_name
			case
			when t2.product_category is null then t5.product_name
			else t2.product_category end as productCategory,
			t1.id,
			case when t2.specification_model is null then t4.model
			case
			when t2.specification_model is null then t4.model
			else t2.specification_model end as specificationModel,
			case when t2.unit is null then t4.unit
			case
			when t2.unit is null then t4.unit
			else t2.unit end as unit,
			t2.quantity,
			t2.quantity as quantity0,
			@@ -99,9 +102,10 @@
			left join product_model t4 on t4.id = t1.product_model_id
			left join product t5 on t5.id = t4.product_id
			</select>

			<select id="listPageCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
			select
			t3.supplier_name,
			IFNULL(t3.supplier_name, '手动新增') as supplierName,
			t3.purchase_contract_number,
			case when t2.product_category is null then t5.product_name
			else t2.product_category end as productCategory,
			@@ -133,41 +137,35 @@
			<where>
			1 = 1
			<if test="req.supplierName != null and req.supplierName != ''">
			and t3.supplier_name like concat('%',#{req.supplierName},'%')
			</if>
			<if test="req.timeStr != null and req.timeStr != ''">
			and t1.create_time like concat('%',#{req.timeStr},'%')
			</if>
			<if test="req.reportDate != null">
			and t1.create_time >= #{req.reportDate} and t1.create_time < DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
			</if>
			<if test="req.startMonth != null">
			and t1.create_time >= #{req.startMonth}
			</if>
			<if test="req.endMonth != null">
			and t1.create_time <= #{req.endMonth}
			</if>
			<if test="req.startDate != null">
			and t1.create_time >= #{req.startDate}
			</if>
			<if test="req.endDate != null">
			and t1.create_time <= #{req.endDate}
			and (t3.supplier_name like concat('%',#{req.supplierName},'%')
			or (#{req.supplierName} = '手动新增' and t3.supplier_name is null))
			</if>
			</where>
			group by t3.supplier_name,t2.product_category,t2.specification_model
			group by
			IFNULL(t3.supplier_name, '手动新增'),
			productCategory,
			specificationModel,
			t1.product_model_id,
			t2.id
			order by
			(t3.supplier_name IS NULL) DESC,
			t3.supplier_name ASC,
			productCategory ASC
			</select>
			<select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
			select
			t3.supplier_name,
			select t3.supplier_name,
			t3.purchase_contract_number,
			case when t2.product_category is null then t5.product_name
			case
			when t2.product_category is null then t5.product_name
			else t2.product_category end as productCategory,
			t1.id,
			t1.sales_ledger_product_id,
			t1.create_user,
			case when t2.specification_model is null then t4.model
			case
			when t2.specification_model is null then t4.model
			else t2.specification_model end as specificationModel,
			case when t2.unit is null then t4.unit
			case
			when t2.unit is null then t4.unit
			else t2.unit end as unit,
			t2.tax_rate,
			t2.tax_inclusive_unit_price,