From 1ab74940e8ae9fdb7fc75be2b27d6002b49dfca9 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 03 四月 2026 15:14:46 +0800
Subject: [PATCH] feat: 新增销售台账取消新增订单，区分对公/对私
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 3 +
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 24 +++++++----
doc/长治-烜曌工贸.sql | 15 +++++++
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 6 +++
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 2
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 4 -
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 5 +-
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 7 +++
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 2
9 files changed, 52 insertions(+), 16 deletions(-)
diff --git "a/doc/\351\225\277\346\262\273-\347\203\234\346\233\214\345\267\245\350\264\270.sql" "b/doc/\351\225\277\346\262\273-\347\203\234\346\233\214\345\267\245\350\264\270.sql"
new file mode 100644
index 0000000..a676ef0
--- /dev/null
+++ "b/doc/\351\225\277\346\262\273-\347\203\234\346\233\214\345\267\245\350\264\270.sql"
@@ -0,0 +1,15 @@
+ALTER TABLE `product-inventory-management-xzgm`.`customer`
+ MODIFY COLUMN `taxpayer_identification_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '绾崇◣浜鸿瘑鍒彿' AFTER `customer_name`,
+ MODIFY COLUMN `company_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '鍏徃鍦板潃' AFTER `taxpayer_identification_number`,
+ MODIFY COLUMN `company_phone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '鍏徃鐢佃瘽' AFTER `company_address`,
+ MODIFY COLUMN `contact_person` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '鑱旂郴浜�' AFTER `company_phone`,
+ MODIFY COLUMN `contact_phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '鑱旂郴鐢佃瘽' AFTER `contact_person`,
+ MODIFY COLUMN `maintainer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '缁存姢浜�' AFTER `contact_phone`,
+ MODIFY COLUMN `maintenance_time` date NULL COMMENT '缁存姢鏃堕棿' AFTER `maintainer`,
+ MODIFY COLUMN `customer_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '瀹㈡埛鍒嗙被锛氬鍏紝瀵圭' AFTER `bank_code`;
+
+ALTER TABLE `product-inventory-management-xzgm`.`supplier_manage`
+ MODIFY COLUMN `supplier_type` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '渚涘簲鍟嗙被鍨嬶紙瀵瑰叕/瀵圭锛�' AFTER `company_address`;
+
+ALTER TABLE `product-inventory-management-xzgm`.`sales_ledger`
+ ADD COLUMN `sales_type` varchar(255) NULL COMMENT '鍙拌处绫诲瀷锛堝鍏�/瀵圭锛�' AFTER `delivery_date`;
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 9e5e121..b7b0a25 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -47,7 +47,7 @@
private String unit;
//閿�鍞悎鍚屽彿
- @Excel(name = "閿�鍞悎鍚屽彿")
+// @Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
@JsonFormat(pattern = "yyyy-MM-dd")
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index c8ea3f5..c91ca5e 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -46,6 +46,12 @@
*/
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
+
+ /**
+ * 渚涘簲鍟嗗悕绉�
+ */
+ @Excel(name = "渚涘簲鍟嗙被鍨�")
+ private String supplierType;
/**
* 鏄惁鐧藉悕鍗�
*/
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 05bd888..6ea7601 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -58,4 +58,7 @@
@ApiModelProperty(value = "浜よ揣鏃ユ湡")
private LocalDate deliveryDate;
+
+ @ApiModelProperty(value = "瀹㈡埛鍒嗙被")
+ private String customerType;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 36751c2..388b647 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -147,5 +147,12 @@
@TableField(exist = false)
//鏄惁鍙紪杈�
private Boolean isEdit;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀹㈡埛鍒嗙被")
+ private String customerType;
+
+ @ApiModelProperty(value = "鍙拌处鍒嗙被")
+ private String salesType;
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 570b2f5..ba5d55b 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -736,7 +736,7 @@
salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
salesLedgerProductMapper.insert(salesLedgerProduct);
// 娣诲姞鐢熶骇鏁版嵁
- salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
+// salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
}
}
}
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index a122e90..4e482f2 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -22,8 +22,7 @@
pm.model as productModelName,
ppo.quantity,
ppo.scrap_qty,
- pm.unit,
- sl.sales_contract_no salesContractNo
+ pm.unit
from
production_product_main ppm
left join product_work_order pwo on pwo.id = ppm.work_order_id
@@ -33,7 +32,6 @@
left join production_product_output ppo on ppm.id = ppo.product_main_id
left join product_model pm on pm.id = ppo.product_model_id
left join product p on p.id = pm.product_id
- left join sales_ledger sl on sl.id = po.sales_ledger_id
left join sys_user u on u.user_id = ppm.user_id
<where>
<if test="c.nickName != null and c.nickName != ''">
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 1aed9b4..30b4286 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -28,6 +28,7 @@
pl.template_name,
pl.approve_user_ids,
sm.is_white,
+ sm.supplier_type AS supplierType,
pl.approval_status,
pl.payment_method,
pl.remarks
@@ -65,8 +66,8 @@
<if test="c.supplierId != null">
AND pl.supplier_id = #{c.supplierId}
</if>
- <if test="c.approvalStatus != null">
- AND pl.approval_status = #{c.approvalStatus}
+ <if test="c.supplierType != null and c.supplierType != ''">
+ AND sm.supplier_type = #{c.supplierType}
</if>
</where>
ORDER BY pl.entry_date DESC
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 71ad49f..d119c79 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -43,7 +43,8 @@
</select>
<select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.pojo.SalesLedger">
- SELECT T1.id,
+ SELECT
+ T1.id,
T1.sales_contract_no,
T1.customer_contract_no,
T1.project_name,
@@ -56,12 +57,13 @@
T1.attachment_materials,
T1.tenant_id,
T1.contract_amount,
- T1.contract_amount as noInvoiceAmountTotal,
+ T1.contract_amount AS noInvoiceAmountTotal,
T1.execution_date,
- T2.nick_name AS entry_person_name,
+ T2.nick_name AS entry_person_name,
T1.payment_method,
T1.delivery_date,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
+ T3.customer_type AS customerType,
CASE
WHEN shipping_status_counts.total_count = 0 THEN false
WHEN shipping_status_counts.unshipped_count = 0 THEN true
@@ -69,6 +71,7 @@
END AS is_fh
FROM sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
+ LEFT JOIN customer T3 ON T1.customer_id = T3.id
LEFT JOIN (
SELECT sales_ledger_id,
COUNT(*) as total_count,
@@ -78,25 +81,28 @@
) shipping_status_counts ON T1.id = shipping_status_counts.sales_ledger_id
<where>
<if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
+ AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
</if>
<if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
+ AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
</if>
<if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
+ AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
</if>
<if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
</if>
<if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND T1.entry_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
+ AND T1.entry_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
</if>
<if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
+ AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
+ </if>
+ <if test="salesLedgerDto.customerType != null and salesLedgerDto.customerType != '' ">
+ AND T3.customer_type = #{salesLedgerDto.customerType}
</if>
</where>
- order by T1.entry_date desc
+ ORDER BY T1.entry_date DESC
</select>
<select id="selectIncomeStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
--
Gitblit v1.9.3