From 3ea2b755afa469a20afd47e82ae5a1e41360fe9e Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 22 Jul 2024 17:40:53 +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=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E5=8D=95=E6=B4=BE=E5=8D=95=E5=89=8D=E7=AB=AF=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=B4=BE?= =?UTF-8?q?=E5=8D=95=E5=89=8D=E7=AB=AF=E5=AE=A2=E6=88=B7=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E5=87=BA=E5=8F=91=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E=E5=8D=95=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=89=8D=E7=AB=AF=E5=AE=A2=E6=88=B7=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E5=87=BA=E5=8F=91=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=89=8D=E7=AB=AF=E5=AE=A2=E6=88=B7=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E5=87=BA=E5=8F=91=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AftersalesOrderController.java | 6 +-- .../IAfterSalesShippingDeviceService.java | 4 +- .../AfterSalesShippingDeviceServiceImpl.java | 31 +++++---------- .../aftersales/aftersalesOrder/detail.html | 38 +++++++++---------- .../aftersalesOrder/sendOrders.html | 30 +++++++-------- .../aftersalesOrder/uploadReport.html | 28 +++++++------- 6 files changed, 61 insertions(+), 76 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java index 1ee033c5..1b474d7d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java @@ -6,6 +6,7 @@ import com.ruoyi.aftersales.domain.vo.SelectDeviceVO; import com.ruoyi.aftersales.service.IAfterSalesShippingDeviceService; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.process.general.service.IProcessService; +import com.ruoyi.sales.domain.SalesAftersalesNoticeDetail; import com.ruoyi.system.service.ISysUserService; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; @@ -200,15 +201,14 @@ public class AftersalesOrderController extends BaseController /** - * 查询选择设备列表 + * 查询售后通知单详情选择设备列表 */ @PostMapping("/optionDevices") @ResponseBody public TableDataInfo optionDevices(AftersalesOrder aftersalesOrder) { - startPage(); - List list = afterSalesShippingDeviceService.selectOptionDevices(aftersalesOrder.getMakeNo()); + List list = afterSalesShippingDeviceService.selectOptionDevices(aftersalesOrder.getAftersalesOrderCode()); return getDataTable(list); } 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 131d382d..a8ebd7b3 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 @@ -7,6 +7,8 @@ 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; +import com.ruoyi.sales.domain.SalesAftersalesNotice; +import com.ruoyi.sales.domain.SalesAftersalesNoticeDetail; import com.ruoyi.system.dto.SysEquipDetailDto; /** @@ -93,7 +95,7 @@ public interface IAfterSalesShippingDeviceService * @param makeNo 生产单号 * @return */ - List selectOptionDevices(String makeNo); + List selectOptionDevices(String aftersalesOrderCode); /* 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 440c3d55..6ee1932f 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 @@ -13,6 +13,9 @@ import com.ruoyi.aftersales.mapper.AftersalesComplaintNoticeMapper; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.StringUtils; +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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -38,6 +41,9 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD @Autowired private AftersalesComplaintNoticeMapper aftersalesComplaintNoticeMapper; + @Autowired + private SalesAftersalesNoticeDetailMapper aftersalesNoticeDetailMapper; + /** * 查询出货设备 * @@ -197,28 +203,9 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD * 查询选择设备列表 * */ @Override - public List selectOptionDevices(String makeNo) { - List selectDeviceVos = new ArrayList<>(); - SelectDeviceVO selectDeviceVo = new SelectDeviceVO(); - AfterSalesShippingDevice afterSalesShippingDevice = afterSalesShippingDeviceMapper.selectShippingDeviceByMakeNo(makeNo); - if (StringUtils.isNotNull(afterSalesShippingDevice)){ - selectDeviceVo.setMaterialNo(afterSalesShippingDevice.getMaterialNo()); - selectDeviceVo.setMaterialPhotourl(afterSalesShippingDevice.getMaterialPhotourl()); - selectDeviceVo.setMaterialName(afterSalesShippingDevice.getMaterialName()); - selectDeviceVo.setMaterialType(afterSalesShippingDevice.getMaterialType()); - selectDeviceVo.setMaterialUnit(afterSalesShippingDevice.getMaterialUnit()); - selectDeviceVo.setMaterialBrand(afterSalesShippingDevice.getMaterialBrand()); - selectDeviceVo.setMaterialDescribe(afterSalesShippingDevice.getMaterialDescribe()); - selectDeviceVo.setSnCode(afterSalesShippingDevice.getSnCode()); - } - - AftersalesComplaintNotice aftersalesComplaintNotice = aftersalesComplaintNoticeMapper.selectComplaintNoticeByMakeNo(makeNo); - if (StringUtils.isNotNull(aftersalesComplaintNotice)){ - selectDeviceVo.setComplaintProblem(aftersalesComplaintNotice.getRemark()); - } - - selectDeviceVos.add(selectDeviceVo); - return selectDeviceVos; + public List selectOptionDevices(String aftersalesOrderCode) { + List salesAftersalesNoticeDetails = aftersalesNoticeDetailMapper.selectSalesAftersalesNoticeDetailListByCode(aftersalesOrderCode); + return salesAftersalesNoticeDetails; } /* diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html index 110055bc..fe678fd5 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html @@ -54,10 +54,10 @@
- +
- +
@@ -257,11 +257,6 @@ columns: [{ checkbox: true }, - { - title: '出货设备编号', - field: 'shippingDeviceCode', - visible: false - }, { title: '料号', field: 'materialNo', @@ -291,20 +286,23 @@ field: 'materialDescribe', }, { - title: '流水号', - field: 'deviceRunningNumber', + title: '已出库数量', + field: 'shippedGoodsSum', }, { - title: '生产图片', - field: 'makePhotourl', + title: '设备SN', + field: 'snCode', }, { - title: 'SN号', - field: 'snCode', + title: '售后问题', + field: 'aftersalesProblem', }, { - title: '售后图片', - field: 'aftersalesPhotourl', + title: '紧急程度', + field: 'emergencyDegree', + formatter: function(value, row, index) { + return $.table.selectDictLabel(emergencyDegreeDatas, value); + } }, ] }; @@ -324,11 +322,11 @@ } } - // $("input[name='startDate']").datetimepicker({ - // format: "yyyy-mm-dd", - // minView: "month", - // autoclose: true - // }); + $("input[name='startDate']").datetimepicker({ + format: "yyyy-mm-dd", + minView: "month", + autoclose: true + }); $(function() { var options = { url: prefix + "/optionDevices", diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/sendOrders.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/sendOrders.html index c566658a..e88a1415 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/sendOrders.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/sendOrders.html @@ -52,14 +52,15 @@
- +
- +
+
@@ -109,6 +110,7 @@ autoclose: true }); + $(function() { $('.summernote').each(function(i) { $('#' + this.id).summernote({ @@ -160,11 +162,6 @@ columns: [{ checkbox: true }, - { - title: '出货设备编号', - field: 'shippingDeviceCode', - visible: false - }, { title: '料号', field: 'materialNo', @@ -194,20 +191,23 @@ field: 'materialDescribe', }, { - title: '流水号', - field: 'deviceRunningNumber', + title: '已出库数量', + field: 'shippedGoodsSum', }, { - title: '生产图片', - field: 'makePhotourl', + title: '设备SN', + field: 'snCode', }, { - title: 'SN号', - field: 'snCode', + title: '售后问题', + field: 'aftersalesProblem', }, { - title: '售后图片', - field: 'aftersalesPhotourl', + title: '紧急程度', + field: 'emergencyDegree', + formatter: function(value, row, index) { + return $.table.selectDictLabel(emergencyDegreeDatas, value); + } }, ] }; diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/uploadReport.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/uploadReport.html index 8165cb9c..5d37a083 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/uploadReport.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/uploadReport.html @@ -54,10 +54,10 @@
- +
- +
@@ -202,11 +202,6 @@ columns: [{ checkbox: true }, - { - title: '出货设备编号', - field: 'shippingDeviceCode', - visible: false - }, { title: '料号', field: 'materialNo', @@ -236,20 +231,23 @@ field: 'materialDescribe', }, { - title: '流水号', - field: 'deviceRunningNumber', + title: '已出库数量', + field: 'shippedGoodsSum', }, { - title: '生产图片', - field: 'makePhotourl', + title: '设备SN', + field: 'snCode', }, { - title: 'SN号', - field: 'snCode', + title: '售后问题', + field: 'aftersalesProblem', }, { - title: '售后图片', - field: 'aftersalesPhotourl', + title: '紧急程度', + field: 'emergencyDegree', + formatter: function(value, row, index) { + return $.table.selectDictLabel(emergencyDegreeDatas, value); + } }, ] };