From fc4ad4c215e49d892e9243e5560a7b1b42636c9d Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Sat, 14 Dec 2024 11:24:02 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E6=95=B0=E6=8D=AE=E5=BA=93?=
=?UTF-8?q?=E3=80=81=E5=AE=9E=E4=BD=93=E7=B1=BB=E3=80=81mapper.xml?=
=?UTF-8?q?=E5=B1=82=E6=96=B0=E5=A2=9E=E8=BD=AF=E4=BB=B6=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E9=9D=9E=E5=BF=85=E5=A1=AB=EF=BC=9B?=
=?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E6=97=B6=E6=96=B0=E5=A2=9E=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E8=BD=AF=E4=BB=B6=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=AD=97=E6=AE=B5=20=E7=AC=AC=E4=BA=8C=E6=AC=A1?=
=?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=87=BA=E5=BA=93=E5=89=8D?=
=?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=BD=AF=E4=BB=B6=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E9=9D=9E=E5=BF=85=E5=A1=AB=EF=BC=8C=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E4=B8=BAempty=EF=BC=9B=20=E4=BF=AE=E6=94=B9=20=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E4=BF=9D=E5=AD=98=E5=94=AE=E5=90=8E=E7=AC=AC=E4=BA=8C?=
=?UTF-8?q?=E6=AC=A1=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=87=BA=E5=BA=93?=
=?UTF-8?q?=E5=8A=A0=E4=B8=8A=E8=BD=AF=E4=BB=B6=E7=89=88=E6=9C=AC=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../domain/AfterSalesShippingDevice.java | 16 +++++++++++-
.../domain/vo/SelectShippingDeviceVO.java | 3 +++
.../impl/AftersalesOutOrderServiceImpl.java | 1 +
.../AfterSalesShippingDeviceMapper.xml | 6 ++++-
.../maintenanceEquipmentTwo.html | 25 ++++++++++++++++++-
5 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java
index 32019084..a2331b29 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java
@@ -90,6 +90,10 @@ public class AfterSalesShippingDevice extends BaseEntity
@Excel(name = "SN号")
private String snCode;
+ /** 软件版本 */
+ @Excel(name = "软件版本")
+ private String softwareVersion;
+
/** 售后图片地址 */
@Excel(name = "售后图片地址")
private String aftersalesPhotourl;
@@ -340,7 +344,16 @@ public class AfterSalesShippingDevice extends BaseEntity
{
return snCode;
}
- public void setAftersalesPhotourl(String aftersalesPhotourl)
+
+ public String getSoftwareVersion() {
+ return softwareVersion;
+ }
+
+ public void setSoftwareVersion(String softwareVersion) {
+ this.softwareVersion = softwareVersion;
+ }
+
+ public void setAftersalesPhotourl(String aftersalesPhotourl)
{
this.aftersalesPhotourl = aftersalesPhotourl;
}
@@ -577,6 +590,7 @@ public class AfterSalesShippingDevice extends BaseEntity
.append("deviceRunningNumber", getDeviceRunningNumber())
.append("makePhotourl", getMakePhotourl())
.append("snCode", getSnCode())
+ .append("softwareVersion",getSoftwareVersion())
.append("aftersalesPhotourl", getAftersalesPhotourl())
.append("factoryDate", getFactoryDate())
.append("guaranteePeriod", getGuaranteePeriod())
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java
index dacdb514..74d55b45 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java
@@ -50,5 +50,8 @@ public class SelectShippingDeviceVO {
/** 是否添加出货设备（0代表是 1代表否）*/
private String addShippingDeviceFlag;
+
+ /** 软件版本*/
+ private String softwareVersion;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java
index c9c5d72f..ab49349c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java
@@ -503,6 +503,7 @@ public class AftersalesOutOrderServiceImpl implements IAftersalesOutOrderService
}
tempShippingDevice.setWastageExpireDate(selectShippingDeviceVO.getWastageExpireDate());
tempShippingDevice.setComponentGuaranteeDate(selectShippingDeviceVO.getComponentGuaranteeDate());
+ tempShippingDevice.setSoftwareVersion(selectShippingDeviceVO.getSoftwareVersion());
tempShippingDevice.setUpdateBy(loginName);
tempShippingDevice.setUpdateTime(new Date());
int updateShippingDeviceResult = afterSalesShippingDeviceMapper.updateAfterSalesShippingDevice(tempShippingDevice);
diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
index 3206d392..0d571fdf 100644
--- a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select shipping_device_code, shipping_device_id, make_no,sales_order_code, out_order_code, material_no, material_photoUrl, material_name, material_type, material_class, material_model_code, material_unit, material_brand, material_describe,
- device_model_code, device_running_number, make_photoUrl, sn_code, aftersales_photoUrl, factory_date, guarantee_period, guarantee_period_flag, lock_date, lock_date_flag, wastage_expire_date, wastage_expire_flag,
+ device_model_code, device_running_number, make_photoUrl, sn_code, software_version, aftersales_photoUrl, factory_date, guarantee_period, guarantee_period_flag, lock_date, lock_date_flag, wastage_expire_date, wastage_expire_flag,
component_guarantee_date, component_guarantee_flag, engineer_name, salesman_name, make_name,customer_id, customer_name, maintain_order_code, maintain_time, create_by, create_time, update_by, update_time,
add_shipping_device_flag,is_confirm_receiving_flag, is_confirm_check_flag,start_make_time, end_make_time, add_process_issue_record_flag,quality_status from aftersales_shipping_device
@@ -211,6 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
device_running_number,
make_photoUrl,
sn_code,
+ software_version,
aftersales_photoUrl,
factory_date,
guarantee_period,
@@ -258,6 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{deviceRunningNumber},
#{makePhotourl},
#{snCode},
+ #{softwareVersion},
#{aftersalesPhotourl},
#{factoryDate},
#{guaranteePeriod},
@@ -309,6 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
device_running_number = #{deviceRunningNumber},
make_photoUrl = #{makePhotourl},
sn_code = #{snCode},
+ software_version = #{softwareVersion},
aftersales_photoUrl = #{aftersalesPhotourl},
factory_date = #{factoryDate},
guarantee_period = #{guaranteePeriod},
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentTwo.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentTwo.html
index e113491f..edf5dadd 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentTwo.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentTwo.html
@@ -143,7 +143,8 @@
"lockDateFlag": item.lockDateFlag,
"lockDate": item.lockDate,
"wastageExpireDate": item.wastageExpireDate,
- "componentGuaranteeDate": item.componentGuaranteeDate
+ "componentGuaranteeDate": item.componentGuaranteeDate,
+ "softwareVersion": item.softwareVersion
// ...其他字段
};
});
@@ -379,6 +380,28 @@
placement: 'center',//居中显示
}
},
+ {
+ title: '软件版本',
+ field: 'softwareVersion',
+ align: 'center',
+ editable:{
+ title: '软件版本',
+ placement: 'center',//居中显示
+ },
+ formatter: function (value, row) {
+ // 检查 softwareVersion 是否存在
+ if (row.softwareVersion === undefined || row.softwareVersion === null) {
+ return "";
+ }
+
+ // 根据 softwareVersion 的值决定返回值
+ if (row.softwareVersion) {
+ return row.softwareVersion;
+ } else {
+ return value;
+ }
+ }
+ }
],
});
};