From 0e420d68f407fde240709ac1800da20b0bb99490 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 16:06:16 +0800
Subject: [PATCH] feat：反审核操作。可以对已审核的订单进行反审核，反审核的时候可以选择作废还是重新生成一条，并记录反审核描述。选择作废的话则不生成新增订单。选择重新生成的话则跳转到新增台账页面对反审核的销售产品进行编辑保存重新生成一条新增的订单。反审核的订单即使是发货了还是可以反审核，并且需要将对应的入库、出库、发货进行作废。
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 5594e78..a1ae852 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -194,6 +194,21 @@
}
/**
+ * 鍙嶅鏍告搷浣�
+ */
+ @Log(title = "閿�鍞彴璐﹀弽瀹℃牳", businessType = BusinessType.UPDATE)
+ @PostMapping("/counterReview")
+ @ApiOperation("鍙嶅鏍告搷浣滐細浣滃簾鎴栭噸鏂扮敓鎴�")
+ public AjaxResult counterReview(@RequestBody CounterReviewDto dto) {
+ List<Long> newLedgerIds = salesLedgerService.counterReview(dto);
+ AjaxResult result = AjaxResult.success("鍙嶅鏍告垚鍔�");
+ if (newLedgerIds != null && !newLedgerIds.isEmpty()) {
+ result.put("newLedgerIds", newLedgerIds);
+ }
+ return result;
+ }
+
+ /**
* 鍒犻櫎閿�鍞彴璐�
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.DELETE)
@@ -342,6 +357,13 @@
return AjaxResult.success();
}
+ @PostMapping("/scanShipApply")
+ @ApiOperation("閿�鍞鍗曟壂鐮�-鍙戣捣鍙戣揣瀹℃壒锛堝～鍐欒溅鐗�/蹇�掋�佸鎵逛汉銆侀檮浠讹紱閫氳繃鍚庤嚜鍔ㄦ墸搴撳瓨骞舵爣璁板凡鍙戣揣锛�")
+ public AjaxResult scanShipApply(@RequestBody SalesScanShipDto dto) {
+ salesLedgerService.scanShipApply(dto);
+ return AjaxResult.success("鍙戣揣瀹℃壒宸插彂璧�");
+ }
+
@PostMapping("/scanOutboundUnqualified")
@ApiOperation("閿�鍞鍗曟壂鐮�-涓嶅悎鏍煎嚭搴�")
public AjaxResult scanOutboundUnqualified(@RequestBody SalesScanInboundDto dto) {
@@ -367,14 +389,14 @@
@ApiOperation("閿�鍞彂璐у巻鍙叉暟鎹鍏�-宸插彂璐у鍏ユā鏉夸笅杞�")
public void shippingImportTemplate(HttpServletResponse response) {
ExcelUtil<SalesShippingImportDto> excelUtil = new ExcelUtil<>(SalesShippingImportDto.class);
- excelUtil.importTemplateExcel(response, "宸插彂璐у鍏ユā鏉夸笅杞�");
+ excelUtil.importTemplateExcel(response, "宸插嚭搴撳鍏ユā鏉夸笅杞�");
}
@PostMapping("/salesHistory/notShippingImportTemplate")
@ApiOperation("閿�鍞彂璐у巻鍙叉暟鎹鍏�-鏈彂璐у鍏ユā鏉夸笅杞�")
public void notShippingImportTemplate(HttpServletResponse response) {
ExcelUtil<SalesNotShippingImportDto> excelUtil = new ExcelUtil<>(SalesNotShippingImportDto.class);
- excelUtil.importTemplateExcel(response, "鏈彂璐у鍏ユā鏉夸笅杞�");
+ excelUtil.importTemplateExcel(response, "鏈嚭搴撳鍏ユā鏉夸笅杞�");
}
}
--
Gitblit v1.9.3