Ver código fonte

fix:优化代码

qingwudarao 6 meses atrás
pai
commit
81f8276478

+ 3 - 1
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/OrderNumberGenerator.java

@@ -31,6 +31,7 @@ public class OrderNumberGenerator {
      * @return 生成的订单号为字符串。
      */
     public synchronized String generateOrderNumber(String name) {
+        StringBuilder stringBuilder = new StringBuilder();
         LocalDate today = LocalDate.now();
         String datePart = today.format(DATE_FORMATTER);
 
@@ -41,7 +42,8 @@ public class OrderNumberGenerator {
         // 通过在计数器对象上同步来确保线程安全
         synchronized (counter) {
             int count = counter.incrementAndGet();
-            return String.format(name, datePart, count);
+            stringBuilder.append(name).append(datePart).append(count);
+            return stringBuilder.toString();
         }
     }
 

+ 1 - 1
ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/OrderListBo.java

@@ -23,7 +23,7 @@ public class OrderListBo {
     private Long daHuoNumberId;
 
     /**
-     * 工名称
+     * 工名称
      */
     private String garmentFactory;
 

+ 0 - 5
ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/UserOrderMapper.java

@@ -10,9 +10,4 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 @Mapper
 public interface UserOrderMapper extends BaseMapperPlus<UserOrder, UserOrderVo> {
-    /**
-     * 查询最后一条订单id
-     * @return 订单id
-     */
-    Long selectLastId();
 }

+ 7 - 3
ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/BulkOrderManagementServiceImpl.java

@@ -32,6 +32,11 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
     private final UserOrderMapper userOrderMapper;
     private final UserOrderTemplateMapper userOrderTemplateMapper;
 
+    /**
+     * 新增生产订单
+     * @param newBulkOrderBo 生产订单的BO对象
+     * @return 添加结果
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertBulkOrder(NewBulkOrderBo newBulkOrderBo) {
@@ -57,7 +62,6 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
 
                 if (null != orderList.getTemplateList()){
                     userOrderTemplateMapper.insert(initUserOrderTemplate(newBulkOrderBo, orderList, orderId, planId));
-                    System.out.println("user_order_template表新增完成");
                 }
             }
             return 1;
@@ -111,9 +115,9 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
         bulkOrderList.setBaseClothPrice(orderList.getBaseClothPrice());
         //设置品牌组
         bulkOrderList.setBrandGroup(orderList.getBrandGroup());
-        //设置工艺类型
+        //设置工艺类型id
         bulkOrderList.setGoodsTypeExtend3Id(orderList.getCraftId());
-        //设置花型号类型并转换为JSON格式存入
+        //设置花型号id
         bulkOrderList.setGoodsTypeExtend4Id(orderList.getOemId());
         return bulkOrderList;
     }

+ 0 - 7
ruoyi-modules/ruoyi-bulkOrder/src/main/resources/mapper/UserOrderMapper.xml

@@ -3,11 +3,4 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.bulk.mapper.UserOrderMapper">
-    <select id="selectLastId" resultType="java.lang.Long">
-        SELECT
-            id
-        FROM fa_kuyou_user_order
-        ORDER BY id DESC
-        LIMIT 1
-    </select>
 </mapper>

+ 0 - 1
ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/TemplateBo.java

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.domain.bo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 0 - 6
ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/mapper/ProductionPlanMapper.java

@@ -10,10 +10,4 @@ import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
  */
 @Mapper
 public interface ProductionPlanMapper extends BaseMapperPlus<ProductionPlan, ProductionPlanVo> {
-
-    /**
-     * 查询最新生产计划id
-     * @return id
-     */
-    Long selectLastId();
 }

+ 0 - 8
ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/resources/mapper/ProductionPlanMapper.xml

@@ -3,12 +3,4 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.productionManagement.mapper.ProductionPlanMapper">
-
-    <select id="selectLastId" resultType="java.lang.Long">
-        SELECT
-            id
-        FROM fa_kuyou_plan
-        ORDER BY id DESC
-        LIMIT 1
-    </select>
 </mapper>