[fix]工程管理

出货设备数据库、实体类、mapper.xml层新增软件版本字段，非必填；
添加出货设备时新增出货设备列表新增软件版本字段
第二次维护设备出库前端页面，软件版本非必填，默认为empty；
修改 修改保存售后第二次维护设备出库加上软件版本字段

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())

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;
 }
 

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);

ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deviceRunningNumber"    column="device_running_number"    />
         <result property="makePhotourl"    column="make_photoUrl"    />
         <result property="snCode"    column="sn_code"    />
+        <result property="softwareVersion" column="software_version" />
         <result property="aftersalesPhotourl"    column="aftersales_photoUrl"    />
         <result property="factoryDate"    column="factory_date"    />
         <result property="guaranteePeriod"    column="guarantee_period"    />
@@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectAfterSalesShippingDeviceVo">
         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
     </sql>
@@ -211,6 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceRunningNumber != null">device_running_number,</if>
             <if test="makePhotourl != null">make_photoUrl,</if>
             <if test="snCode != null">sn_code,</if>
+            <if test="softwareVersion != null">software_version,</if>
             <if test="aftersalesPhotourl != null">aftersales_photoUrl,</if>
             <if test="factoryDate != null">factory_date,</if>
             <if test="guaranteePeriod != null">guarantee_period,</if>
@@ -258,6 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceRunningNumber != null">#{deviceRunningNumber},</if>
             <if test="makePhotourl != null">#{makePhotourl},</if>
             <if test="snCode != null">#{snCode},</if>
+            <if test="softwareVersion != null">#{softwareVersion},</if>
             <if test="aftersalesPhotourl != null">#{aftersalesPhotourl},</if>
             <if test="factoryDate != null">#{factoryDate},</if>
             <if test="guaranteePeriod != null">#{guaranteePeriod},</if>
@@ -309,6 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceRunningNumber != null">device_running_number = #{deviceRunningNumber},</if>
             <if test="makePhotourl != null">make_photoUrl = #{makePhotourl},</if>
             <if test="snCode != null">sn_code = #{snCode},</if>
+            <if test="softwareVersion != null">software_version = #{softwareVersion},</if>
             <if test="aftersalesPhotourl != null">aftersales_photoUrl = #{aftersalesPhotourl},</if>
             <if test="factoryDate != null">factory_date = #{factoryDate},</if>
             <if test="guaranteePeriod != null">guarantee_period = #{guaranteePeriod},</if>

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;
+            }
+          }
+        }
       ],
     });
   };