From 4b6ed9aec826d49abc239f8d768bfecb91eceabc Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 26 五月 2025 10:36:01 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after
---
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index 0607f3b..afb3ee2 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -7,7 +7,9 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
+import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.purchase.pojo.TicketRegistration;
+import com.ruoyi.purchase.service.IProductRecordService;
import com.ruoyi.purchase.service.ITicketRegistrationService;
import com.ruoyi.sales.service.ICommonFileService;
import lombok.AllArgsConstructor;
@@ -20,7 +22,7 @@
/**
* 鏉ョエ鐧昏Controller
- *
+ *
* @author ruoyi
* @date 2025-05-13
*/
@@ -33,12 +35,13 @@
private ICommonFileService commonFileService;
+ private IProductRecordService productRecordService;
+
/**
* 鏌ヨ鏉ョエ鐧昏鍒楄〃
*/
@GetMapping("/list")
- public TableDataInfo list(TicketRegistration ticketRegistration)
- {
+ public TableDataInfo list(TicketRegistration ticketRegistration) {
startPage();
List<TicketRegistration> list = ticketRegistrationService.selectTicketRegistrationList(ticketRegistration);
return getDataTable(list);
@@ -49,8 +52,7 @@
*/
@Log(title = "鏉ョエ鐧昏", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, TicketRegistration ticketRegistration)
- {
+ public void export(HttpServletResponse response, TicketRegistration ticketRegistration) {
List<TicketRegistration> list = ticketRegistrationService.selectTicketRegistrationList(ticketRegistration);
ExcelUtil<TicketRegistration> util = new ExcelUtil<TicketRegistration>(TicketRegistration.class);
util.exportExcel(response, list, "鏉ョエ鐧昏鏁版嵁");
@@ -68,7 +70,7 @@
* 鏂板淇敼鏉ョエ鐧昏
*/
@Log(title = "鏉ョエ鐧昏", businessType = BusinessType.INSERT)
- @PostMapping ("/addOrUpdateRegistration")
+ @PostMapping("/addOrUpdateRegistration")
public AjaxResult addOrUpdateRegistration(@RequestBody TicketRegistrationDto ticketRegistrationDto) throws IOException {
return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto));
}
@@ -77,9 +79,8 @@
* 鍒犻櫎鏉ョエ鐧昏
*/
@Log(title = "鏉ョエ鐧昏", businessType = BusinessType.DELETE)
- @DeleteMapping("/delRegistration")
- public AjaxResult delRegistration(@RequestBody Long[] ids)
- {
+ @DeleteMapping("/delRegistration")
+ public AjaxResult delRegistration(@RequestBody Long[] ids) {
return toAjax(ticketRegistrationService.delRegistration(ids));
}
@@ -92,4 +93,20 @@
}
}
+ /**
+ * 鏌ヨ浜у搧淇℃伅寮�绁ㄨ褰曞垪琛�
+ */
+ @GetMapping("/productRecordList")
+ public List<ProductRecord> productRecordList(TicketRegistrationDto ticketRegistrationDto) {
+ List<ProductRecord> list = productRecordService.selectProductRecordList(ticketRegistrationDto);
+ return list;
+ }
+
+ /**
+ * 鏌ヨ鍙戠エ鍙�
+ */
+ @GetMapping("/getTicketNo")
+ public AjaxResult getTicketNo(TicketRegistrationDto ticketRegistrationDto) {
+ return AjaxResult.success(ticketRegistrationService.getTicketNo(ticketRegistrationDto));
+ }
}
--
Gitblit v1.9.3