From 45893b5be857c034467d7069cf41a9905b369691 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 26 六月 2026 11:01:19 +0800
Subject: [PATCH] fix: 报价日期倒序,发货台账返回宽、高和数量
---
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 10 ++++++----
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 4 +++-
src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java | 20 +++++++++++++++++++-
src/main/resources/mapper/sales/SalesQuotationMapper.xml | 1 +
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 5 ++++-
5 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index 668cf9f..6039070 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -31,19 +31,18 @@
private Long id;
-
/**
* 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
*/
@NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!!")
- @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
+ @Excel(name = "绫诲埆", readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
private Integer inspectType;
/**
* 鐘舵��(0:寰呭鐞�;1:宸插鐞�)
*/
@NotBlank(message = "鐘舵�佷笉鑳戒负绌�!!")
- @Excel(name = "鐘舵��",readConverterExp = "0=寰呭鐞�,1=宸插鐞�")
+ @Excel(name = "鐘舵��", readConverterExp = "0=寰呭鐞�,1=宸插鐞�")
private Integer inspectState;
/**
@@ -119,7 +118,6 @@
private Date dealTime;
-
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@@ -147,4 +145,8 @@
@ApiModelProperty("鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
@TableField(exist = false)
private Boolean method;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鍘氬害(mm)")
+ 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 97140de..ac1c22f 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -33,7 +33,7 @@
private List<CommonFile> commonFileList;
@Excel(name = "瑙勬牸鍨嬪彿")
- private String specificationModel;
+ private String specificationModel;
@Excel(name = "浜у搧鍚嶇О")
private String productName;
@@ -44,4 +44,22 @@
@Excel(name = "鍘氬害(mm)")
private BigDecimal thickness;
+ /**
+ * 瀹�
+ */
+ @Excel(name = "瀹�")
+ private BigDecimal width;
+
+ /**
+ * 楂�
+ */
+ @Excel(name = "楂�")
+ private BigDecimal height;
+
+ /**
+ * 鏁伴噺
+ */
+ @Excel(name = "鏁伴噺")
+ private BigDecimal quantity;
+
}
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 5bda4f6..584ee1c 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -16,6 +16,7 @@
qu.deal_result,
qu.deal_name,
qu.deal_time,
+ pm.thickness,
CASE
WHEN qu.model = pm.id THEN pm.model
ELSE qu.model
@@ -25,7 +26,7 @@
ELSE false
END AS method
FROM quality_unqualified qu
- LEFT JOIN product_model pm ON qu.model = pm.id
+ LEFT JOIN product_model pm ON qu.product_model_id = pm.id
where
1=1
<if test="qualityUnqualified.inspectType != null ">
@@ -43,6 +44,7 @@
<if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
AND check_time <= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
</if>
+ order by check_time desc
</select>
<select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
SELECT
diff --git a/src/main/resources/mapper/sales/SalesQuotationMapper.xml b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
index 1e358ca..c290e1f 100644
--- a/src/main/resources/mapper/sales/SalesQuotationMapper.xml
+++ b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
@@ -18,5 +18,6 @@
<if test="salesQuotationDto.status != null and salesQuotationDto.status != '' ">
AND t1.status = #{salesQuotationDto.status}
</if>
+ order by quotation_no
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index e0ddcff..57032c5 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -23,7 +23,10 @@
slp.specification_model,
p.product_name,
pm.thickness,
- sl.customer_name
+ sl.customer_name,
+ slp.quantity,
+ slp.width,
+ slp.height
FROM shipping_info s
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
--
Gitblit v1.9.3