From e9049622e5c75b022adbfea5e0fe09790ca146d6 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 18 九月 2024 15:27:05 +0800
Subject: [PATCH] 标签打印字体样式修改

---
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index c23c3ab..d919d2f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -688,12 +688,33 @@
         JSONObject orderJson = new JSONObject(map);
         String oldOrderId = orderJson.getString("oldOrderId");
         String newOrderId = orderJson.getString("newOrderId");
+        String orderIdType = orderJson.getString("orderIdType");
+
+        Log log = new Log();
+        log.setContent(map.toString());
+        log.setFunction("updateOrderId淇敼璁㈠崟鍙�");
+        log.setOperator(orderJson.getString("creator"));
+
+
         if(!Objects.equals(newOrderId, oldOrderId)){
             if(newOrderId.length()!=10){
                 return "false4";
             }
             if(!newOrderId.substring(2, 10).matches("\\d+")){
                 return "false5";
+            }
+            if(Objects.equals(orderIdType, "day")){
+                if(orderMapper.selectOrderIdDay(oldOrderId)==1){
+                    return "false6";
+                }
+            }else if(Objects.equals(orderIdType, "month")){
+                if(orderMapper.selectOrderIdMonth(oldOrderId)==1){
+                    return "false6";
+                }
+            }else if(Objects.equals(orderIdType, "year")){
+                if(orderMapper.selectOrderIdYear(oldOrderId)==1){
+                    return "false6";
+                }
             }
             String substring = newOrderId.substring(1, 3);
             Integer substringInt = Integer.parseInt(newOrderId.substring(2, 10));
@@ -707,6 +728,7 @@
             if(count1>0 && count2==0){
                 orderMapper.updateOrderId(oldOrderId,newOrderId);
                 saveState= "true";
+                logService.saveLog(log);
             }else if(count1==0){
                 saveState= "false1";
                 ;

--
Gitblit v1.8.0