[fix] 售后管理

修改售后出货设备实体类： 出厂日期类型、锁机时间类型、损耗品到期时间类型、二次维修后部件质保时间类型由String->date
修改售后出货设备编辑页面实体类： 出厂日期类型、锁机时间类型、损耗品到期时间类型、二次维修后部件质保时间类型由String->date
修改售后出货设备编辑页面售后和仓库实体类： 出厂日期类型、锁机时间类型、损耗品到期时间类型、二次维修后部件质保时间类型由String->date
修改添加出货设备时新增出货设备列表实体类： 出厂日期类型、锁机时间类型、损耗品到期时间类型、二次维修后部件质保时间类型由String->date
修改出货设备查找出货设备仓库和售后Dto，新增仓库相关信息
修改售后维护设备编辑页面：新增仓库相关字段，处理日期类型的数据
修改售后维护设备详情页面：新增仓库相关字段，处理日期类型的数据，字段加上disabled关键字
修改售后维护设备列表页面：去掉新增、修改、删除、导出按钮
修改客户资料的通过客户编码查找客户信息方法：新增对客户资料判空条件
新增根据出货设备Id查找仓库出库单数据后端接口方法
出货设备Controller层新增 修改保存出货设备详情

ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java

@@ -165,6 +165,17 @@ public class AfterSalesShippingDeviceController extends BaseController
 
 
 
+    /**
+     * 修改保存出货设备详情
+     */
+    @ResponseBody
+    @PostMapping("/detail")
+    public AjaxResult detailSave(@RequestBody AfterSalesShippingDeviceEditDto dto)
+    {
+       return toAjax(afterSalesShippingDeviceService.detailSaveAfterSalesShippingDevice(dto));
+    }
+
+
     /**
      * 作废出货设备
      */

ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java

@@ -92,7 +92,7 @@ public class AfterSalesShippingDevice extends BaseEntity
     /** 出厂日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private String factoryDate;
+    private Date factoryDate;
 
     /** 保修期 */
     @Excel(name = "保修期")
@@ -105,7 +105,7 @@ public class AfterSalesShippingDevice extends BaseEntity
     /** 锁机时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "锁机时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private String lockDate;
+    private Date lockDate;
 
     /** 是否有锁机时间 */
     @Excel(name = "是否有锁机时间")
@@ -114,7 +114,7 @@ public class AfterSalesShippingDevice extends BaseEntity
     /** 损耗品到期时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "损耗品到期时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private String wastageExpireDate;
+    private Date wastageExpireDate;
 
     /** 是否过损耗品到期时间 */
     @Excel(name = "是否过损耗品到期时间")
@@ -123,7 +123,7 @@ public class AfterSalesShippingDevice extends BaseEntity
     /** 二次维修后部件质保时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "二次维修后部件质保时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private String componentGuaranteeDate;
+    private Date componentGuaranteeDate;
 
     /** 是否过二次维修后部件质保日期 */
     @Excel(name = "是否过二次维修后部件质保日期")
@@ -425,35 +425,35 @@ public class AfterSalesShippingDevice extends BaseEntity
         return maintainOrderCode;
     }
 
