From d862bef4262f290aa9f5fd646837f7deea9c7006 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 13 四月 2026 16:29:08 +0800
Subject: [PATCH] fix(order): 修复订单编号生成中的字段名不一致问题

---
 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java             |    2 +-
 src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java |    2 +-
 src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java                 |    2 +-
 src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java               |    2 +-
 src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java               |    2 +-
 src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java                    |    2 +-
 src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java                |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 9e74e2a..fea90a2 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -99,7 +99,7 @@
 //        String approveID = today + formattedCount;
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         ApproveProcess approveProcess = new ApproveProcess();
-        String no = OrderUtils.countTodayByCreateTime(approveProcessMapper, "SP","approveId");
+        String no = OrderUtils.countTodayByCreateTime(approveProcessMapper, "SP","approve_id");
         approveProcess.setApproveId(no);
         approveProcess.setApproveUser(approveProcessVO.getApproveUser());
         approveProcess.setApproveUserName(sysUser.getNickName());
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
index 151b965..edb70f9 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
@@ -72,7 +72,7 @@
 
     @Override
     public boolean addReturnManagementDto(ReturnManagementDto returnManagementDto) {
-        String rt = OrderUtils.countTodayByCreateTime(returnManagementMapper, "RT","returnNo");
+        String rt = OrderUtils.countTodayByCreateTime(returnManagementMapper, "RT","return_no");
         returnManagementDto.setReturnNo(rt);
         save(returnManagementDto);
         for (ReturnSaleProduct returnSaleProduct : returnManagementDto.getReturnSaleProducts()) {
diff --git a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
index 8318580..dabd7ac 100644
--- a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
+++ b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
@@ -43,7 +43,7 @@
     @ApiOperation("娣诲姞鏀粯涓庡彂璐т俊鎭�")
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult add(@RequestBody PaymentShipping paymentShipping) {
-        String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","orderNo");
+        String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","order_no");
         paymentShipping.setOrderNo(ord);
         boolean save = paymentShippingService.save(paymentShipping);
         return save ? success() : error();
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index bd73a67..eed5ffa 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -74,7 +74,7 @@
     @Log(title = "鍙戣揣淇℃伅绠$悊", businessType = BusinessType.INSERT)
     public AjaxResult add(@RequestBody ShippingInfoDto req) throws Exception {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH","shippingNo");
+        String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH","shipping_no");
         // 鍙戣揣瀹℃壒
         ApproveProcessVO approveProcessVO = new ApproveProcessVO();
         approveProcessVO.setApproveType(7);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
index ce3358e..8872e88 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
@@ -63,7 +63,7 @@
         LoginUser loginUser = SecurityUtils.getLoginUser();
         SalesQuotation salesQuotation = new SalesQuotation();
         BeanUtils.copyProperties(salesQuotationDto, salesQuotation);
-        String quotationNo = OrderUtils.countTodayByCreateTime(salesQuotationMapper, "QT","quotationNo");
+        String quotationNo = OrderUtils.countTodayByCreateTime(salesQuotationMapper, "QT","quotation_no");
         salesQuotation.setQuotationNo(quotationNo);
         salesQuotation.setStatus("寰呭鎵�");
         salesQuotationMapper.insert(salesQuotation);
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
index 4f96ff5..15e3e39 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -46,7 +46,7 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int add(StockInRecordDto stockInRecordDto) {
-        String no = OrderUtils.countTodayByCreateTime(stockInRecordMapper, "RK","inboundBatches");
+        String no = OrderUtils.countTodayByCreateTime(stockInRecordMapper, "RK","inbound_batches");
         stockInRecordDto.setInboundBatches(no);
         StockInRecord stockInRecord = new StockInRecord();
         BeanUtils.copyProperties(stockInRecordDto, stockInRecord);
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
index 99cc760..f0b3c84 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
@@ -51,7 +51,7 @@
 
     @Override
     public int add(StockOutRecordDto stockOutRecordDto) {
-        String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK","outboundBatches");
+        String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK","outbound_batches");
         stockOutRecordDto.setOutboundBatches(no);
         StockInRecord stockInRecord = new StockInRecord();
         BeanUtils.copyProperties(stockOutRecordDto, stockInRecord);

--
Gitblit v1.9.3