fix:继续完善新增逻辑

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

@@ -9,6 +9,9 @@ import org.dromara.common.tenant.core.TenantEntity;
 import java.util.Date;
 
 
+/**
+ * 用户订单表基类
+ */
 @Data
 @TableName("fa_kuyou_user_order")
 @EqualsAndHashCode(callSuper = true)

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

@@ -286,5 +286,4 @@ public class BulkOrderListBo extends BaseEntity {
      */
     private String image;
 
-
 }

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

@@ -130,4 +130,9 @@ public class OrderListBo {
      * 款式图
      */
     private String styleImage;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
 }

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

@@ -4,6 +4,9 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.bulk.domain.UserOrderTemplate;
 
+/**
+ * 用户订单版图BO类
+ */
 @Data
 @AutoMapper(target = UserOrderTemplate.class, reverseConvertGenerate = false)
 public class UserOrderTemplateBo {

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/vo/UserOrderTemplateVo.java

@@ -4,6 +4,9 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.bulk.domain.UserOrderTemplate;
 
+/**
+ * 用户订单版图VO类
+ */
 @Data
 @AutoMapper(target = UserOrderTemplate.class)
 public class UserOrderTemplateVo {

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/vo/UserOrderVo.java

@@ -8,7 +8,9 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.util.Date;
 
-
+/**
+ *
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = UserOrder.class)

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

@@ -34,8 +34,9 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
         for (OrderListBo orderList : newBulkOrderBo.getOrderLists()){
             String sysNo = orderNumberGenerator.generateOrderNumber("SYS");
             String purchaseCode = orderNumberGenerator.generateOrderNumber("SC");
+            String orderNumber = orderNumberGenerator.generateOrderNumber("DH");
 
-            ProductionPlanBo productionPlanBo = initProductionPlanBo(orderList, sysNo, purchaseCode);
+            ProductionPlanBo productionPlanBo = initProductionPlanBo(orderList, sysNo, purchaseCode, orderNumber);
             productionPlanMapper.insert(MapstructUtils.convert(productionPlanBo, ProductionPlan.class));
 
             BulkOrderListBo bulkOrderListBo = initBulkOrderListBo(orderList, sysNo, purchaseCode);
@@ -106,12 +107,16 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
      * @return 构建完毕的生产计划BO对象
      */
     @NotNull
-    private ProductionPlanBo initProductionPlanBo(@NotNull OrderListBo orderList, String sysNo, String purchaseCode) {
+    private ProductionPlanBo initProductionPlanBo(@NotNull OrderListBo orderList, String sysNo, String purchaseCode, String orderNumber) {
         ProductionPlanBo productionPlanBo = new ProductionPlanBo();
         //设置系统单号
         productionPlanBo.setSysNo(sysNo);
         //设置生产单号
         productionPlanBo.setPurchaseCode(purchaseCode);
+        //设置订单单号
+        productionPlanBo.setOrderNum(orderNumber);
+        //设置用户id
+        productionPlanBo.setUserId(orderList.getUserId());
         //设置是否烧花
         productionPlanBo.setIsBurnFlowers(orderList.getIsBurnFlowers());
         //设置是否快返
@@ -128,6 +133,8 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
         productionPlanBo.setIsBuhuo(orderList.getIsBuhuo());
         //设置是否系统单
         productionPlanBo.setIsSys(orderList.getIsSys());
+        //设置创建时间
+        productionPlanBo.setCreateTime(orderList.getCreateTime());
         return productionPlanBo;
     }
 }