-    public String getFactoryDate() {
+    public Date getFactoryDate() {
         return factoryDate;
     }
 
-    public void setFactoryDate(String factoryDate) {
+    public void setFactoryDate(Date factoryDate) {
         this.factoryDate = factoryDate;
     }
 
-    public String getLockDate() {
+    public Date getLockDate() {
         return lockDate;
     }
 
-    public void setLockDate(String lockDate) {
+    public void setLockDate(Date lockDate) {
         this.lockDate = lockDate;
     }
 
-    public String getWastageExpireDate() {
+    public Date getWastageExpireDate() {
         return wastageExpireDate;
     }
 
-    public void setWastageExpireDate(String wastageExpireDate) {
+    public void setWastageExpireDate(Date wastageExpireDate) {
         this.wastageExpireDate = wastageExpireDate;
     }
 
-    public String getComponentGuaranteeDate() {
+    public Date getComponentGuaranteeDate() {
         return componentGuaranteeDate;
     }
 
-    public void setComponentGuaranteeDate(String componentGuaranteeDate) {
+    public void setComponentGuaranteeDate(Date componentGuaranteeDate) {
         this.componentGuaranteeDate = componentGuaranteeDate;
     }
 

ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceEditDto.java

@@ -79,23 +79,23 @@ public class AfterSalesShippingDeviceEditDto {
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonProperty("factoryDate")
-    private String factoryDate;
+    private Date factoryDate;
 
     @JsonProperty("guaranteePeriod")
     private String guaranteePeriod;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonProperty("lockDate")
-    private String lockDate;
+    private Date lockDate;
 
     @JsonProperty("lockDateFlag")
     private String lockDateFlag;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonProperty("wastageExpireDate")
-    private String wastageExpireDate;
+    private Date wastageExpireDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonProperty("componentGuaranteeDate")
-    private String componentGuaranteeDate;
+    private Date componentGuaranteeDate;
 }

ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/WarehouseAndAfterSalesDto.java

@@ -9,6 +9,12 @@ import java.util.Date;
 @Data
 public class WarehouseAndAfterSalesDto {
 
+    @JsonProperty("outOrderCode")
+    private String outOrderCode;
+
+    @JsonProperty("warehouseName")
+    private String warehouseName;
+
     @JsonProperty("snCode")
     private String snCode;
 
@@ -17,24 +23,24 @@ public class WarehouseAndAfterSalesDto {
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonProperty("factoryDate")
-    private String factoryDate;
+    private Date factoryDate;
 
     @JsonProperty("guaranteePeriod")
     private String guaranteePeriod;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonProperty("lockDate")
-    private String lockDate;
+    private Date lockDate;
 
     @JsonProperty("lockDateFlag")
     private String lockDateFlag;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonProperty("wastageExpireDate")
-    private String wastageExpireDate;
+    private Date wastageExpireDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonProperty("componentGuaranteeDate")
-    private String componentGuaranteeDate;
+    private Date componentGuaranteeDate;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java

@@ -3,6 +3,9 @@ package com.ruoyi.aftersales.domain.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
+
+import java.util.Date;
+
 /**
  * 添加出货设备时新增出货设备列表
  */
@@ -23,22 +26,22 @@ public class SelectShippingDeviceVO {
     private String snCode;
 
     /** 出厂日期 */
-    private String factoryDate;
+    private Date factoryDate;
 
     /** 保修期 */
     private String guaranteePeriod;
 
     /** 锁机时间 */
-    private String lockDate;
+    private Date lockDate;
 
     /** 是否有锁机时间 */
     private String lockDateFlag;
 
     /** 损耗品到期时间 */
-    private String wastageExpireDate;
+    private Date wastageExpireDate;
 
     /** 二次维修后部件质保时间 */
-    private String componentGuaranteeDate;
+    private Date componentGuaranteeDate;
 
 }
 

ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java

@@ -103,4 +103,8 @@ public interface IAfterSalesShippingDeviceService
     * */
     List<SysEquipDetailDto> selectAfterSalesShippingDeviceByNoAndCode(AfterSalesShippingDevice afterSalesShippingDevice);
 
+    /**
+    *  保存出货设备详情
+    * */
+    int detailSaveAfterSalesShippingDevice(AfterSalesShippingDeviceEditDto dto);
 }

ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java

@@ -17,6 +17,8 @@ import com.ruoyi.sales.domain.SalesAftersalesNotice;
 import com.ruoyi.sales.domain.SalesAftersalesNoticeDetail;
 import com.ruoyi.sales.mapper.SalesAftersalesNoticeDetailMapper;
 import com.ruoyi.system.dto.SysEquipDetailDto;
+import com.ruoyi.warehouse.domain.WarehouseOutOrder;
+import com.ruoyi.warehouse.mapper.WarehouseOutOrderMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.aftersales.mapper.AfterSalesShippingDeviceMapper;
@@ -44,6 +46,9 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD
     @Autowired
     private SalesAftersalesNoticeDetailMapper aftersalesNoticeDetailMapper;
 
+    @Autowired
+    private WarehouseOutOrderMapper warehouseOutOrderMapper;
+
     /**
      * 查询出货设备
      * 
@@ -102,6 +107,14 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD
     public WarehouseAndAfterSalesDto selectWarehouseAndAfterSalesDtoById(Long shippingDeviceCode) {
         WarehouseAndAfterSalesDto warehouseAndAfterSalesDto = new WarehouseAndAfterSalesDto();
         AfterSalesShippingDevice afterSalesShippingDevice = afterSalesShippingDeviceMapper.selectAfterSalesShippingDeviceById(shippingDeviceCode);
+        //查找仓库信息
+         WarehouseOutOrder warehouseOutOrder = warehouseOutOrderMapper.selectWarehouseOutOrderByShippingDeviceId(afterSalesShippingDevice.getShippingDeviceId());
+         if (StringUtils.isNotNull(warehouseOutOrder)){
+             warehouseAndAfterSalesDto.setOutOrderCode(warehouseOutOrder.getOutOrderCode());
+             warehouseAndAfterSalesDto.setWarehouseName(warehouseOutOrder.getWarehouseName());
+         }
+
+        //查找出货设备信息
         if (StringUtils.isNotNull(afterSalesShippingDevice)){
             warehouseAndAfterSalesDto.setFactoryDate(afterSalesShippingDevice.getFactoryDate());
             warehouseAndAfterSalesDto.setLockDate(afterSalesShippingDevice.getLockDate());
@@ -227,4 +240,13 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD
         }
         return sysEquipDetailDtos;
     }
+
+
+    /**
+     *  保存出货设备详情
+     * */
+    @Override
+    public int detailSaveAfterSalesShippingDevice(AfterSalesShippingDeviceEditDto dto) {
+        return 1;
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java

@@ -229,12 +229,14 @@ public class SysCustomerServiceImpl implements ISysCustomerService
     public CustomerDto selectCustomerDtoByEnterpriseCode(String customerId) {
         CustomerDto customerDto = new CustomerDto();
         SysCustomer sysCustomer = sysCustomerMapper.selectSysCustomerByEnterpriseCode(customerId);
-        customerDto.setContactNumber(sysCustomer.getContactNumber());
+        if(sysCustomer != null){
-        customerDto.setCustomerAddress(sysCustomer.getCustomerAddress());
+            customerDto.setContactNumber(sysCustomer.getContactNumber());
-        customerDto.setEnterpriseCode(sysCustomer.getEnterpriseCode());
+            customerDto.setCustomerAddress(sysCustomer.getCustomerAddress());
-        customerDto.setEnterpriseName(sysCustomer.getEnterpriseName());
+            customerDto.setEnterpriseCode(sysCustomer.getEnterpriseCode());
-        customerDto.setDeliveryAddress(sysCustomer.getDeliveryAddress());
+            customerDto.setEnterpriseName(sysCustomer.getEnterpriseName());
-        customerDto.setCustomerContact(sysCustomer.getCustomerContact());
+            customerDto.setDeliveryAddress(sysCustomer.getDeliveryAddress());
+            customerDto.setCustomerContact(sysCustomer.getCustomerContact());
+        }
         return customerDto;
     }
 

ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java

@@ -97,4 +97,11 @@ public interface WarehouseOutOrderMapper
     *  根据出库单号查询出库单数据
     * */
     WarehouseOutOrder selectWarehouseOutOrderByCode(String outOrderCode);
+
+    /*
+    *  根据出货设备Id查找仓库出库单数据
+    *
+    * */
+    WarehouseOutOrder selectWarehouseOutOrderByShippingDeviceId(String shippingDeviceId);
+
 }

ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml

@@ -97,6 +97,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where out_order_code = #{outOrderCode}
     </select>
 
+    <select id="selectWarehouseOutOrderByShippingDeviceId" parameterType="String" resultMap="WarehouseOutOrderResult">
+        <include refid="selectWarehouseOutOrderVo"/>
+        where shipping_device_id = #{shippingDeviceId}
+    </select>
 
 
     <insert id="insertWarehouseOutOrder" parameterType="WarehouseOutOrder" useGeneratedKeys="true" keyProperty="outOrderId">

ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html

@@ -11,61 +11,61 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">出货设备id：</label>
             <div class="col-sm-8">
-                <input name="shippingDeviceId" th:field="*{shippingDeviceId}" class="form-control" type="text" required>
+                <input name="shippingDeviceId" th:field="*{shippingDeviceId}" class="form-control" type="text" required disabled>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">关联单号：</label>
             <div class="col-sm-8">
-                <input name="makeNo" th:field="*{makeNo}" class="form-control" type="text">
+                <input name="makeNo" th:field="*{makeNo}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">料号：</label>
             <div class="col-sm-8">
-                <input name="materialNo" th:field="*{materialNo}" class="form-control" type="text">
+                <input name="materialNo" th:field="*{materialNo}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">图片：</label>
             <div class="col-sm-8">
-                <input name="materialPhotourl" th:field="*{materialPhotourl}" class="form-control" type="text">
+                <input name="materialPhotourl" th:field="*{materialPhotourl}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">物料名称：</label>
             <div class="col-sm-8">
-                <input name="materialName" th:field="*{materialName}" class="form-control" type="text">
+                <input name="materialName" th:field="*{materialName}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">物料类型：</label>
             <div class="col-sm-8">
-                <input name="materialType" th:field="*{materialType}" class="form-control" type="text">
+                <input name="materialType" th:field="*{materialType}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">物料类别：</label>
             <div class="col-sm-8">
-                <input name="materialClass" th:field="*{materialClass}" class="form-control" type="text">
+                <input name="materialClass" th:field="*{materialClass}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">单位：</label>
             <div class="col-sm-8">
-                <input name="materialUnit" th:field="*{materialUnit}" class="form-control" type="text">
+                <input name="materialUnit" th:field="*{materialUnit}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">物料品牌：</label>
             <div class="col-sm-8">
-                <input name="materialBrand" th:field="*{materialBrand}" class="form-control" type="text">
+                <input name="materialBrand" th:field="*{materialBrand}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">物料描述：</label>
             <div class="col-sm-8">
-                <textarea name="materialDescribe" class="form-control">[[*{materialDescribe}]]</textarea>
+                <textarea name="materialDescribe" class="form-control" disabled>[[*{materialDescribe}]]</textarea>
             </div>
         </div>
     </form>
@@ -77,37 +77,37 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">客户ID：</label>
                 <div class="col-sm-8">
-                    <input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text" required >
+                    <input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text" required disabled>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">客户名称：</label>
                 <div class="col-sm-8">
-                    <input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text" required>
+                    <input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text" required disabled>
                 </div>
             </div>
             <div class="form-group" >
                 <label  class="col-sm-3 control-label is-required is-required" >客户联系人：</label>
                 <div class="col-sm-8">
-                    <input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" required>
+                    <input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" required disabled>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">联系人电话：</label>
                 <div class="col-sm-8">
-                    <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" required>
+                    <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" required disabled>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">公司地址：</label>
                 <div class="col-sm-8">
-                    <input name="customerAddress" th:field="*{customerAddress}" class="form-control" type="text">
+                    <input name="customerAddress" th:field="*{customerAddress}" class="form-control" type="text" disabled>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货地址：</label>
                 <div class="col-sm-8">
-                    <input required name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text">
+                    <input required name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" disabled>
                 </div>
             </div>
         </form>
@@ -120,25 +120,25 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">设备型号：</label>
                 <div class="col-sm-8">
-                    <input name="deviceModelCode" th:field="*{deviceModelCode}" class="form-control" type="number" required >
+                    <input name="deviceModelCode" th:field="*{deviceModelCode}" class="form-control" type="number" required disabled>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">流水号：</label>
                 <div class="col-sm-8">
-                    <input name="deviceRunningNumber" th:field="*{deviceRunningNumber}" class="form-control" type="number" required>
+                    <input name="deviceRunningNumber" th:field="*{deviceRunningNumber}" class="form-control" type="number" required disabled>
                 </div>
             </div>
             <div class="form-group" >
                 <label  class="col-sm-3 control-label is-required is-required" >图片：</label>
                 <div class="col-sm-8">
-                    <input name="makePhotoUrl" th:field="*{makePhotoUrl}" class="form-control" type="text" required>
+                    <input name="makePhotoUrl" th:field="*{makePhotoUrl}" class="form-control" type="text" required disabled>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">生产员：</label>
                 <div class="col-sm-8">
-                    <input name="makeName" th:field="*{makeName}" class="form-control" type="text" required>
+                    <input name="makeName" th:field="*{makeName}" class="form-control" type="text" required disabled>
                 </div>
             </div>
         </form>
@@ -149,23 +149,35 @@
         <h4 class="font-weight-bold">仓库和售后信息</h4>
         <hr>
         <form class="form-horizontal m" id="form-warehouseAndAfterSalesDto-edit" th:object="${warehouseAndAfterSalesDto}">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">出库单号：</label>
+                <div class="col-sm-8">
+                    <input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">仓库员：</label>
+                <div class="col-sm-8">
+                    <input name="warehouseName" th:field="*{warehouseName}" class="form-control" type="text" disabled>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">SN号：</label>
                 <div class="col-sm-8">
-                    <input name="snCode" th:field="*{snCode}" class="form-control" type="text">
+                    <input name="snCode" th:field="*{snCode}" class="form-control" type="text" disabled>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">售后图片：</label>
                 <div class="col-sm-8">
-                    <input name="aftersalesPhotourl" th:field="*{aftersalesPhotourl}" class="form-control" type="text">
+                    <input name="aftersalesPhotourl" th:field="*{aftersalesPhotourl}" class="form-control" type="text" disabled>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">出厂日期：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
-                        <input name="factoryDate" th:value="*{factoryDate}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <input name="factoryDate" th:value="${#dates.format(warehouseAndAfterSalesDto.factoryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
@@ -173,31 +185,34 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">保修期：</label>
                 <div class="col-sm-8">
-                    <input name="guaranteePeriod" th:field="*{guaranteePeriod}" class="form-control" type="text">
+                    <input name="guaranteePeriod" th:field="*{guaranteePeriod}" class="form-control" type="text" disabled>
                 </div>
             </div>
+
             <div class="form-group">
                 <label class="col-sm-3 control-label">锁机时间：</label>
                 <div class="col-sm-8">
-                    <div class="input-group date">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('lock_date_flag')}">
-                        <input name="lockDate" th:value="*{lockDate}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <input type="radio" th:id="${'lockDateFlag_' + dict.dictCode}" name="lockDateFlag" th:value="${dict.dictValue}" th:field="*{lockDateFlag}" disabled>
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <label th:for="${'lockDateFlag_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
                     </div>
                 </div>
             </div>
+
             <div class="form-group">
-                <label class="col-sm-3 control-label">是否有锁机时间：</label>
+                <label class="col-sm-3 control-label">锁机时间：</label>
                 <div class="col-sm-8">
-                    <select name="lockDateFlag" class="form-control m-b" th:with="type=${@dict.getType('lock_date_flag')}">
+                    <div class="input-group date">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{lockDateFlag}"></option>
+                        <input name="lockDate" th:value="${#dates.format(warehouseAndAfterSalesDto.lockDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
-                    </select>
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">损耗品到期时间：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
-                        <input name="wastageExpireDate" th:value="*{wastageExpireDate}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <input name="wastageExpireDate" th:value="${#dates.format(warehouseAndAfterSalesDto.wastageExpireDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
@@ -206,7 +221,7 @@
                 <label class="col-sm-3 control-label">二次维修后部件质保时间：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
-                        <input name="componentGuaranteeDate" th:value="*{componentGuaranteeDate}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <input name="componentGuaranteeDate" th:value="${#dates.format(warehouseAndAfterSalesDto.componentGuaranteeDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
@@ -242,7 +257,7 @@
             // 使用 JSON.stringify() 序列化数据
             const jsonData = JSON.stringify(combinedData);
             // 发送 AJAX 请求到后端接口
-            $.operate.saveJson(prefix + "/edit", jsonData);
+            $.operate.saveJson(prefix + "/detail", jsonData);
         }
     }
 

ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html

@@ -149,6 +149,18 @@
             <h4 class="font-weight-bold">仓库和售后信息</h4>
             <hr>
             <form class="form-horizontal m" id="form-warehouseAndAfterSalesDto-edit" th:object="${warehouseAndAfterSalesDto}">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">出库单号：</label>
+                    <div class="col-sm-8">
+                        <input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text">
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">仓库员：</label>
+                    <div class="col-sm-8">
+                        <input name="warehouseName" th:field="*{warehouseName}" class="form-control" type="text">
+                    </div>
+                </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">SN号：</label>
                     <div class="col-sm-8">
@@ -165,7 +177,7 @@
                     <label class="col-sm-3 control-label">出厂日期：</label>
                     <div class="col-sm-8">
                         <div class="input-group date">
-                            <input name="factoryDate" th:value="*{factoryDate}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                            <input name="factoryDate" th:value="${#dates.format(warehouseAndAfterSalesDto.factoryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                             <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                         </div>
                     </div>
@@ -179,25 +191,26 @@
                 <div class="form-group">
                     <label class="col-sm-3 control-label">锁机时间：</label>
                     <div class="col-sm-8">
-                        <div class="input-group date">
+                        <div class="radio-box" th:each="dict : ${@dict.getType('lock_date_flag')}">
-                            <input name="lockDate" th:value="*{lockDate}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                            <input type="radio" th:id="${'lockDateFlag_' + dict.dictCode}" name="lockDateFlag" th:value="${dict.dictValue}" th:field="*{lockDateFlag}">
-                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            <label th:for="${'lockDateFlag_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
                         </div>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">是否有锁机时间：</label>
+                    <label class="col-sm-3 control-label">锁机时间：</label>
                     <div class="col-sm-8">
-                        <select name="lockDateFlag" class="form-control m-b" th:with="type=${@dict.getType('lock_date_flag')}">
+                        <div class="input-group date">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{lockDateFlag}"></option>
+                            <input name="lockDate" th:value="${#dates.format(warehouseAndAfterSalesDto.lockDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        </select>
+                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        </div>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">损耗品到期时间：</label>
                     <div class="col-sm-8">
                         <div class="input-group date">
-                            <input name="wastageExpireDate" th:value="*{wastageExpireDate}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                            <input name="wastageExpireDate" th:value="${#dates.format(warehouseAndAfterSalesDto.wastageExpireDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                             <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                         </div>
                     </div>
@@ -206,7 +219,7 @@
                     <label class="col-sm-3 control-label">二次维修后部件质保时间：</label>
                     <div class="col-sm-8">
                         <div class="input-group date">
-                            <input name="componentGuaranteeDate" th:value="*{componentGuaranteeDate}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                            <input name="componentGuaranteeDate" th:value="${#dates.format(warehouseAndAfterSalesDto.componentGuaranteeDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                             <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                         </div>
                     </div>

ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html

@@ -108,21 +108,6 @@
                     </div>
                 </form>
             </div>
-
-<!--            <div class="btn-group-sm" id="toolbar" role="group">-->
-<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="aftersales:shippingDevice:add">-->
-<!--                    <i class="fa fa-plus"></i> 添加-->
-<!--                </a>-->
-<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="aftersales:shippingDevice:edit">-->
-<!--                    <i class="fa fa-edit"></i> 修改-->
-<!--                </a>-->
-<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="aftersales:shippingDevice:remove">-->
-<!--                    <i class="fa fa-remove"></i> 删除-->
-<!--                </a>-->
-<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="aftersales:shippingDevice:export">-->
-<!--                    <i class="fa fa-download"></i> 导出-->
-<!--                </a>-->
-<!--            </div>-->
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
             </div>