From 0e420d68f407fde240709ac1800da20b0bb99490 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 16:06:16 +0800
Subject: [PATCH] feat：反审核操作。可以对已审核的订单进行反审核，反审核的时候可以选择作废还是重新生成一条，并记录反审核描述。选择作废的话则不生成新增订单。选择重新生成的话则跳转到新增台账页面对反审核的销售产品进行编辑保存重新生成一条新增的订单。反审核的订单即使是发货了还是可以反审核，并且需要将对应的入库、出库、发货进行作废。
---
src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml b/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml
index e29cc8d..ba0e289 100644
--- a/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml
@@ -3,24 +3,26 @@
<mapper namespace="com.ruoyi.procurementrecord.mapper.CustomStorageMapper">
<select id="listPageCopyByCustom" resultType="com.ruoyi.procurementrecord.pojo.CustomStorage">
- select *,
- sum(inbound_num) as inboundNum,
- sum(inbound_num) as inboundNum0,
- sum(tax_inclusive_total_price) as taxInclusiveTotalPrice
- from custom_storage
+ select t1.*,
+ sum(t1.inbound_num) as inboundNum,
+ sum(t1.inbound_num) as inboundNum0,
+ sum(t1.tax_inclusive_total_price) as taxInclusiveTotalPrice,
+ SUM(t1.inbound_num) - COALESCE(SUM(t2.inbound_num), 0) AS availableStock
+ from custom_storage t1
+ left join procurement_record_out t2 on t1.id = t2.procurement_record_storage_id and t2.type = 3
<where>
<if test="req.productCategory != null and req.productCategory != ''">
- and product_category like concat('%',#{req.productCategory},'%')
+ and t1.product_category like concat('%',#{req.productCategory},'%')
</if>
<if test="req.supplierName !=null and req.supplierName != ''">
- and supplier_name like concat('%',#{req.supplierName},'%')
+ and t1.supplier_name like concat('%',#{req.supplierName},'%')
</if>
- <if test="req.inboundDate !=null">
- and inbound_date like concat('%',#{req.inboundDate},'%')
+ <if test="req.timeStr != null and req.timeStr != ''">
+ and t1.inbound_date like concat('%',#{req.timeStr},'%')
</if>
-
</where>
- group by product_category, specification_model, tax_inclusive_unit_price
- order by inbound_date desc
+ group by t1.product_category, t1.specification_model, t1.tax_inclusive_unit_price
+ HAVING availableStock > 0
+ order by t1.inbound_date desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3