From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/basic/pojo/Customer.java | 169 +++++++++++++++++--------------------------------------
1 files changed, 53 insertions(+), 116 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 6340aec..511e691 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -1,165 +1,102 @@
package com.ruoyi.basic.pojo;
+import java.io.Serializable;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 瀹㈡埛妗ｆ瀵硅薄 customer
- *
+ *
* @author ruoyi
* @date 2025-05-07
*/
@TableName(value = "customer")
@Data
-public class Customer extends BaseEntity
-{
+public class Customer implements Serializable {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * 搴忓彿
+ */
+ @TableId(type = IdType.AUTO)
private Long id;
- /** 瀹㈡埛鍚嶇О */
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
+ /** 瀹㈡埛鍒嗙被锛氶浂鍞鎴凤紝杩涢攢鍟嗗鎴� */
- /** 绾崇◣浜鸿瘑鍒彿 */
+ @Excel(name = "瀹㈡埛鍒嗙被")
+ private String customerType;
+
+ /**
+ * 绾崇◣浜鸿瘑鍒彿
+ */
@Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNumber;
- /** 鍏徃鍦板潃 */
+ /**
+ * 鍏徃鍦板潃
+ */
@Excel(name = "鍏徃鍦板潃")
private String companyAddress;
- /** 鍏徃鐢佃瘽 */
+ /**
+ * 鍏徃鐢佃瘽
+ */
@Excel(name = "鍏徃鐢佃瘽")
private String companyPhone;
- /** 鑱旂郴浜� */
+ /**
+ * 鑱旂郴浜�
+ */
@Excel(name = "鑱旂郴浜�")
private String contactPerson;
- /** 鑱旂郴鐢佃瘽 */
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
@Excel(name = "鑱旂郴鐢佃瘽")
private String contactPhone;
- /** 缁存姢浜� */
+ /**
+ * 缁存姢浜�
+ */
@Excel(name = "缁存姢浜�")
private String maintainer;
- /** 缁存姢鏃堕棿 */
+ /**
+ * 缁存姢鏃堕棿
+ */
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "缁存姢鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "缁存姢鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
private Date maintenanceTime;
- public void setId(Long id)
- {
- this.id = id;
- }
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
- public Long getId()
- {
- return id;
- }
+ @TableField(exist = false)
+ private Long[] ids;
- public void setCustomerName(String customerName)
- {
- this.customerName = customerName;
- }
+ @TableField(exist = false)
+ private String addressPhone;
- public String getCustomerName()
- {
- return customerName;
- }
+ @ApiModelProperty(value = "閾惰鍩烘湰鎴�")
+ @Excel(name = "閾惰鍩烘湰鎴�")
+ private String basicBankAccount;
- public void setTaxpayerIdentificationNumber(String taxpayerIdentificationNumber)
- {
- this.taxpayerIdentificationNumber = taxpayerIdentificationNumber;
- }
+ @ApiModelProperty(value = "閾惰璐﹀彿")
+ @Excel(name = "閾惰璐﹀彿")
+ private String bankAccount;
- public String getTaxpayerIdentificationNumber()
- {
- return taxpayerIdentificationNumber;
- }
-
- public void setCompanyAddress(String companyAddress)
- {
- this.companyAddress = companyAddress;
- }
-
- public String getCompanyAddress()
- {
- return companyAddress;
- }
-
- public void setCompanyPhone(String companyPhone)
- {
- this.companyPhone = companyPhone;
- }
-
- public String getCompanyPhone()
- {
- return companyPhone;
- }
-
- public void setContactPerson(String contactPerson)
- {
- this.contactPerson = contactPerson;
- }
-
- public String getContactPerson()
- {
- return contactPerson;
- }
-
- public void setContactPhone(String contactPhone)
- {
- this.contactPhone = contactPhone;
- }
-
- public String getContactPhone()
- {
- return contactPhone;
- }
-
- public void setMaintainer(String maintainer)
- {
- this.maintainer = maintainer;
- }
-
- public String getMaintainer()
- {
- return maintainer;
- }
-
- public void setMaintenanceTime(Date maintenanceTime)
- {
- this.maintenanceTime = maintenanceTime;
- }
-
- public Date getMaintenanceTime()
- {
- return maintenanceTime;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("customerName", getCustomerName())
- .append("taxpayerIdentificationNumber", getTaxpayerIdentificationNumber())
- .append("companyAddress", getCompanyAddress())
- .append("companyPhone", getCompanyPhone())
- .append("contactPerson", getContactPerson())
- .append("contactPhone", getContactPhone())
- .append("maintainer", getMaintainer())
- .append("maintenanceTime", getMaintenanceTime())
- .toString();
- }
+ @ApiModelProperty(value = "寮�鎴疯鍙�")
+ @Excel(name = "寮�鎴疯鍙�")
+ private String bankCode;
}
--
Gitblit v1.9.3