From 25e060e7f5c2522912778ed3a6072c2eb3a53683 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Wed, 23 Apr 2025 17:12:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(sip):=20=E4=BA=A7=E5=93=81=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E5=8A=A0=E5=85=A5=E5=BA=8F=E5=88=97=E5=8F=B7=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 ProductInfo 类中添加 serialNumber 字段- 更新 ProductInfoMapper.xml，通过产品代码左连接 delivery_list 表
- 优化查询条件，直接使用 t2.serial_number 进行比较
---
.../com/ruoyi/sip/domain/ProductInfo.java | 99 +------------------
.../mapper/system/ProductInfoMapper.xml | 18 +++-
2 files changed, 20 insertions(+), 97 deletions(-)
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java
index e9b86544..77a1d04a 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java
@@ -2,6 +2,8 @@ package com.ruoyi.sip.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -13,6 +15,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author mula
* @date 2025-04-11
*/
+@Data
+@EqualsAndHashCode(callSuper = false)
public class ProductInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -46,99 +50,6 @@ public class ProductInfo extends BaseEntity
/** 删除时间 */
private Date deletedAt;
+ private String serialNumber;
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setProductCode(String productCode)
- {
- this.productCode = productCode;
- }
-
- public String getProductCode()
- {
- return productCode;
- }
-
- public void setProductName(String productName)
- {
- this.productName = productName;
- }
-
- public String getProductName()
- {
- return productName;
- }
-
- public void setModel(String model)
- {
- this.model = model;
- }
-
- public String getModel()
- {
- return model;
- }
-
- public void setDescription(String description)
- {
- this.description = description;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public void setCreatedAt(Date createdAt)
- {
- this.createdAt = createdAt;
- }
-
- public Date getCreatedAt()
- {
- return createdAt;
- }
-
- public void setUpdatedAt(Date updatedAt)
- {
- this.updatedAt = updatedAt;
- }
-
- public Date getUpdatedAt()
- {
- return updatedAt;
- }
-
- public void setDeletedAt(Date deletedAt)
- {
- this.deletedAt = deletedAt;
- }
-
- public Date getDeletedAt()
- {
- return deletedAt;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("productCode", getProductCode())
- .append("productName", getProductName())
- .append("model", getModel())
- .append("description", getDescription())
- .append("remark", getRemark())
- .append("createdAt", getCreatedAt())
- .append("updatedAt", getUpdatedAt())
- .append("deletedAt", getDeletedAt())
- .toString();
- }
}
diff --git a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml
index 9bb15e4c..d248a4e0 100644
--- a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml
@@ -43,13 +43,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
From ad6d69185283b3f65f8ad64a408cdf35af112290 Mon Sep 17 00:00:00 2001
From: Ji Liu
Date: Wed, 23 Apr 2025 17:26:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8E=A7?=
=?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-admin/src/main/resources/application-druid.yml | 2 +-
.../resources/templates/manage/delivery/add.html | 12 +++++++-----
.../resources/templates/manage/delivery/edit.html | 12 +++++++-----
.../templates/manage/delivery/selectOrder.html | 7 +++----
.../main/resources/templates/manage/order/edit.html | 12 ++++++++++--
.../main/resources/mapper/manage/OrderInfoMapper.xml | 4 ++--
6 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index ba985d44..89eb9432 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&rewriteBatchedStatements=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&rewriteBatchedStatements=true&allowMultiQueries=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: unis@db
# 从库数据源
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
index 35918807..1b0830f2 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
@@ -11,9 +11,11 @@
@@ -158,12 +160,12 @@
minView: "month",
autoclose: true
});
- function openList(id){
+ function selectOrder(id){
var options = {
title: "关联合同",
url: prefix + '/selectOrder',
skin: 'layui-layer-gray',
- btn: false,
+ btn: true,
maxmin: false,
full: false,
index:1000
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
index ed4b1579..5faa8c6e 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
@@ -12,9 +12,11 @@
@@ -161,12 +163,12 @@
minView: "month",
autoclose: true
});
- function openList(){
+ function selectOrder(){
var options = {
title: "关联合同",
url: prefix + '/selectOrder',
skin: 'layui-layer-gray',
- btn: false,
+ btn: true,
maxmin: false,
full: false,
index:1000
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
index 2d0fa3b8..d07fbce0 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
@@ -4,13 +4,12 @@
-
-