fix:完善注释

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

@@ -16,6 +16,11 @@ import java.util.List;
 @Data
 public class OrderListBo {
 
+    /**
+     * plan_info表id
+     */
+    private Long id;
+
     /**
      * 大货编号名称
      */

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapstruct/NewBulkOrderMapstruct.java

@@ -19,7 +19,16 @@ import java.util.List;
 @Mapper(componentModel = "spring")
 public interface NewBulkOrderMapstruct {
 
-    // BulkOrderList映射
+    /**
+     * 大货订单列表映射
+     * @param newBulkOrderBo 新增大货订单
+     * @param orderList 订单列表
+     * @param sysNo 生成的系统单号
+     * @param purchaseCode 生成的计划单号
+     * @param userOrderId 用户订单Id
+     * @param planId 生产计划Id
+     * @return BulkOrderList
+     */
     @Mapping(target = "scNo", source = "purchaseCode")
     @Mapping(target = "goodsCode", constant = "SP001")
     @Mapping(target = "goodsName", constant = "图片下单")
@@ -36,7 +45,15 @@ public interface NewBulkOrderMapstruct {
                                   Long userOrderId,
                                   Long planId);
 
-    // ProductionPlan映射
+    /**
+     * 生产计划映射
+     * @param newBulkOrder 新增大货订单
+     * @param orderList 订单列表
+     * @param sysNo 生成的系统单号
+     * @param purchaseCode 生成的计划单号
+     * @param orderNumber 生成的订单号
+     * @return ProductionPlan
+     */
     @Mapping(target = "orderNum", source = "orderNumber")
     @Mapping(target = "goodsCode", constant = "SP001")
     @Mapping(target = "goodsName", constant = "图片下单")
@@ -51,7 +68,14 @@ public interface NewBulkOrderMapstruct {
                                     String purchaseCode,
                                     String orderNumber);
 
-    // UserOrder映射
+    /**
+     * 用户订单映射
+     * @param newBulkOrder 新增大货订单
+     * @param orderList 订单列表
+     * @param orderNumber 生成的订单号
+     * @param remark 订单的备注
+     * @return UserOrder
+     */
     @Mapping(target = "name", source = "newBulkOrder.userName")
     @Mapping(target = "phone", source = "newBulkOrder.userPhone")
     @Mapping(target = "address", source = "orderList.receivingAddress")
@@ -60,7 +84,16 @@ public interface NewBulkOrderMapstruct {
                           String orderNumber,
                           String remark);
 
-    // UserOrderTemplate列表映射
+    /**
+     * 用户订单版图映射
+     * @param newBulkOrder 新增大货订单
+     * @param orderList 订单列表
+     * @param orderId 用户订单Id
+     * @param planId 生产计划Id
+     * @param templateBo 版图BO对象
+     * @return UserOrderTemplate
+     */
+    @Mapping(target = "id", source = "templateBo.id")
     @Mapping(target = "orderId", source = "orderId")
     @Mapping(target = "planId", source = "planId")
     @Mapping(target = "itemId", source = "orderList.daHuoNumberId")
@@ -70,7 +103,15 @@ public interface NewBulkOrderMapstruct {
                                           Long planId,
                                           TemplateBo templateBo);
 
-    // 集合映射方法
+    /**
+     * 版图列表映射
+     * @param newBulkOrderBo 新增大货订单
+     * @param orderList 订单列表
+     * @param orderId 用户订单Id
+     * @param planId 计划Id
+     * @param templateList 版图列表
+     * @return ArrayList<UserOrderTemplate>
+     */
     default ArrayList<UserOrderTemplate> toTemplateList(NewBulkOrderBo newBulkOrderBo, OrderListBo orderList, Long orderId, Long planId, List<TemplateBo> templateList) {
         ArrayList<UserOrderTemplate> arrayList = new ArrayList<>(templateList.size());
         for (TemplateBo templateBo : templateList) {

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/BulkOrderListService.java

@@ -20,7 +20,7 @@ public interface BulkOrderListService {
 
     /**
      * 修改大货订单
-     * @param bulkOrderListBo 大货订单BO对象
+     * @param bulkOrderListBo 生产订单BO对象
      * @return 影响行数
      */
     int updateBulkOrder(BulkOrderListBo bulkOrderListBo);

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/BulkOrderListServiceImpl.java

@@ -47,8 +47,8 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
     }
 
     /**
-     * 修改大货订单
-     * @param bulkOrderListBo 大货订单BO对象
+     * 修改生产订单
+     * @param bulkOrderListBo 生产订单BO对象
      * @return 更新行数
      */
     @Override
@@ -57,7 +57,7 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
     }
 
     /**
-     * 删除大货订单及所属数据
+     * 删除生产订单及所属数据
      * @param bulkOrderListIds 大货订单ID数组
      * @return 删除行数
      */
@@ -69,8 +69,8 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
             if (null == planId){
                 return 0;
             }
-            String orderNUmber = productionPlanMapper.selectOrderNumberById(planId);
-            Long userOrderId = userOrderMapper.selectIdByOrderNumber(orderNUmber);
+            String orderNumber = productionPlanMapper.selectOrderNumberById(planId);
+            Long userOrderId = userOrderMapper.selectIdByOrderNumber(orderNumber);
 
             bulkOrderListMapper.deleteById(bulkOrderListId);
             productionPlanMapper.deleteById(planId);