From c27858b16969db1ff313b73f017187e06bf5aa9c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 19 十一月 2025 10:03:38 +0800
Subject: [PATCH] yys 1.发货台账修改
---
src/main/resources/application-dev.yml | 6 +++---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 8 +++++++-
src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java | 13 +++++++++++++
src/main/resources/application.yml | 2 +-
4 files changed, 24 insertions(+), 5 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..c8f39b1 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
@@ -24,12 +24,25 @@
@ApiModelProperty(value = "閿�鍞彴璐d")
private Long salesLedgerId;
+ @ApiModelProperty(value = "閿�鍞骇鍝乮d")
+ private Long salesLedgerProductId;
+
@TableField(exist = false)
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
@TableField(exist = false)
+ @ApiModelProperty(value = "浜у搧澶х被")
+ @Excel(name = "浜у搧澶х被")
+ private String productCategory;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ @Excel(name = "瑙勬牸鍨嬪彿")
+ private String specificationModel;
+
+ @TableField(exist = false)
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a0b7864..ce131d5 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -17,7 +17,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 7003
+ port: 8080
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -62,7 +62,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://localhost:3306/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/product-inventory-management-hysn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
# 浠庡簱鏁版嵁婧�
@@ -134,7 +134,7 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
+ host: 192.168.1.185
# host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 33d6165..c79d967 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
# Spring閰嶇疆
spring:
profiles:
- active: demo
+ active: dev
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index efe93cf..55c70cf 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -14,13 +14,19 @@
s.update_user,
s.tenant_id,
sl.sales_contract_no,
- sl.customer_name
+ sl.customer_name,
+ slp.product_category,
+ slp.specification_model
FROM shipping_info s
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ left join sales_ledger_product slp on slp.id = s.sales_ledger_product_id and slp.type = 1
WHERE 1=1
<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