fix 编码生成

wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java

@@ -15,6 +15,8 @@ import org.nl.wql.util.WqlUtil;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -77,7 +79,8 @@ public class GenCodeServiceImpl implements GenCodeService {
     }
 
     @Override
-    public synchronized String codeDemo(Map form) {
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public String codeDemo(Map form) {
         String code = (String) form.get("code");
         String id = this.queryIdByCode(code);
         //如果flag=1就执行更新数据库的操作
@@ -248,4 +251,79 @@ public class GenCodeServiceImpl implements GenCodeService {
         return id;
     }
 
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public String taskCode(Map form) {
+        String code = (String) form.get("code");
+        String id = this.queryIdByCode(code);
+        //如果flag=1就执行更新数据库的操作
+        String flag = (String) form.get("flag");
+        WQLObject wo = WQLObject.getWQLObject("sys_code_rule_detail");
+        JSONArray ja = wo.query("code_rule_id = '" + id + "'", " sort_num,type").getResultJSONArray(0);
+        String demo = "";
+        boolean is_same = true;
+        for (int i = 0; i < ja.size(); i++) {
+            String value = "";
+            JSONObject jo = ja.getJSONObject(i);
+            //固定直接取值
+            if (jo.getString("type").equals("01")) {
+                value = jo.getString("init_value");
+            }
+            //日期判断数据库的值与当前值是否相同来决定顺序的值
+            if (jo.getString("type").equals("02")) {
+                String current_value = jo.getString("current_value");
+                Date date = DateUtil.date();
+                String format = jo.getString("format");
+                String now_date = DateUtil.format(date, format);
+                if (!now_date.equals(current_value)) {
+                    is_same = false;
+                }
+                if (flag.equals("1")) {
+                    jo.put("init_value", now_date);
+                    jo.put("current_value", now_date);
+                }
+                value = now_date;
+            }
+            //顺序的值：如果日期一样就+步长，等于最大值就归为初始值；日期不一样就归为初始值
+            if (jo.getString("type").equals("03")) {
+                String num_value = "";
+                int step = jo.getInteger("step");
+                Long max_value = jo.getLong("max_value");
+                if (!is_same || (jo.getLongValue("current_value") + step > max_value)) {
+                    num_value = jo.getString("init_value");
+                } else {
+                    num_value = (jo.getInteger("current_value") + step) + "";
+                }
+                int size = num_value.length();
+                int length = jo.getInteger("length");
+                String fillchar = jo.getString("fillchar");
+                for (int m = 0; m < (length - size); m++) {
+                    value += fillchar;
+                }
+                value += num_value;
+                if (flag.equals("1")) {
+                    if (!is_same) {
+                        int init_value = jo.getInteger("init_value");
+                        if (StrUtil.isEmpty((init_value + ""))) {
+                            throw new BadRequestException("请完善编码数值的初始值！");
+                        }
+                        jo.put("current_value", init_value + "");
+                    } else {
+                        int num_curr = jo.getInteger("current_value");
+                        if (num_curr >= max_value) {
+                            num_curr = jo.getInteger("init_value");
+                            jo.put("current_value", num_curr + "");
+                        }else{
+                            jo.put("current_value", (num_curr + step) + "");
+                        }
+                    }
+                }
+            }
+            demo += value;
+            if (flag.equals("1")) {
+                wo.update(jo);
+            }
+        }
+        return demo;
+    }
+
 }

wms/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java

@@ -2,19 +2,24 @@ package org.nl.modules.system.util;
 
 import org.nl.modules.system.service.GenCodeService;
 import org.nl.modules.system.service.impl.GenCodeServiceImpl;
+import org.nl.utils.SpringContextHolder;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 import java.util.List;
 
 public class CodeUtil {
 
-    public static synchronized String getNewCode(String ruleCode) {
+    public static String getNewCode(String ruleCode) {
-        GenCodeService service = new GenCodeServiceImpl();
+        synchronized (ruleCode){
         String flag = "1";
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", flag);
         map.put("code", ruleCode);
-        return service.codeDemo(map);
+        GenCodeServiceImpl service = SpringContextHolder.getBean(GenCodeServiceImpl.class);
+        return service.taskCode(map);
+        }
     }
 
     public static synchronized List<String> getNewCodes(String ruleCode, Integer number) {