From 3a64ccacabfc91d054b42702982e333cdda90b70 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Wed, 19 Feb 2025 14:55:02 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=A6=81=E6=B1=82?= =?UTF-8?q?=EF=BC=8C=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81=E9=83=A8=E5=88=86=E8=A1=8C?= =?UTF-8?q?=E5=92=8C=E5=85=A8=E9=83=A8=E8=A1=8C=E5=AF=BC=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9B=B4=E5=A4=9A=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E6=89=80=E6=9C=89=E5=92=8C?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AF=BC=E5=87=BA=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20=E5=AF=BC=E5=87=BA=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E7=AE=A1=E7=90=86=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=96=B9=E6=B3=95=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=8D=95=E9=9B=86?= =?UTF-8?q?=E5=90=88=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AfterSalesShippingDeviceController.java | 22 ++++++++++--- .../domain/AfterSalesShippingDevice.java | 13 +++----- .../AfterSalesShippingDeviceMapper.java | 6 ++++ .../IAfterSalesShippingDeviceService.java | 6 ++++ .../AfterSalesShippingDeviceServiceImpl.java | 9 ++++++ .../AfterSalesShippingDeviceMapper.xml | 8 +++++ .../shippingDevice/shippingDevice.html | 31 +++++++++++++++++++ 7 files changed, 82 insertions(+), 13 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 9a796e79..42c0719c 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 @@ -11,6 +11,8 @@ import com.ruoyi.system.domain.SysCustomer; import com.ruoyi.system.domain.SysOutGood; import com.ruoyi.system.service.IProcessIssueRecordService; import com.ruoyi.system.service.ISysCustomerService; +import com.ruoyi.warehouse.domain.VO.ExportWarehouseInventoryCheckVo; +import com.ruoyi.warehouse.domain.VO.WarehouseInventoryCheckVO; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -75,11 +77,23 @@ public class AfterSalesShippingDeviceController extends BaseController @Log(title = "出货设备", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(AfterSalesShippingDevice afterSalesShippingDevice) + public AjaxResult export(AfterSalesShippingDevice afterSalesShippingDevice, String ids) { - List list = afterSalesShippingDeviceService.selectAfterSalesShippingDeviceList(afterSalesShippingDevice); - ExcelUtil util = new ExcelUtil(AfterSalesShippingDevice.class); - return util.exportExcel(list, "出货设备数据"); + + + if (org.springframework.util.StringUtils.isEmpty(ids)){ + + List list = afterSalesShippingDeviceService.selectAfterSalesShippingDeviceList(afterSalesShippingDevice); + ExcelUtil util = new ExcelUtil(AfterSalesShippingDevice.class); + return util.exportExcel(list, "出货设备数据"); + }else { + String[] shippingDeviceIds = ids.split(","); + List list = afterSalesShippingDeviceService.selectAfterSalesShippingDeviceListByIds(shippingDeviceIds); + ExcelUtil util = new ExcelUtil(AfterSalesShippingDevice.class); + return util.exportExcel(list, "出货设备数据"); + } + + } /** 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 a2331b29..55366285 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 @@ -43,7 +43,6 @@ public class AfterSalesShippingDevice extends BaseEntity private String materialNo; /** 物料图片 */ - @Excel(name = "物料图片") private String materialPhotourl; /** 物料名称 */ @@ -51,11 +50,9 @@ public class AfterSalesShippingDevice extends BaseEntity private String materialName; /** 物料类型 */ - @Excel(name = "物料类型") private String materialType; /** 物料类别 */ - @Excel(name = "物料类别") private String materialClass; /** 物料型号 */ @@ -83,7 +80,6 @@ public class AfterSalesShippingDevice extends BaseEntity private String deviceRunningNumber; /** 生产图片 */ - @Excel(name = "生产图片") private String makePhotourl; /** SN号 */ @@ -95,7 +91,6 @@ public class AfterSalesShippingDevice extends BaseEntity private String softwareVersion; /** 售后图片地址 */ - @Excel(name = "售后图片地址") private String aftersalesPhotourl; /** 出厂日期 */ @@ -108,7 +103,7 @@ public class AfterSalesShippingDevice extends BaseEntity private String guaranteePeriod; /** 是否过保修期 */ - @Excel(name = "是否过保修期") + @Excel(name = "是否过保修期",dictType = "guarantee_period_flag") private String guaranteePeriodFlag; /** 锁机时间 */ @@ -117,7 +112,7 @@ public class AfterSalesShippingDevice extends BaseEntity private Date lockDate; /** 是否有锁机时间 */ - @Excel(name = "是否有锁机时间") + @Excel(name = "是否有锁机时间", dictType = "lock_date_flag") private String lockDateFlag; /** 损耗品到期时间 */ @@ -126,7 +121,7 @@ public class AfterSalesShippingDevice extends BaseEntity private Date wastageExpireDate; /** 是否过损耗品到期时间 */ - @Excel(name = "是否过损耗品到期时间") + @Excel(name = "是否过损耗品到期时间",dictType = "wastage_expire_flag") private String wastageExpireFlag; /** 二次维修后部件质保时间 */ @@ -135,7 +130,7 @@ public class AfterSalesShippingDevice extends BaseEntity private Date componentGuaranteeDate; /** 是否过二次维修后部件质保日期 */ - @Excel(name = "是否过二次维修后部件质保日期") + @Excel(name = "是否过二次维修后部件质保日期", dictType = "component_guarantee_flag") private String componentGuaranteeFlag; /** 工程员姓名 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AfterSalesShippingDeviceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AfterSalesShippingDeviceMapper.java index 2fb3edc1..6c2d9b1d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AfterSalesShippingDeviceMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AfterSalesShippingDeviceMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.aftersales.mapper; import java.util.List; import com.ruoyi.aftersales.domain.AfterSalesShippingDevice; +import com.ruoyi.warehouse.domain.VO.WarehouseInventoryCheckVO; import org.apache.ibatis.annotations.Param; /** @@ -179,4 +180,9 @@ public interface AfterSalesShippingDeviceMapper /* * 根据sn号查找出货设备信息*/ AfterSalesShippingDevice selectShippingDevicesBySnCode(String snCode); + + /** + * 根据设备id查询出货设备信息 + * */ + List selectAfterSalesShippingDeviceListByIds(String[] shippingDeviceIds); } 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 875d70a4..087136cb 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 @@ -10,6 +10,7 @@ import com.ruoyi.aftersales.domain.vo.SelectDeviceVO; import com.ruoyi.sales.domain.SalesAftersalesNotice; import com.ruoyi.sales.domain.SalesAftersalesNoticeDetail; import com.ruoyi.system.dto.SysEquipDetailDto; +import com.ruoyi.warehouse.domain.VO.WarehouseInventoryCheckVO; /** * 出货设备Service接口 @@ -116,4 +117,9 @@ public interface IAfterSalesShippingDeviceService /* * 根据sn号查找出货设备信息*/ AfterSalesShippingDevice selectShippingDevicesBySnCode(String snCode); + + /** + * 根据设备id查询出货设备信息 + * */ + List selectAfterSalesShippingDeviceListByIds(String[] shippingDeviceIds); } 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 54178645..cda19dde 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 @@ -19,6 +19,7 @@ import com.ruoyi.sales.mapper.SalesAftersalesNoticeDetailMapper; import com.ruoyi.system.domain.ProcessIssueRecord; import com.ruoyi.system.dto.SysEquipDetailDto; import com.ruoyi.system.mapper.ProcessIssueRecordMapper; +import com.ruoyi.warehouse.domain.VO.WarehouseInventoryCheckVO; import com.ruoyi.warehouse.domain.WarehouseOutOrder; import com.ruoyi.warehouse.mapper.WarehouseOutOrderMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -289,4 +290,12 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD public AfterSalesShippingDevice selectShippingDevicesBySnCode(String snCode){ return afterSalesShippingDeviceMapper.selectShippingDevicesBySnCode(snCode); } + + /** + * 根据设备id查询出货设备信息 + * */ + @Override + public List selectAfterSalesShippingDeviceListByIds(String[] shippingDeviceIds) { + return afterSalesShippingDeviceMapper.selectAfterSalesShippingDeviceListByIds(shippingDeviceIds); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml index d65b3436..7f7d1c90 100644 --- a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml @@ -389,4 +389,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where sn_code = #{snCode} + + \ No newline at end of file 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 879fc762..d93baaba 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html @@ -108,6 +108,13 @@ + + +
@@ -354,6 +361,30 @@ console.log(url); $.modal.open("上传报告",url); } + + // 导出 + function exportExcel() { + var ids = $.table.selectColumns("shippingDeviceId"); + var dataParam = $("#formId").serializeArray(); + + let tipMsg = "确定导出当前所有数据吗?"; + if ($.common.isNotEmpty(ids)) { + tipMsg = `确定导出 ${ids} 数据吗?`; + dataParam.push({ "name": "ids", "value": ids }); + } + $.modal.confirm(tipMsg, function () { + $.modal.loading("正在导出数据，请稍后..."); + $.post( prefix + "/export", dataParam, function (result) { + if (result.code === web_status.SUCCESS) { + window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true; + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); + }); + }); + } + \ No newline at end of file