From f21cff62d4b6eb3433f6d5bb2c1ad8fae71d2a35 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 20 四月 2026 11:34:08 +0800
Subject: [PATCH] feat: 返回厚度字段
---
src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java | 7 +++
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 7 +++
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 1
src/main/resources/mapper/stock/StockInventoryMapper.xml | 3 +
src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java | 5 ++
src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java | 6 +++
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 1
src/main/resources/mapper/stock/StockInRecordMapper.xml | 1
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 11 +++--
src/main/java/com/ruoyi/stock/service/StockInRecordService.java | 1
src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java | 4 +-
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 7 +++
src/main/resources/mapper/quality/QualityInspectMapper.xml | 8 +++-
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 4 +
src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java | 6 +++
src/main/resources/mapper/stock/StockUninventoryMapper.xml | 1
16 files changed, 63 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
index 192bea5..4e226fd 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
@@ -94,4 +94,10 @@
*/
@Excel(name = "閫�璐ч噾棰�")
private BigDecimal returnAmount;
+
+ /**
+ * 鍘氬害
+ */
+ @Excel(name = "鍘氬害(mm)")
+ private BigDecimal thickness;
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 9d23429..bf34478 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -31,7 +31,7 @@
/**
* 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
*/
- @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
+ @Excel(name = "绫诲埆", readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
@NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!")
private Integer inspectType;
@@ -41,8 +41,6 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
-
-
/**
@@ -112,7 +110,6 @@
private String checkResult;
-
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@@ -157,4 +154,10 @@
private String workOrderNo;
@TableField(exist = false)
private String purchaseContractNo;
+
+ /**
+ * 鍘氬害
+ */
+ @TableField(exist = false)
+ private BigDecimal thickness;
}
diff --git a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
index 260d217..2319d85 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -33,4 +34,9 @@
private String productName;
+ /**
+ * 鍘氬害
+ */
+ private BigDecimal thickness;
+
}
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 9f47fd6..2361d69 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -3,6 +3,8 @@
import com.ruoyi.stock.pojo.StockInRecord;
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
public class StockInRecordDto extends StockInRecord {
@@ -26,4 +28,9 @@
//鐜板瓨閲�
private String currentStock;
+ /**
+ * 鍘氬害
+ */
+ private BigDecimal thickness;
+
}
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 0aa38f0..ea36ec9 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -38,9 +38,14 @@
private BigDecimal totalStockOut;
private BigDecimal currentStock;
- private BigDecimal unLockedQuantity;
+ private BigDecimal unLockedQuantity;
private Long salesLedgerId;
private Long salesLedgerProductId;
+
+ /**
+ * 鍘氬害
+ */
+ private BigDecimal thickness;
}
diff --git a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
index 3e3abf9..73113b1 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
@@ -5,6 +5,8 @@
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.math.BigDecimal;
+
@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -25,4 +27,9 @@
private String timeStr;
private String createBy;
+
+ /**
+ * 鍘氬害
+ */
+ private BigDecimal thickness;
}
diff --git a/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
index c9263c9..9b40825 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
@@ -29,4 +29,9 @@
* 閿�鍞鍗曚骇鍝佽ID
*/
private Long salesLedgerProductId;
+
+ /**
+ * 鍘氬害
+ */
+ private BigDecimal thickness;
}
diff --git a/src/main/java/com/ruoyi/stock/service/StockInRecordService.java b/src/main/java/com/ruoyi/stock/service/StockInRecordService.java
index 29ba7e5..f32efe9 100644
--- a/src/main/java/com/ruoyi/stock/service/StockInRecordService.java
+++ b/src/main/java/com/ruoyi/stock/service/StockInRecordService.java
@@ -10,6 +10,7 @@
import java.util.List;
public interface StockInRecordService extends IService<StockInRecord> {
+
IPage<StockInRecordDto> listPage(Page page, StockInRecordDto stockInRecordDto);
int add(StockInRecordDto stockInRecordDto);
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
index 1bbba92..4c819f7 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -6,7 +6,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.EnumUtil;
@@ -158,7 +158,7 @@
List<StockInRecordExportData> list = stockInRecordMapper.listStockInRecordExportData(stockInRecordDto);
for (StockInRecordExportData stockInRecordExportData : list) {
if (stockInRecordExportData.getType().equals("0")) {
- stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockOutQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
+ stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockInQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
} else {
stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockInUnQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
}
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 0ccfbea..57f8b42 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -6,10 +6,12 @@
qi.*,
<choose>
<when test="qualityInspect.inspectType == 0">
- pl.purchase_contract_number as purchase_contract_no
+ pl.purchase_contract_number as purchase_contract_no,
+ pm.thickness
</when>
<otherwise>
- pwo.work_order_no
+ pwo.work_order_no,
+ pm.thickness
</otherwise>
</choose>
FROM
@@ -17,10 +19,12 @@
<choose>
<when test="qualityInspect.inspectType == 0 ">
LEFT JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_id
+ LEFT JOIN product_model pm ON pm.id = qi.product_model_id
</when>
<otherwise>
LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id
LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
+ LEFT JOIN product_model pm ON pm.id = qi.product_model_id
</otherwise>
</choose>
WHERE
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 712124a..d95a38d 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -116,12 +116,14 @@
<!-- 璇ヤ骇鍝佸ぇ绫讳笅鏈�鍚庝竴涓綍鍏ユ棩鏈燂紙鍙栧彴璐︿富琛ㄧ殑entry_date锛� -->
MAX(sl.entry_date) AS entryDate,
COALESCE(NULLIF(SUM(t1.return_quantity), 0), 0) AS return_quantity,
- COALESCE(SUM(t2.total_amount), 0) AS return_amount
+ COALESCE(SUM(t2.total_amount), 0) AS return_amount,
+ pm.thickness
FROM sales_ledger_product slp
<!-- 鍏宠仈鍙拌处涓昏〃锛氳幏鍙栧綍鍏ユ棩鏈焑ntry_date -->
LEFT JOIN purchase_ledger sl ON slp.sales_ledger_id = sl.id
left join purchase_return_order_products as t1 on t1.sales_ledger_product_id = slp.id
left join purchase_return_orders as t2 on t2.id = t1.purchase_return_order_id
+ left join product_model pm on pm.id = slp.product_model_id
WHERE slp.type = 2 <!-- 鍥哄畾绛涢�夛細閲囪喘鍙拌处锛坱ype=2锛� -->
<!-- 閲囪喘鏃ユ湡绛涢�夛細鍙�夋潯浠� -->
<if test="req.entryDateStart != null and req.entryDateEnd != null">
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 1134c45..e1ca875 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -21,6 +21,7 @@
sl.sales_contract_no,
slp.specification_model,
p.product_name,
+ pm.thickness,
sl.customer_name
FROM shipping_info s
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index d5c3f38..e2c2b6e 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -8,6 +8,7 @@
p.product_name as product_name,
pm.model,
pm.unit,
+ pm.thickness,
u.nick_name as createBy
FROM stock_in_record as sir
LEFT JOIN product_model as pm on sir.product_model_id = pm.id
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index fb46594..45dc68a 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -66,6 +66,7 @@
pm.model,
si.remark,
pm.unit,
+ pm.thickness,
p.product_name
from stock_inventory si
left join product_model pm on si.product_model_id = pm.id
@@ -100,6 +101,7 @@
select sir.*,si.qualitity as current_stock,
pm.model,
pm.unit,
+ pm.thickness,
p.product_name,
su.nick_name as create_by
from
@@ -126,6 +128,7 @@
SELECT
pm.model,
pm.unit,
+ pm.thickness,
p.product_name,
MAX(current_inventory) as current_stock,
SUM(CASE WHEN record_type = 'in' THEN amount ELSE 0 END) as total_stock_in,
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index a441de9..9f6f2a3 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -23,6 +23,7 @@
p.product_name as productName,
pm.model,
pm.unit,
+ pm.thickness,
u.nick_name as createBy
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index d48acfa..1ebd219 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -56,6 +56,7 @@
(su.qualitity - COALESCE(su.locked_quantity, 0)) as un_locked_quantity,
pm.model,
pm.unit,
+ pm.thickness,
p.product_name
from stock_uninventory su
left join product_model pm on su.product_model_id = pm.id
--
Gitblit v1.9.3