From 05c24844977b2fa511cbfb20c539985da09b0c9f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 14:09:29 +0800
Subject: [PATCH] bug调试
---
src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java | 3 +++
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 3 ---
src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
index 3f80dc0..b7aea8f 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
@@ -24,6 +24,9 @@
@ApiModelProperty(value = "閿�鍞彴璐d")
private Long salesLedgerId;
+ @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
+ private Long salesLedgerProductId;
+
@TableField(exist = false)
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
diff --git a/src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java b/src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java
index d03fb20..adb88dd 100644
--- a/src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java
+++ b/src/main/java/com/ruoyi/sales/vo/ShippingInfoVo.java
@@ -13,4 +13,7 @@
* 鏁伴噺
*/
private BigDecimal quantity;
+
+ private String productCategory;
+ private String specificationModel;
}
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index a23a02c..a3db432 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -25,9 +25,6 @@
<if test="req.salesContractNo != null and req.salesContractNo != ''">
AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
</if>
- <if test="req.productCategory != null and req.productCategory != ''">
- AND slp.product_category LIKE CONCAT('%',#{req.productCategory},'%')
- </if>
<if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
</if>
--
Gitblit v1.9.3