From 5d86ec1476cd869de3d2aa7b4d795f9a0bf18b3d Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 19 Jul 2024 18:49:22 +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=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=89=8D=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=20=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=AD=90=E8=A1=A8=E7=9A=84=E8=AE=BE=E5=A4=87=E5=B1=A5?= =?UTF-8?q?=E5=8E=86=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=92=8C=E7=94=9F=E4=BA=A7=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA=E7=89=A9=E6=96=99=E5=AD=90?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E8=AE=BE=E5=A4=87=E5=B1=A5=E5=8E=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E7=94=B1=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=89=A9=E6=96=99=E5=8F=B7=E6=94=B9=E6=88=90=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=89=A9=E6=96=99=E5=8F=B7=E3=80=81=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E3=80=81=E7=94=9F=E4=BA=A7=E5=8D=95?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AftersalesWarehouseOutController.java | 6 ++++-- .../aftersales/service/IAftersalesWarehouseOutService.java | 2 +- .../service/impl/AftersalesWarehouseOutServiceImpl.java | 6 ++++-- .../warehouseOutOrder/maintenanceEquipmentOne.html | 4 +++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java index c7c006b1..13151c2f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesWarehouseOutController.java @@ -260,11 +260,13 @@ public class AftersalesWarehouseOutController extends BaseController */ @PostMapping("/showAftersalesShippingDeviceListOne") @ResponseBody - public TableDataInfo showAftersalesShippingDeviceListOne(@RequestParam("materialNo") String materialNo) + public TableDataInfo showAftersalesShippingDeviceListOne(@RequestParam("materialNo") String materialNo, + @RequestParam("salesOrderCode") String salesOrderCode, + @RequestParam("makeNo") String makeNo) { startPage(); - List list = warehouseOutOrderService.showAftersalesShippingDeviceList(materialNo); + List list = warehouseOutOrderService.showAftersalesShippingDeviceList(materialNo,salesOrderCode,makeNo); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java index 32fb8a6f..98795dfc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesWarehouseOutService.java @@ -123,7 +123,7 @@ public interface IAftersalesWarehouseOutService /** * 展示售后第一次维护设备料号已选择添加出货设备的相关出货设备信息 * */ - List showAftersalesShippingDeviceList(String materialNo); + List showAftersalesShippingDeviceList(String materialNo,String salesOrderCode,String makeNo); /** * 修改保存售后第一次维护设备 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesWarehouseOutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesWarehouseOutServiceImpl.java index 4c05cc7a..35baf057 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesWarehouseOutServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesWarehouseOutServiceImpl.java @@ -229,12 +229,14 @@ public class AftersalesWarehouseOutServiceImpl implements IAftersalesWarehouseOu * 展示售后第一次维护设备料号已选择添加出货设备的相关出货设备信息 * */ @Override - public List showAftersalesShippingDeviceList(String materialNo) { + public List showAftersalesShippingDeviceList(String materialNo,String salesOrderCode,String makeNo) { List selectShippingDeviceVOs = new ArrayList<>(); AfterSalesShippingDevice afterSalesShippingDevice = new AfterSalesShippingDevice(); afterSalesShippingDevice.setMaterialNo(materialNo); - List afterSalesShippingDevices = shippingDeviceMapper.selectShippingDeviceListByMaterialNo(afterSalesShippingDevice); + afterSalesShippingDevice.setSalesOrderCode(salesOrderCode); + afterSalesShippingDevice.setMakeNo(makeNo); + List afterSalesShippingDevices = shippingDeviceMapper.selectAfterSalesShippingDeviceByNoAndCode(afterSalesShippingDevice); List filterAfterSalesShippingDevices = afterSalesShippingDevices.stream().filter(shippingDevice -> "0".equals(shippingDevice.getAddShippingDeviceFlag())).collect(Collectors.toList()); if (!StringUtils.isNotEmpty(filterAfterSalesShippingDevices)) { // 记录日志 diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html index 1db56a09..ab79c843 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentOne.html @@ -244,7 +244,9 @@ contentType: "application/x-www-form-urlencoded", queryParams : { // salesOrderCode: warehouseOutOrder.salesOrderCode, - materialNo: parentRow.materialNo + materialNo: parentRow.materialNo, + salesOrderCode:warehouseOutOrder.salesOrderCode, + makeNo:warehouseOutOrder.makeNo }, columns: [ {