From 3a959165d6da7c3515f54c4d3f7178bb5876fb84 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Sat, 20 Jul 2024 09:38:32 +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=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=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=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E5=92=8C=E7=94=9F=E4=BA=A7=E5=8D=95=E5=8F=B7=E4=BD=9C=E4=B8=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=89=A9=E6=96=99=E5=AD=90=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B1=A5=E5=8E=86=E6=95=B0=E6=8D=AE=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3=E7=94=B1=E5=85=B3=E8=81=94=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=8F=B7=E6=94=B9=E6=88=90=E5=85=B3=E8=81=94=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=8F=B7=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E3=80=81=E7=94=9F=E4=BA=A7=E5=8D=95=E5=8F=B7=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E5=8D=95=E5=87=BA=E5=BA=93?= =?UTF-8?q?=20=E5=B1=95=E7=A4=BA=E8=AE=BE=E5=A4=87=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=AD=90=E8=A1=A8=E7=9A=84=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=B1=A5=E5=8E=86=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E5=8F=B7=E5=92=8C=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E4=BD=9C=E4=B8=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=20=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=AD=90=E8=A1=A8=E7=9A=84=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=B1=A5=E5=8E=86=E6=95=B0=E6=8D=AE=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=94=B1=E5=85=B3=E8=81=94=E7=89=A9=E6=96=99=E5=8F=B7?= =?UTF-8?q?=E6=94=B9=E6=88=90=E5=85=B3=E8=81=94=E7=89=A9=E6=96=99=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95=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 ++++-- .../warehouse/controller/WarehouseOutOrderController.java | 6 ++++-- .../warehouseOutOrder/maintenanceEquipmentTwo.html | 4 +++- .../warehouse/warehouseOutOrder/salesOutWarehouse.html | 2 ++ 6 files changed, 18 insertions(+), 8 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 13151c2f..82c61f14 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 @@ -374,11 +374,13 @@ public class AftersalesWarehouseOutController extends BaseController */ @PostMapping("/showAftersalesShippingDeviceListTwo") @ResponseBody - public TableDataInfo showAftersalesShippingDeviceListTwo(@RequestParam("materialNo") String materialNo) + public TableDataInfo showAftersalesShippingDeviceListTwo(@RequestParam("materialNo") String materialNo, + @RequestParam("salesOrderCode") String salesOrderCode, + @RequestParam("makeNo") String makeNo) { startPage(); - List list = warehouseOutOrderService.showAftersalesShippingDeviceListTwo(materialNo); + List list = warehouseOutOrderService.showAftersalesShippingDeviceListTwo(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 98795dfc..f2e99701 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 @@ -134,7 +134,7 @@ public interface IAftersalesWarehouseOutService /** * 展示售后第二次维护设备料号已选择添加出货设备的相关出货设备信息 */ - List showAftersalesShippingDeviceListTwo(String materialNo); + List showAftersalesShippingDeviceListTwo(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 35baf057..12352ef4 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 @@ -302,12 +302,14 @@ public class AftersalesWarehouseOutServiceImpl implements IAftersalesWarehouseOu * 展示售后第二次维护设备料号已选择添加出货设备的相关出货设备信息 */ @Override - public List showAftersalesShippingDeviceListTwo(String materialNo) { + public List showAftersalesShippingDeviceListTwo(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/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java index 130a7a03..1c1d2cf3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java @@ -237,10 +237,12 @@ public class WarehouseOutOrderController extends BaseController */ @PostMapping("/getShippingDeviceList") @ResponseBody - public TableDataInfo getShippingDeviceList(@RequestParam("materialNo") String materialNo) + public TableDataInfo getShippingDeviceList(@RequestParam("materialNo") String materialNo, + @RequestParam("salesOrderCode") String salesOrderCode, + @RequestParam("makeNo") String makeNo) { startPage(); - List list = aftersalesWarehouseOutService.showAftersalesShippingDeviceListTwo(materialNo); + List list = aftersalesWarehouseOutService.showAftersalesShippingDeviceListTwo(materialNo,salesOrderCode,makeNo); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentTwo.html b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentTwo.html index e1f67e66..6a0cbe54 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentTwo.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/warehouseOutOrder/maintenanceEquipmentTwo.html @@ -252,7 +252,9 @@ contentType: "application/x-www-form-urlencoded", queryParams : { // salesOrderCode: warehouseOutOrder.salesOrderCode, - materialNo: parentRow.materialNo + materialNo: parentRow.materialNo, + salesOrderCode:warehouseOutOrder.salesOrderCode, + makeNo:warehouseOutOrder.makeNo }, columns: [ { diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html index 55513cc8..cb12ce9b 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html @@ -267,6 +267,8 @@ contentType: "application/x-www-form-urlencoded", queryParams : { materialNo: row.materialNo, + salesOrderCode:warehouseOutOrder.salesOrderCode, + makeNo:warehouseOutOrder.makeNo }, columns: [ {