From 32b7c641415d83ab594f6b904829f5877c293940 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 08 四月 2026 16:57:37 +0800
Subject: [PATCH] yys 1.客户字段隐藏 2.导入,导出修改 3.收货管理
---
src/main/java/com/ruoyi/basic/pojo/Customer.java | 16 ++++++++--------
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 3 +++
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 2 ++
src/main/resources/application-dev.yml | 4 ++--
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 6 +++++-
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 4 ++++
6 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 101d72a..59145b3 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -50,7 +50,7 @@
@TableField(exist = false)
private Date followUpTime;
- @Excel(name = "瀹㈡埛鍒嗙被")
+// @Excel(name = "瀹㈡埛鍒嗙被")
private String customerType;
/**
@@ -62,25 +62,25 @@
/**
* 鍏徃鍦板潃
*/
- @Excel(name = "鍏徃鍦板潃")
+// @Excel(name = "鍏徃鍦板潃")
private String companyAddress;
/**
* 鍏徃鐢佃瘽
*/
- @Excel(name = "鍏徃鐢佃瘽")
+// @Excel(name = "鍏徃鐢佃瘽")
private String companyPhone;
/**
* 鑱旂郴浜�
*/
- @Excel(name = "鑱旂郴浜�")
+// @Excel(name = "鑱旂郴浜�")
private String contactPerson;
/**
* 鑱旂郴鐢佃瘽
*/
- @Excel(name = "鑱旂郴鐢佃瘽",cellType = Excel.ColumnType.STRING)
+// @Excel(name = "鑱旂郴鐢佃瘽",cellType = Excel.ColumnType.STRING)
private String contactPhone;
/**
@@ -106,14 +106,14 @@
private String addressPhone;
@ApiModelProperty(value = "閾惰鍩烘湰鎴�")
- @Excel(name = "閾惰鍩烘湰鎴�")
+// @Excel(name = "閾惰鍩烘湰鎴�")
private String basicBankAccount;
@ApiModelProperty(value = "閾惰璐﹀彿")
- @Excel(name = "閾惰璐﹀彿")
+// @Excel(name = "閾惰璐﹀彿")
private String bankAccount;
@ApiModelProperty(value = "寮�鎴疯鍙�")
- @Excel(name = "寮�鎴疯鍙�")
+// @Excel(name = "寮�鎴疯鍙�")
private String bankCode;
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 2358caf..cdf579e 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -178,6 +178,7 @@
*/
@PostMapping("/updateApprovalStatus")
public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
+
return toAjax(purchaseLedgerService.updateById(purchaseLedger));
}
/**
@@ -262,6 +263,7 @@
return AjaxResult.success(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
}
+
@ApiOperation("鐢熸垚閲囪喘搴忓垪鍙�")
@GetMapping("/createPurchaseNo")
@Log(title = "鐢熸垚閲囪喘搴忓垪鍙�", businessType = BusinessType.OTHER)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index c8ea3f5..4b2252d 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -15,6 +15,9 @@
@Data
public class PurchaseLedgerDto {
+
+ @ApiModelProperty(value = "1-寰呮敹璐� 2-鏀惰揣涓� 3-宸叉敹璐�")
+ private Integer status;
/**
* 瀹℃壒浜篿d鍒楄〃
*/
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index e01db26..329c226 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -159,4 +159,8 @@
@ApiModelProperty(value = "瀹℃壒浜篿d")
private String approveUserIds;
+ @ApiModelProperty(value = "1-寰呮敹璐� 2-鏀惰揣涓� 3-宸叉敹璐�")
+ private Integer status;
+
+
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 9eff9ac..733a186 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -74,9 +74,9 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://1.15.17.182:9999/product-inventory-management-new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/product-inventory-management-dlsmls?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: xd@123456..
+ password: 123456
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 1aed9b4..51b81fd 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -30,7 +30,8 @@
sm.is_white,
pl.approval_status,
pl.payment_method,
- pl.remarks
+ pl.remarks,
+ pl.status
FROM purchase_ledger pl
LEFT JOIN (
SELECT
@@ -41,6 +42,9 @@
) tr_sum ON pl.id = tr_sum.purchase_ledger_id
LEFT JOIN supplier_manage sm ON pl.supplier_id = sm.id
<where>
+ <if test="c.status != null">
+ and pl.status = #{c.status}
+ </if>
<if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
AND pl.purchase_contract_number LIKE CONCAT('%', #{c.purchaseContractNumber}, '%')
</if>
--
Gitblit v1.9.3