From 110d3074866912afc38071f0580d85bcc2d287c8 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 1 Aug 2024 15:54:37 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E=E5=87=BA=E8=B4=A7=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=9A=20=E5=87=BA?= =?UTF-8?q?=E5=8E=82=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E3=80=81=E9=94=81?= =?UTF-8?q?=E6=9C=BA=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E3=80=81=E6=8D=9F?= =?UTF-8?q?=E8=80=97=E5=93=81=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E4=BA=8C=E6=AC=A1=E7=BB=B4=E4=BF=AE=E5=90=8E?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E8=B4=A8=E4=BF=9D=E6=97=B6=E9=97=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=94=B1String->date=20=E4=BF=AE=E6=94=B9=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=9A=20?= =?UTF-8?q?=E5=87=BA=E5=8E=82=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E9=94=81=E6=9C=BA=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E6=8D=9F=E8=80=97=E5=93=81=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E4=BA=8C=E6=AC=A1=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=90=8E=E9=83=A8=E4=BB=B6=E8=B4=A8=E4=BF=9D=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=94=B1String->date=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E5=94=AE=E5=90=8E=E5=92=8C=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=9A=20=E5=87=BA?= =?UTF-8?q?=E5=8E=82=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E3=80=81=E9=94=81?= =?UTF-8?q?=E6=9C=BA=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E3=80=81=E6=8D=9F?= =?UTF-8?q?=E8=80=97=E5=93=81=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E4=BA=8C=E6=AC=A1=E7=BB=B4=E4=BF=AE=E5=90=8E?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E8=B4=A8=E4=BF=9D=E6=97=B6=E9=97=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=94=B1String->date=20=E4=BF=AE=E6=94=B9=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E6=97=B6=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=9A=20=E5=87=BA=E5=8E=82?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E3=80=81=E9=94=81=E6=9C=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E3=80=81=E6=8D=9F=E8=80=97?= =?UTF-8?q?=E5=93=81=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E4=BA=8C=E6=AC=A1=E7=BB=B4=E4=BF=AE=E5=90=8E=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E8=B4=A8=E4=BF=9D=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=94=B1String->date=20=E4=BF=AE=E6=94=B9=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=9F=A5=E6=89=BE=E5=87=BA=E8=B4=A7=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E4=BB=93=E5=BA=93=E5=92=8C=E5=94=AE=E5=90=8EDto?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=9A=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=A4=84=E7=90=86=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BB=93=E5=BA=93=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E5=A4=84=E7=90=86=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=AD=97=E6=AE=B5=E5=8A=A0?= =?UTF-8?q?=E4=B8=8Adisabled=E5=85=B3=E9=94=AE=E5=AD=97=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=9A=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E3=80=81=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99=E7=9A=84?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=AE=A2=E6=88=B7=E7=BC=96=E7=A0=81=E6=9F=A5?= =?UTF-8?q?=E6=89=BE=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=AF=B9=E5=AE=A2=E6=88=B7=E8=B5=84?= =?UTF-8?q?=E6=96=99=E5=88=A4=E7=A9=BA=E6=9D=A1=E4=BB=B6=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87?= =?UTF-8?q?Id=E6=9F=A5=E6=89=BE=E4=BB=93=E5=BA=93=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87Contro?= =?UTF-8?q?ller=E5=B1=82=E6=96=B0=E5=A2=9E=20=E4=BF=AE=E6=94=B9=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AfterSalesShippingDeviceController.java | 11 +++ .../domain/AfterSalesShippingDevice.java | 24 +++--- .../dto/AfterSalesShippingDeviceEditDto.java | 8 +- .../domain/dto/WarehouseAndAfterSalesDto.java | 14 +++- .../domain/vo/SelectShippingDeviceVO.java | 11 ++- .../IAfterSalesShippingDeviceService.java | 4 + .../AfterSalesShippingDeviceServiceImpl.java | 22 +++++ .../service/impl/SysCustomerServiceImpl.java | 14 ++-- .../mapper/WarehouseOutOrderMapper.java | 7 ++ .../warehouse/WarehouseOutOrderMapper.xml | 6 +- .../aftersales/shippingDevice/detail.html | 83 +++++++++++-------- .../aftersales/shippingDevice/edit.html | 33 +++++--- .../shippingDevice/shippingDevice.html | 15 ---- 13 files changed, 162 insertions(+), 90 deletions(-) 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 10631c98..9d35457f 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 @@ -165,6 +165,17 @@ public class AfterSalesShippingDeviceController extends BaseController + /** + * 修改保存出货设备详情 + */ + @ResponseBody + @PostMapping("/detail") + public AjaxResult detailSave(@RequestBody AfterSalesShippingDeviceEditDto dto) + { + return toAjax(afterSalesShippingDeviceService.detailSaveAfterSalesShippingDevice(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 6bf4cece..8a61af4c 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 @@ -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; } 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 index 42be5b48..8009985e 100644 --- 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 @@ -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; } 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 index c95d027e..7cfede33 100644 --- 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 @@ -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; } 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 cc4125b1..06eeee72 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 @@ -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; } 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 a8ebd7b3..18e68589 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 @@ -103,4 +103,8 @@ public interface IAfterSalesShippingDeviceService * */ List selectAfterSalesShippingDeviceByNoAndCode(AfterSalesShippingDevice afterSalesShippingDevice); + /** + * 保存出货设备详情 + * */ + int detailSaveAfterSalesShippingDevice(AfterSalesShippingDeviceEditDto dto); } 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 6ee1932f..e6223b7a 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 @@ -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; + } } 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 ece5585c..b15d6d3b 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 @@ -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()); - customerDto.setCustomerAddress(sysCustomer.getCustomerAddress()); - customerDto.setEnterpriseCode(sysCustomer.getEnterpriseCode()); - customerDto.setEnterpriseName(sysCustomer.getEnterpriseName()); - customerDto.setDeliveryAddress(sysCustomer.getDeliveryAddress()); - customerDto.setCustomerContact(sysCustomer.getCustomerContact()); + if(sysCustomer != null){ + 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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java index df447fae..5960c0fc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java +++ b/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); + } diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml index ea0c1aa5..be21c038 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml @@ -97,8 +97,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where out_order_code = #{outOrderCode} + + - insert into warehouse_out_order diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html index f363e77e..95e74f4f 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html @@ -11,61 +11,61 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -77,37 +77,37 @@
- +
- +
- +
- +
- +
- +
@@ -120,25 +120,25 @@
- +
- +
- +
- +
@@ -149,23 +149,35 @@

仓库和售后信息

+
+ +
+ +
+
+
+ +
+ +
+
- +
- +
- +
@@ -173,31 +185,34 @@
- +
+
-
- - +
+ +
+
- +
- +
+ + +
- +
@@ -206,7 +221,7 @@
- +
@@ -242,7 +257,7 @@ // 使用 JSON.stringify() 序列化数据 const jsonData = JSON.stringify(combinedData); // 发送 AJAX 请求到后端接口 - $.operate.saveJson(prefix + "/edit", jsonData); + $.operate.saveJson(prefix + "/detail", jsonData); } } diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html index 458a87bc..d1f3c3fa 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html @@ -149,6 +149,18 @@

仓库和售后信息

+
+ +
+ +
+
+
+ +
+ +
+
@@ -165,7 +177,7 @@
- +
@@ -179,25 +191,26 @@
-
- - +
+ +
- +
- +
+ + +
- +
@@ -206,7 +219,7 @@
- +
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 eb6d9100..2b2624e3 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html @@ -108,21 +108,6 @@
- - - - - - - - - - - - - - -