From 9696d09b4a3ccfe507642a9f4a16d7a450b60ba8 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 4 Jun 2024 09:24:01 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E9=80=80=E6=8D=A2=E8=B4=A7=20=E6=96=B0=E5=A2=9E=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=94=B6=E8=B4=A7-=E5=85=A5=E5=BA=93=E5=89=8D?= =?UTF-8?q?=E5=90=8E=E9=80=80=E8=B4=A7afterConfirmDelivery.html=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=20=E6=96=B0=E5=A2=9E=20=E7=A1=AE=E8=AE=A4=E6=94=B6?= =?UTF-8?q?=E8=B4=A7-=E5=85=A5=E5=BA=93=E5=90=8E=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E6=8C=89=E9=92=AE=20=E6=96=B0=E5=A2=9E=20=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=94=B6=E8=B4=A7-=E5=85=A5=E5=BA=93=E5=90=8E=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7-=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=90=8E=E9=80=80=E8=B4=A7=E4=BF=AE=E6=94=B9=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualityRefundsExchangesController.java | 27 +- .../afterConfirmDelivery.html | 275 ++++++++++++++++++ .../refundsExchanges/refundsExchanges.html | 10 +- 3 files changed, 309 insertions(+), 3 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterConfirmDelivery.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityRefundsExchangesController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityRefundsExchangesController.java index b2ab02be..770b6054 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityRefundsExchangesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityRefundsExchangesController.java @@ -389,7 +389,7 @@ public class QualityRefundsExchangesController extends BaseController /** - * 入库前退货-确认供应商 + * 入库前退货-确认收货 */ @GetMapping("/beforeConfirmDelivery/{refundsExchangesId}") public String beforeConfirmDelivery(@PathVariable("refundsExchangesId") Long refundsExchangesId, ModelMap mmap) @@ -400,7 +400,7 @@ public class QualityRefundsExchangesController extends BaseController } /** - * 保存入库前退货-确认供应商 + * 保存入库前退货-确认收货 */ @RequiresPermissions("quality:refundsExchanges:beforeConfirmDelivery") @Log(title = "品质管理退换货单", businessType = BusinessType.UPDATE) @@ -412,4 +412,27 @@ public class QualityRefundsExchangesController extends BaseController } + /** + * 入库后退货-确认收货 + */ + @GetMapping("/afterConfirmDelivery/{refundsExchangesId}") + public String afterConfirmDelivery(@PathVariable("refundsExchangesId") Long refundsExchangesId, ModelMap mmap) + { + QualityRefundsExchanges qualityRefundsExchanges = qualityRefundsExchangesService.selectQualityRefundsExchangesById(refundsExchangesId); + mmap.put("qualityRefundsExchanges", qualityRefundsExchanges); + return prefix + "/afterConfirmDelivery"; + } + + /** + * 保存入库后退货-确认收货 + */ + @RequiresPermissions("quality:refundsExchanges:afterConfirmDelivery") + @Log(title = "品质管理退换货单", businessType = BusinessType.UPDATE) + @PostMapping("/afterConfirmDelivery") + @ResponseBody + public AjaxResult afterConfirmDeliverySave(@RequestBody QualityRefundsExchanges qualityRefundsExchanges) + { + return toAjax(qualityRefundsExchangesService.updateBeforeConfirmDelivery(qualityRefundsExchanges)); + } + } diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterConfirmDelivery.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterConfirmDelivery.html new file mode 100644 index 00000000..6c64b32a --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterConfirmDelivery.html @@ -0,0 +1,275 @@ + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html index d04d0220..71880fcc 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html +++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html @@ -88,7 +88,7 @@ var afterNoConfirmSupplierFlag = [[${@permission.hasPermi('quality:refundsExchanges:afterNoConfirmSupplier')}]]; var beforeConfirmDeliveryFlag = [[${@permission.hasPermi('quality:refundsExchanges:beforeConfirmDelivery')}]]; - + var afterConfirmDeliveryFlag = [[${@permission.hasPermi('quality:refundsExchanges:afterConfirmDelivery')}]]; var refundsExchangesStatusDatas = [[${@dict.getType('refunds_exchanges_status')}]]; var qualityWarehouseStatusDatas = [[${@dict.getType('quality_warehouse_status')}]]; @@ -214,6 +214,8 @@ /*入库后退货-确认供应商-没有供应商*/ if (row.qualityReturnNode == 1){ actions.push('确认供应商 '); + actions.push('确认收货 '); + } @@ -283,6 +285,12 @@ $.modal.open("确认收货",url); } + /*入库后退货-确认收货*/ + function afterConfirmDelivery(refundsExchangesId){ + var url = ctx + 'quality/refundsExchanges/afterConfirmDelivery/' + refundsExchangesId; + $.modal.open("确认收货",url); + } + \ No newline at end of file