From 311e6a7e04cc2bb70adfe602ba126ce950362c56 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Sat, 27 Apr 2024 15:17:49 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E4=BF=A1=E6=81=AFdto?= =?UTF-8?q?=E7=B1=BB=20=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93=E5=92=8C?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E4=BF=A1=E6=81=AFdto=E7=B1=BB=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87dto=E7=B1=BB=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E7=BC=96?= =?UTF-8?q?=E8=BE=91dto=E7=B1=BB=20=E6=96=B0=E5=A2=9E=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AfterSalesShippingDeviceController.java | 38 +++-- .../domain/AfterSalesShippingDevice.java | 98 ++++++------ .../domain/dto/AfterSalesMakeOrderDto.java | 20 +++ .../dto/AfterSalesShippingDeviceDto.java | 44 ++++++ .../dto/AfterSalesShippingDeviceEditDto.java | 101 +++++++++++++ .../aftersales/domain/dto/CustomerDto.java | 25 ++++ .../domain/dto/WarehouseAndAfterSalesDto.java | 40 +++++ .../IAfterSalesShippingDeviceService.java | 33 +++- .../AfterSalesShippingDeviceServiceImpl.java | 87 ++++++++++- .../system/service/ISysCustomerService.java | 3 + .../service/impl/SysCustomerServiceImpl.java | 15 ++ .../AfterSalesShippingDeviceMapper.xml | 5 +- .../aftersales/shippingDevice/edit.html | 141 ++++++++++++++++-- .../shippingDevice/shippingDevice.html | 6 - 14 files changed, 574 insertions(+), 82 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesMakeOrderDto.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceDto.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceEditDto.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/CustomerDto.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/WarehouseAndAfterSalesDto.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java index 0c9068b0..fd032311 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java @@ -2,18 +2,16 @@ package com.ruoyi.aftersales.controller; import java.util.List; +import com.ruoyi.aftersales.domain.dto.*; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysCustomer; +import com.ruoyi.system.domain.SysOutGood; import com.ruoyi.system.service.ISysCustomerService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.aftersales.domain.AfterSalesShippingDevice; @@ -102,17 +100,24 @@ public class AfterSalesShippingDeviceController extends BaseController @GetMapping("/edit/{shippingDeviceCode}") public String edit(@PathVariable("shippingDeviceCode") Long shippingDeviceCode, ModelMap mmap) { - AfterSalesShippingDevice afterSalesShippingDevice = afterSalesShippingDeviceService.selectAfterSalesShippingDeviceById(shippingDeviceCode); + AfterSalesShippingDeviceDto afterSalesShippingDeviceDto = afterSalesShippingDeviceService.selectAfterSalesShippingDeviceDtoById(shippingDeviceCode); //查找客户信息 - String customerId = afterSalesShippingDevice.getCustomerId(); - SysCustomer sysCustomer = customerService.selectSysCustomerByEnterpriseCode(customerId); - if (StringUtils.isNotNull(sysCustomer)){ - mmap.put("sysCustomer",sysCustomer); + String customerId = afterSalesShippingDeviceDto.getCustomerId(); + CustomerDto customerDto = customerService.selectCustomerDtoByEnterpriseCode(customerId); + if (StringUtils.isNotNull(customerDto)){ + mmap.put("customerDto",customerDto); } - //查找生产信息 后续补充 - //查找仓库信息 后续补充 - //查找售后信息 后续补充 - mmap.put("afterSalesShippingDevice", afterSalesShippingDevice); + //查找生产信息 + AfterSalesMakeOrderDto makeOrderDto = afterSalesShippingDeviceService.selectAfterSalesMakeOrderDtoById(shippingDeviceCode); + if (StringUtils.isNotNull(makeOrderDto)){ + mmap.put("makeOrderDto",makeOrderDto); + } + //查找仓库和售后信息 后续补充 + WarehouseAndAfterSalesDto warehouseAndAfterSalesDto = afterSalesShippingDeviceService.selectWarehouseAndAfterSalesDtoById(shippingDeviceCode); + if (StringUtils.isNotNull(warehouseAndAfterSalesDto)){ + mmap.put("warehouseAndAfterSalesDto",warehouseAndAfterSalesDto); + } + mmap.put("afterSalesShippingDeviceDto", afterSalesShippingDeviceDto); // mmap.put("sysCustomer",sysCustomer); return prefix + "/edit"; } @@ -124,9 +129,10 @@ public class AfterSalesShippingDeviceController extends BaseController @Log(title = "出货设备", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(AfterSalesShippingDevice afterSalesShippingDevice) + public AjaxResult editSave(@RequestBody AfterSalesShippingDeviceEditDto dto) { - return toAjax(afterSalesShippingDeviceService.updateAfterSalesShippingDevice(afterSalesShippingDevice)); + + return toAjax(afterSalesShippingDeviceService.updateAfterSalesShippingDevice(dto)); } /** 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 7a25b861..8ea2f282 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 @@ -2,6 +2,7 @@ package com.ruoyi.aftersales.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.system.domain.SysCustomer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -87,7 +88,7 @@ public class AfterSalesShippingDevice extends BaseEntity /** 出厂日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date factoryDate; + private String factoryDate; /** 保修期 */ @Excel(name = "保修期") @@ -100,7 +101,7 @@ public class AfterSalesShippingDevice extends BaseEntity /** 锁机时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "锁机时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date lockDate; + private String lockDate; /** 是否有锁机时间 */ @Excel(name = "是否有锁机时间") @@ -109,7 +110,7 @@ public class AfterSalesShippingDevice extends BaseEntity /** 损耗品到期时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "损耗品到期时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date wastageExpireDate; + private String wastageExpireDate; /** 是否过损耗品到期时间 */ @Excel(name = "是否过损耗品到期时间") @@ -118,7 +119,7 @@ public class AfterSalesShippingDevice extends BaseEntity /** 二次维修后部件质保时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "二次维修后部件质保时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date componentGuaranteeDate; + private String componentGuaranteeDate; /** 是否过二次维修后部件质保日期 */ @Excel(name = "是否过二次维修后部件质保日期") @@ -132,6 +133,10 @@ public class AfterSalesShippingDevice extends BaseEntity @Excel(name = "业务员姓名") private String salesmanName; + /** 生产员姓名 */ + @Excel(name = "生产员姓名") + private String makeName; + /** 客户ID */ @Excel(name = "客户ID") private String customerId; @@ -149,6 +154,7 @@ public class AfterSalesShippingDevice extends BaseEntity @Excel(name = "维修时间", width = 30, dateFormat = "yyyy-MM-dd") private Date maintainTime; + public void setShippingDeviceCode(Long shippingDeviceCode) { this.shippingDeviceCode = shippingDeviceCode; @@ -302,15 +308,7 @@ public class AfterSalesShippingDevice extends BaseEntity { return aftersalesPhotourl; } - public void setFactoryDate(Date factoryDate) - { - this.factoryDate = factoryDate; - } - public Date getFactoryDate() - { - return factoryDate; - } public void setGuaranteePeriod(String guaranteePeriod) { this.guaranteePeriod = guaranteePeriod; @@ -329,15 +327,7 @@ public class AfterSalesShippingDevice extends BaseEntity { return guaranteePeriodFlag; } - public void setLockDate(Date lockDate) - { - this.lockDate = lockDate; - } - public Date getLockDate() - { - return lockDate; - } public void setLockDateFlag(String lockDateFlag) { this.lockDateFlag = lockDateFlag; @@ -347,15 +337,7 @@ public class AfterSalesShippingDevice extends BaseEntity { return lockDateFlag; } - public void setWastageExpireDate(Date wastageExpireDate) - { - this.wastageExpireDate = wastageExpireDate; - } - public Date getWastageExpireDate() - { - return wastageExpireDate; - } public void setWastageExpireFlag(String wastageExpireFlag) { this.wastageExpireFlag = wastageExpireFlag; @@ -365,15 +347,7 @@ public class AfterSalesShippingDevice extends BaseEntity { return wastageExpireFlag; } - public void setComponentGuaranteeDate(Date componentGuaranteeDate) - { - this.componentGuaranteeDate = componentGuaranteeDate; - } - public Date getComponentGuaranteeDate() - { - return componentGuaranteeDate; - } public void setComponentGuaranteeFlag(String componentGuaranteeFlag) { this.componentGuaranteeFlag = componentGuaranteeFlag; @@ -406,7 +380,15 @@ public class AfterSalesShippingDevice extends BaseEntity this.customerId = customerId; } - public String getCustomerId() + public String getMakeName() { + return makeName; + } + + public void setMakeName(String makeName) { + this.makeName = makeName; + } + + public String getCustomerId() { return customerId; } @@ -428,16 +410,47 @@ public class AfterSalesShippingDevice extends BaseEntity { return maintainOrderCode; } - public void setMaintainTime(Date maintainTime) - { - this.maintainTime = maintainTime; + + public String getFactoryDate() { + return factoryDate; } - public Date getMaintainTime() - { + public void setFactoryDate(String factoryDate) { + this.factoryDate = factoryDate; + } + + public String getLockDate() { + return lockDate; + } + + public void setLockDate(String lockDate) { + this.lockDate = lockDate; + } + + public String getWastageExpireDate() { + return wastageExpireDate; + } + + public void setWastageExpireDate(String wastageExpireDate) { + this.wastageExpireDate = wastageExpireDate; + } + + public String getComponentGuaranteeDate() { + return componentGuaranteeDate; + } + + public void setComponentGuaranteeDate(String componentGuaranteeDate) { + this.componentGuaranteeDate = componentGuaranteeDate; + } + + public Date getMaintainTime() { return maintainTime; } + public void setMaintainTime(Date maintainTime) { + this.maintainTime = maintainTime; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -469,6 +482,7 @@ public class AfterSalesShippingDevice extends BaseEntity .append("componentGuaranteeFlag", getComponentGuaranteeFlag()) .append("engineerName", getEngineerName()) .append("salesmanName", getSalesmanName()) + .append("makeName",getMakeName()) .append("customerId", getCustomerId()) .append("customerName", getCustomerName()) .append("maintainOrderCode", getMaintainOrderCode()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesMakeOrderDto.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesMakeOrderDto.java new file mode 100644 index 00000000..c57f8b39 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesMakeOrderDto.java @@ -0,0 +1,20 @@ +package com.ruoyi.aftersales.domain.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +@Data +public class AfterSalesMakeOrderDto { + + @JsonProperty("deviceModelCode") + private String deviceModelCode; + + @JsonProperty("deviceRunningNumber") + private String deviceRunningNumber; + + @JsonProperty("makePhotoUrl") + private String makePhotoUrl; + + @JsonProperty("makeName") + private String makeName; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceDto.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceDto.java new file mode 100644 index 00000000..988691d1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceDto.java @@ -0,0 +1,44 @@ +package com.ruoyi.aftersales.domain.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +@Data +public class AfterSalesShippingDeviceDto { + + @JsonProperty("shippingDeviceCode") + private Long shippingDeviceCode; + + @JsonProperty("shippingDeviceId") + private String shippingDeviceId; + + @JsonProperty("makeNo") + private String makeNo; + + @JsonProperty("materialNo") + private String materialNo; + + @JsonProperty("materialPhotourl") + private String materialPhotourl; + + @JsonProperty("materialName") + private String materialName; + + @JsonProperty("materialType") + private String materialType; + + @JsonProperty("materialClass") + private String materialClass; + + @JsonProperty("materialUnit") + private String materialUnit; + + @JsonProperty("materialBrand") + private String materialBrand; + + @JsonProperty("materialDescribe") + private String materialDescribe; + + @JsonProperty("customerId") + private String customerId; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceEditDto.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceEditDto.java new file mode 100644 index 00000000..42be5b48 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceEditDto.java @@ -0,0 +1,101 @@ +package com.ruoyi.aftersales.domain.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class AfterSalesShippingDeviceEditDto { + + @JsonProperty("shippingDeviceCode") + private Long shippingDeviceCode; + + @JsonProperty("shippingDeviceId") + private String shippingDeviceId; + + @JsonProperty("materialPhotourl") + private String materialPhotourl; + + @JsonProperty("materialName") + private String materialName; + + @JsonProperty("materialType") + private String materialType; + + @JsonProperty("materialClass") + private String materialClass; + + @JsonProperty("materialUnit") + private String materialUnit; + + @JsonProperty("materialBrand") + private String materialBrand; + + @JsonProperty("materialDescribe") + private String materialDescribe; + + /*客户*/ + @JsonProperty("enterpriseCode") + private String enterpriseCode; + + @JsonProperty("enterpriseName") + private String enterpriseName; + + @JsonProperty("customerContact") + private String customerContact; + + @JsonProperty("contactNumber") + private String contactNumber; + + @JsonProperty("customerAddress") + private String customerAddress; + + @JsonProperty("deliveryAddress") + private String deliveryAddress; + + /*生产信息*/ + @JsonProperty("deviceModelCode") + private String deviceModelCode; + + @JsonProperty("deviceRunningNumber") + private String deviceRunningNumber; + + @JsonProperty("makePhotoUrl") + private String makePhotoUrl; + + @JsonProperty("makeName") + private String makeName; + + @JsonProperty("makeNo") + private String makeNo; + + @JsonProperty("snCode") + private String snCode; + + @JsonProperty("aftersalesPhotourl") + private String aftersalesPhotourl; + + @JsonFormat(pattern = "yyyy-MM-dd") + @JsonProperty("factoryDate") + private String factoryDate; + + @JsonProperty("guaranteePeriod") + private String guaranteePeriod; + + @JsonFormat(pattern = "yyyy-MM-dd") + @JsonProperty("lockDate") + private String lockDate; + + @JsonProperty("lockDateFlag") + private String lockDateFlag; + + @JsonFormat(pattern = "yyyy-MM-dd") + @JsonProperty("wastageExpireDate") + private String wastageExpireDate; + + @JsonFormat(pattern = "yyyy-MM-dd") + @JsonProperty("componentGuaranteeDate") + private String componentGuaranteeDate; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/CustomerDto.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/CustomerDto.java new file mode 100644 index 00000000..a9ab6a72 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/CustomerDto.java @@ -0,0 +1,25 @@ +package com.ruoyi.aftersales.domain.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +@Data +public class CustomerDto { + @JsonProperty("enterpriseCode") + private String enterpriseCode; + + @JsonProperty("enterpriseName") + private String enterpriseName; + + @JsonProperty("customerContact") + private String customerContact; + + @JsonProperty("contactNumber") + private String contactNumber; + + @JsonProperty("customerAddress") + private String customerAddress; + + @JsonProperty("deliveryAddress") + private String deliveryAddress; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/WarehouseAndAfterSalesDto.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/WarehouseAndAfterSalesDto.java new file mode 100644 index 00000000..c95d027e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/WarehouseAndAfterSalesDto.java @@ -0,0 +1,40 @@ +package com.ruoyi.aftersales.domain.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class WarehouseAndAfterSalesDto { + + @JsonProperty("snCode") + private String snCode; + + @JsonProperty("aftersalesPhotourl") + private String aftersalesPhotourl; + + @JsonFormat(pattern = "yyyy-MM-dd") + @JsonProperty("factoryDate") + private String factoryDate; + + @JsonProperty("guaranteePeriod") + private String guaranteePeriod; + + @JsonFormat(pattern = "yyyy-MM-dd") + @JsonProperty("lockDate") + private String lockDate; + + @JsonProperty("lockDateFlag") + private String lockDateFlag; + + @JsonFormat(pattern = "yyyy-MM-dd") + @JsonProperty("wastageExpireDate") + private String wastageExpireDate; + + @JsonFormat(pattern = "yyyy-MM-dd") + @JsonProperty("componentGuaranteeDate") + private String componentGuaranteeDate; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java index f9e0cfe6..78c9aff6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java @@ -2,6 +2,10 @@ package com.ruoyi.aftersales.service; import java.util.List; import com.ruoyi.aftersales.domain.AfterSalesShippingDevice; +import com.ruoyi.aftersales.domain.dto.AfterSalesShippingDeviceDto; +import com.ruoyi.aftersales.domain.dto.AfterSalesMakeOrderDto; +import com.ruoyi.aftersales.domain.dto.AfterSalesShippingDeviceEditDto; +import com.ruoyi.aftersales.domain.dto.WarehouseAndAfterSalesDto; import com.ruoyi.aftersales.domain.vo.SelectDeviceVO; /** @@ -20,6 +24,31 @@ public interface IAfterSalesShippingDeviceService */ public AfterSalesShippingDevice selectAfterSalesShippingDeviceById(Long shippingDeviceCode); + /** + * 查询出货设备 + * + * @param shippingDeviceCode 出货设备ID + * @return 出货设备Dto + */ + public AfterSalesShippingDeviceDto selectAfterSalesShippingDeviceDtoById(Long shippingDeviceCode); + + /** + * 查询出货设备 + * + * @param shippingDeviceCode 出货设备ID + * @return 出货设备生产Dto + */ + public AfterSalesMakeOrderDto selectAfterSalesMakeOrderDtoById(Long shippingDeviceCode); + + + /** + * 查询出货设备 + * + * @param shippingDeviceCode 出货设备ID + * @return 出货设备仓库和售后Dto + */ + public WarehouseAndAfterSalesDto selectWarehouseAndAfterSalesDtoById(Long shippingDeviceCode); + /** * 查询出货设备列表 * @@ -42,7 +71,9 @@ public interface IAfterSalesShippingDeviceService * @param afterSalesShippingDevice 出货设备 * @return 结果 */ - public int updateAfterSalesShippingDevice(AfterSalesShippingDevice afterSalesShippingDevice); + public int updateAfterSalesShippingDevice(AfterSalesShippingDeviceEditDto afterSalesShippingDeviceEditDto); + + /** * 批量删除出货设备 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java index 5d496b66..21ef839e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java @@ -4,6 +4,10 @@ import java.util.ArrayList; import java.util.List; import com.ruoyi.aftersales.domain.AftersalesComplaintNotice; +import com.ruoyi.aftersales.domain.dto.AfterSalesMakeOrderDto; +import com.ruoyi.aftersales.domain.dto.AfterSalesShippingDeviceDto; +import com.ruoyi.aftersales.domain.dto.AfterSalesShippingDeviceEditDto; +import com.ruoyi.aftersales.domain.dto.WarehouseAndAfterSalesDto; import com.ruoyi.aftersales.domain.vo.SelectDeviceVO; import com.ruoyi.aftersales.mapper.AftersalesComplaintNoticeMapper; import com.ruoyi.common.utils.DateUtils; @@ -15,6 +19,7 @@ import com.ruoyi.aftersales.mapper.AfterSalesShippingDeviceMapper; import com.ruoyi.aftersales.domain.AfterSalesShippingDevice; import com.ruoyi.aftersales.service.IAfterSalesShippingDeviceService; import com.ruoyi.common.core.text.Convert; +import org.springframework.transaction.annotation.Transactional; /** * 出货设备Service业务层处理 @@ -40,7 +45,67 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD @Override public AfterSalesShippingDevice selectAfterSalesShippingDeviceById(Long shippingDeviceCode) { - return afterSalesShippingDeviceMapper.selectAfterSalesShippingDeviceById(shippingDeviceCode); + AfterSalesShippingDevice afterSalesShippingDevice = afterSalesShippingDeviceMapper.selectAfterSalesShippingDeviceById(shippingDeviceCode); + + return afterSalesShippingDevice; + } + + /** + * 查询出货设备 + * + * @param shippingDeviceCode 出货设备ID + * @return 出货设备Dto + */ + @Override + public AfterSalesShippingDeviceDto selectAfterSalesShippingDeviceDtoById(Long shippingDeviceCode){ + AfterSalesShippingDeviceDto shippingDeviceDto = new AfterSalesShippingDeviceDto(); + AfterSalesShippingDevice afterSalesShippingDevice = afterSalesShippingDeviceMapper.selectAfterSalesShippingDeviceById(shippingDeviceCode); + if (StringUtils.isNotNull(afterSalesShippingDevice)){ + shippingDeviceDto.setShippingDeviceId(afterSalesShippingDevice.getShippingDeviceId()); +// afterSalesShippingDeviceDto.setShippingDeviceCode(afterSalesShippingDevice.getShippingDeviceCode()); + shippingDeviceDto.setCustomerId(afterSalesShippingDevice.getCustomerId()); + shippingDeviceDto.setMaterialNo(afterSalesShippingDevice.getMaterialNo()); + shippingDeviceDto.setMaterialClass(afterSalesShippingDevice.getMaterialClass()); + shippingDeviceDto.setMaterialType(afterSalesShippingDevice.getMaterialType()); + shippingDeviceDto.setMaterialDescribe(afterSalesShippingDevice.getMaterialDescribe()); + shippingDeviceDto.setMaterialBrand(afterSalesShippingDevice.getMaterialBrand()); + shippingDeviceDto.setMaterialName(afterSalesShippingDevice.getMaterialName()); + shippingDeviceDto.setMaterialUnit(afterSalesShippingDevice.getMaterialUnit()); + shippingDeviceDto.setMakeNo(afterSalesShippingDevice.getMakeNo()); + } + return shippingDeviceDto; + } + + @Override + public AfterSalesMakeOrderDto selectAfterSalesMakeOrderDtoById(Long shippingDeviceCode) { + AfterSalesMakeOrderDto makeOrderDto = new AfterSalesMakeOrderDto(); + AfterSalesShippingDevice afterSalesShippingDevice = afterSalesShippingDeviceMapper.selectAfterSalesShippingDeviceById(shippingDeviceCode); + if (StringUtils.isNotNull(afterSalesShippingDevice)){ + makeOrderDto.setMakeName(afterSalesShippingDevice.getMakeName()); + makeOrderDto.setMakePhotoUrl(afterSalesShippingDevice.getMakePhotourl()); + makeOrderDto.setDeviceModelCode(afterSalesShippingDevice.getDeviceModelCode()); + makeOrderDto.setDeviceRunningNumber(afterSalesShippingDevice.getDeviceRunningNumber()); + } + + return makeOrderDto; + } + + @Override + public WarehouseAndAfterSalesDto selectWarehouseAndAfterSalesDtoById(Long shippingDeviceCode) { + WarehouseAndAfterSalesDto warehouseAndAfterSalesDto = new WarehouseAndAfterSalesDto(); + AfterSalesShippingDevice afterSalesShippingDevice = afterSalesShippingDeviceMapper.selectAfterSalesShippingDeviceById(shippingDeviceCode); + if (StringUtils.isNotNull(afterSalesShippingDevice)){ + warehouseAndAfterSalesDto.setFactoryDate(afterSalesShippingDevice.getFactoryDate()); + warehouseAndAfterSalesDto.setLockDate(afterSalesShippingDevice.getLockDate()); + warehouseAndAfterSalesDto.setAftersalesPhotourl(afterSalesShippingDevice.getAftersalesPhotourl()); + warehouseAndAfterSalesDto.setGuaranteePeriod(afterSalesShippingDevice.getGuaranteePeriod()); + warehouseAndAfterSalesDto.setLockDateFlag(afterSalesShippingDevice.getLockDateFlag()); + warehouseAndAfterSalesDto.setComponentGuaranteeDate(afterSalesShippingDevice.getComponentGuaranteeDate()); + warehouseAndAfterSalesDto.setWastageExpireDate(afterSalesShippingDevice.getWastageExpireDate()); + warehouseAndAfterSalesDto.setSnCode(afterSalesShippingDevice.getSnCode()); + + } + return warehouseAndAfterSalesDto; } /** @@ -73,15 +138,31 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD /** * 修改出货设备 * - * @param afterSalesShippingDevice 出货设备 + * @param editDto 出货设备 * @return 结果 */ + @Transactional @Override - public int updateAfterSalesShippingDevice(AfterSalesShippingDevice afterSalesShippingDevice) + public int updateAfterSalesShippingDevice(AfterSalesShippingDeviceEditDto editDto) { + AfterSalesShippingDevice afterSalesShippingDevice = new AfterSalesShippingDevice(); + String loginName = ShiroUtils.getLoginName(); afterSalesShippingDevice.setUpdateBy(loginName); afterSalesShippingDevice.setUpdateTime(DateUtils.getNowDate()); + afterSalesShippingDevice.setShippingDeviceId(editDto.getShippingDeviceId()); + afterSalesShippingDevice.setMakeNo(editDto.getMakeNo()); + afterSalesShippingDevice.setDeviceModelCode(editDto.getDeviceModelCode()); + afterSalesShippingDevice.setDeviceRunningNumber(editDto.getDeviceRunningNumber()); + afterSalesShippingDevice.setSnCode(editDto.getSnCode()); + afterSalesShippingDevice.setAftersalesPhotourl(editDto.getAftersalesPhotourl()); + afterSalesShippingDevice.setFactoryDate(editDto.getFactoryDate()); + afterSalesShippingDevice.setComponentGuaranteeDate(editDto.getComponentGuaranteeDate()); + afterSalesShippingDevice.setLockDateFlag(editDto.getLockDateFlag()); + afterSalesShippingDevice.setLockDate(editDto.getLockDate()); + afterSalesShippingDevice.setWastageExpireDate(editDto.getWastageExpireDate()); + afterSalesShippingDevice.setGuaranteePeriod(editDto.getGuaranteePeriod()); +// afterSalesShippingDevice.setShippingDeviceCode(editDto.getShippingDeviceCode()); return afterSalesShippingDeviceMapper.updateAfterSalesShippingDevice(afterSalesShippingDevice); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java index c776619c..fa8336cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service; +import com.ruoyi.aftersales.domain.dto.CustomerDto; import com.ruoyi.system.domain.SysCustomer; import com.ruoyi.system.domain.SysCustomerVo; import org.activiti.engine.runtime.ProcessInstance; @@ -88,4 +89,6 @@ public interface ISysCustomerService ProcessInstance updateSysCustomerVo(SysCustomer sysCustomer); + + CustomerDto selectCustomerDtoByEnterpriseCode(String customerId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java index 6d6ef4b1..5d204d7c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.system.service.impl; import com.github.pagehelper.Page; +import com.ruoyi.aftersales.domain.dto.CustomerDto; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.TableSupport; @@ -235,6 +236,20 @@ public class SysCustomerServiceImpl implements ISysCustomerService sysCustomerMapper.updateSysCustomer(sysCustomer); return processInstance; } + + @Override + public CustomerDto selectCustomerDtoByEnterpriseCode(String customerId) { + CustomerDto customerDto = new CustomerDto(); + SysCustomer sysCustomer = sysCustomerMapper.selectSysCustomerByEnterpriseCode(customerId); + customerDto.setContactNumber(sysCustomer.getContactNumber()); + customerDto.setCustomerAddress(sysCustomer.getCustomerAddress()); + customerDto.setEnterpriseCode(sysCustomer.getEnterpriseCode()); + customerDto.setEnterpriseName(sysCustomer.getEnterpriseName()); + customerDto.setDeliveryAddress(sysCustomer.getDeliveryAddress()); + customerDto.setCustomerContact(sysCustomer.getCustomerContact()); + return customerDto; + } + @Override public int deleteSysCustomerByIds(String[] ids) { return sysCustomerMapper.deleteSysCustomerByIds(ids); diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml index 7c2a1058..0367c637 100644 --- a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml @@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -44,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select shipping_device_code, shipping_device_id, make_no, 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, component_guarantee_date, component_guarantee_flag, engineer_name, salesman_name, customer_id, customer_name, maintain_order_code, maintain_time, create_by, create_time, update_by, update_time from aftersales_shipping_device + select shipping_device_code, shipping_device_id, make_no, 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, 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 from aftersales_shipping_device
@@ -14,49 +14,49 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -73,11 +73,11 @@

客户信息

-
+
- +
@@ -111,8 +111,108 @@
+
+ +
+

生产信息

+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+

仓库和售后信息

+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+
@@ -125,7 +225,24 @@ function submitHandler() { if ($.validate.form()) { - $.operate.save(prefix + "/edit", $('#form-shippingDevice-edit').serialize()); + + // 获取表单数据 + const shippingDeviceData = $("#form-shippingDevice-edit").serializeArray(); + console.log(shippingDeviceData); + const customerData = $("#form-customer-edit").serializeArray(); + const makeOrderData= $("#form-makeOrderDto-edit").serializeArray(); + + const warehouseAndAfterSalesData= $("#form-warehouseAndAfterSalesDto-edit").serializeArray(); + + // 合并表单数据为一个 JSON 对象 + const combinedData = shippingDeviceData.concat(customerData, makeOrderData,warehouseAndAfterSalesData).reduce((acc, curr) => { + acc[curr.name] = curr.value; + return acc; + }, {}); + // 使用 JSON.stringify() 序列化数据 + const jsonData = JSON.stringify(combinedData); + // 发送 AJAX 请求到后端接口 + $.operate.saveJson(prefix + "/edit", jsonData); } } diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html index 83005d8b..247705ad 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html @@ -313,12 +313,6 @@ formatter: function(value, row, index) { var actions = []; actions.push('编辑 '); - actions.push('删除 '); - if(row.delFlag == '0'){ - actions.push('作废 '); - }else{ - actions.push('恢复 '); - } return actions.join(''); } }]