From 430335585cb5d03bfea6cfd9f771beae98313bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Mon, 16 Dec 2024 15:50:16 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=90=88=E5=B9=B6=E6=93=8D=E4=BD=9C=E6=A0=8F?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEsn=E5=8F=B7=E6=9F=A5=E6=89=BE=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AFmapper=E5=92=8Cservice?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AfterSalesShippingDeviceMapper.java | 4 + .../IAfterSalesShippingDeviceService.java | 4 + .../AfterSalesShippingDeviceServiceImpl.java | 7 ++ .../AfterSalesShippingDeviceMapper.xml | 5 + .../shippingDevice/shippingDevice.html | 114 +++++++++--------- 5 files changed, 75 insertions(+), 59 deletions(-) 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 79c116d7..2fb3edc1 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 @@ -175,4 +175,8 @@ public interface AfterSalesShippingDeviceMapper * 根据物料号查询出货设备信息列表 * */ List selectShippingDevicesByMaterialNo(String materialNo); + + /* + * 根据sn号查找出货设备信息*/ + AfterSalesShippingDevice selectShippingDevicesBySnCode(String snCode); } 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 f1abeedb..875d70a4 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 @@ -112,4 +112,8 @@ public interface IAfterSalesShippingDeviceService * 根据sn号查询出货设备信息列表 * */ List selectShippingDeviceListBySnCode(String[] snCode); + + /* + * 根据sn号查找出货设备信息*/ + AfterSalesShippingDevice selectShippingDevicesBySnCode(String snCode); } 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 3e0bfcb0..54178645 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 @@ -282,4 +282,11 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD public List selectShippingDeviceListBySnCode(String[] snCode) { return afterSalesShippingDeviceMapper.selectShippingDeviceListBySnCodeAndMaterialNo(snCode); } + + /* + * 根据sn号查找出货设备信息*/ + @Override + public AfterSalesShippingDevice selectShippingDevicesBySnCode(String snCode){ + return afterSalesShippingDeviceMapper.selectShippingDevicesBySnCode(snCode); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml index 0d571fdf..d65b3436 100644 --- a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml @@ -384,4 +384,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update aftersales_shipping_device set del_flag = '0' where shipping_device_code = #{shippingDeviceCode} + + \ 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 fbdadd8e..879fc762 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html @@ -157,58 +157,59 @@ align: 'center', field: 'makeNo', }, - { - title: 'SN号', - align: 'center', - field: 'snCode', - }, { title: '料号', align: 'center', field: 'materialNo', }, + { + title: '图片', + align: 'center', + field: 'materialPhotourl', + }, + { + title: '物料名称', + align: 'center', + field: 'materialName', + }, + { + title: '物料类型', + align: 'center', + field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } + }, + { + title: '设备型号', + align: 'center', + field: 'deviceModelCode', + }, + { + title: '描述', + align: 'center', + field: 'materialDescribe', + }, + { + title: '品牌', + align: 'center', + field: 'materialBrand', + }, + { + title: '单位', + align: 'center', + field: 'materialUnit', + }, + { + title: '物料型号', + align: 'center', + field: 'materialModelCode', + }, + { - title: '物料名称', - align: 'center', - field: 'materialName', - }, - { - title: '图片', - align: 'center', - field: 'materialPhotourl', - }, - { - title: '物料类型', - align: 'center', - field: 'materialType', - formatter: function(value, row, index) { - return $.table.selectCategoryLabel(materialTypeDatas, value); - } - }, - { - title: '型号', - align: 'center', - field: 'materialModelCode', - }, - { - title: '单位', - align: 'center', - field: 'materialUnit', - }, - { - title: '品牌', - align: 'center', - field: 'materialBrand', - }, - { - title: '描述', - align: 'center', - field: 'materialDescribe', - }, - { - title: '设备型号', + title: 'SN号', align: 'center', - field: 'deviceModelCode', + field: 'snCode', }, { title: '追踪码', @@ -225,22 +226,16 @@ align: 'center', field: 'endMakeTime', }, - { - title: '生产图片', - align: 'center', - field: 'makePhotourl', - }, - - { - title: '售后图片', - align: 'center', - field: 'aftersalesPhotourl', - }, { title: '出厂日期', align: 'center', field: 'factoryDate', }, + // { + // title: '软件版本', + // align: 'center', + // field: 'factoryDate', + // }, { title: '保修期', align: 'center', @@ -341,9 +336,10 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('详情 '); - return actions.join(''); + actions.push('编辑 '); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] };