fix:完成部分添加业务

ruoyi-modules/ruoyi-bulkOrder/pom.xml

@@ -110,6 +110,10 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-customerManagement</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-productionManagementOfBulkOrders</artifactId>
+        </dependency>
 
     </dependencies>
 

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

@@ -78,42 +78,42 @@ public class OrderListBo {
     /**
      * 烧花,0否，1是
      */
-    private int isBurnFlowers;
+    private int isBurnFlowers = 0;
 
     /**
      * 快返,0否，1是
      */
-    private int isQuickReturn;
+    private int isQuickReturn = 0;
 
     /**
      * 作废0否，1是
      */
-    private int isToVoid;
+    private int isToVoid = 0;
 
     /**
      * 复色，0否，1是
      */
-    private int isMulticolor;
+    private int isMulticolor = 0;
 
     /**
      * 首单，0否，1是
      */
-    private int isFirstOrder;
+    private int isFirstOrder = 0;
 
     /**
      * 加急，0否，1是
      */
-    private int isUrgent;
+    private int isUrgent = 0;
 
     /**
      * 补货，0否，1是
      */
-    private int isBuhuo;
+    private int isBuhuo = 0;
 
     /**
      * 系统单，0否，1是
      */
-    private int isSys;
+    private String isSys = "0";
 
     /**
      * 用户id

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

@@ -2,15 +2,37 @@ package org.dromara.bulk.service.impl;
 
 import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
+import org.dromara.bulk.domain.bo.OrderListBo;
 import org.dromara.bulk.service.BulkOrderManagementService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.OrderNumberGenerator;
+import org.dromara.productionManagement.domain.ProductionPlan;
+import org.dromara.productionManagement.domain.bo.ProductionPlanBo;
+import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.springframework.stereotype.Service;
 
-@RequiredArgsConstructor
+/**
+ * 大货订单管理服务层实现
+ */
 @Service
+@RequiredArgsConstructor
 public class BulkOrderManagementServiceImpl implements BulkOrderManagementService {
 
+    private final ProductionPlanMapper productionPlanMapper;
+
     @Override
     public int insertBulkOrder(NewBulkOrderBo newBulkOrderBo) {
+        OrderNumberGenerator orderNumberGenerator = OrderNumberGenerator.getInstance();
+        for (OrderListBo orderList : newBulkOrderBo.getOrderLists()){
+            String sysNo = orderNumberGenerator.generateOrderNumber("SYS");
+            String purchaseCode = orderNumberGenerator.generateOrderNumber("SC");
+            String orderNum = orderNumberGenerator.generateOrderNumber("DH");
+
+            ProductionPlanBo productionPlanBo = new ProductionPlanBo();
+            productionPlanBo.setSysNo(sysNo);
+            productionPlanBo.setPurchaseCode(purchaseCode);
+            productionPlanMapper.insert(MapstructUtils.convert(productionPlanBo, ProductionPlan.class));
+        }
 
         return 0;
     }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/ProductionPlan.java

@@ -12,6 +12,9 @@ import java.util.Date;
 @TableName("fa_kuyou_plan")
 public class ProductionPlan extends TenantEntity {
 
+    /**
+     * 主键
+     */
     private Long id;
 
     /**
@@ -157,47 +160,47 @@ public class ProductionPlan extends TenantEntity {
     /**
      * 烧花,0否，1是
      */
-    private int isBurnFlowers;
+    private int isBurnFlowers = 0;
 
     /**
      * 定位,0否，1是
      */
-    private int isLocation;
+    private int isLocation = 0;
 
     /**
      * 快返,0否，1是
      */
-    private int isQuickReturn;
+    private int isQuickReturn = 0;
 
     /**
      * 作废0否，1是
      */
-    private int isToVoid;
+    private int isToVoid = 0;
 
     /**
      * 复色，0否，1是
      */
-    private int isMulticolor;
+    private int isMulticolor = 0;
 
     /**
      * 首单，0否，1是
      */
-    private int isFirstOrder;
+    private int isFirstOrder = 0;
 
     /**
      * 首次加工，0否，1是
      */
-    private int isFirstProcessing;
+    private int isFirstProcessing = 0;
 
     /**
      * 紧急，0否，1是
      */
-    private int isUrgent;
+    private int isUrgent = 0;
 
     /**
      * 1排产中，2.产前确认中，3.打印中，4.后整中，5烧花中，6.入库
      */
-    private int craftStatus;
+    private int craftStatus = 1;
 
     /**
      * 销货单id
@@ -227,7 +230,7 @@ public class ProductionPlan extends TenantEntity {
     /**
      * 打印状态
      */
-    private int printStatus;
+    private int printStatus = 0;
 
     /**
      * 发货数量
@@ -265,14 +268,14 @@ public class ProductionPlan extends TenantEntity {
     private Long userId;
 
     /**
-     * 是否补货
+     * 是否补货，0否，1是
      */
-    private int isBuhuo;
+    private int isBuhuo = 0;
 
     /**
-     * 是否系统单
+     * 是否系统单，0否，1是
      */
-    private String isSys;
+    private String isSys = "0";
 
     /**
      *

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/bo/ProductionPlanBo.java

@@ -1,15 +1,21 @@
 package org.dromara.productionManagement.domain.bo;
 
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.productionManagement.domain.ProductionPlan;
 
 import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProductionPlan.class, reverseConvertGenerate = false)
 public class ProductionPlanBo extends BaseEntity {
 
+    /**
+     * 主键
+     */
     private Long id;
 
     /**
@@ -20,7 +26,7 @@ public class ProductionPlanBo extends BaseEntity {
     /**
      * 订单编号
      */
-    private String scNo;
+    private String scNo = null;
 
     /**
      * 生产计划单号
@@ -263,12 +269,12 @@ public class ProductionPlanBo extends BaseEntity {
     private Long userId;
 
     /**
-     * 是否补货
+     * 是否补货，0否，1是
      */
     private int isBuhuo;
 
     /**
-     * 是否系统单
+     * 是否系统单，0否，1是
      */
     private String isSys;
 

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/vo/ProductionPlanVo.java

@@ -1,15 +1,21 @@
 package org.dromara.productionManagement.domain.vo;
 
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.productionManagement.domain.ProductionPlan;
 
 import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProductionPlan.class)
 public class ProductionPlanVo extends BaseEntity {
 
+    /**
+     * 主键
+     */
     private Long id;
 
     /**
@@ -155,47 +161,47 @@ public class ProductionPlanVo extends BaseEntity {
     /**
      * 烧花,0否，1是
      */
-    private int isBurnFlowers;
+    private int isBurnFlowers = 0;
 
     /**
      * 定位,0否，1是
      */
-    private int isLocation;
+    private int isLocation = 0;
 
     /**
      * 快返,0否，1是
      */
-    private int isQuickReturn;
+    private int isQuickReturn = 0;
 
     /**
      * 作废0否，1是
      */
-    private int isToVoid;
+    private int isToVoid = 0;
 
     /**
      * 复色，0否，1是
      */
-    private int isMulticolor;
+    private int isMulticolor = 0;
 
     /**
      * 首单，0否，1是
      */
-    private int isFirstOrder;
+    private int isFirstOrder = 0;
 
     /**
      * 首次加工，0否，1是
      */
-    private int isFirstProcessing;
+    private int isFirstProcessing = 0;
 
     /**
      * 紧急，0否，1是
      */
-    private int isUrgent;
+    private int isUrgent = 0;
 
     /**
      * 1排产中，2.产前确认中，3.打印中，4.后整中，5烧花中，6.入库
      */
-    private int craftStatus;
+    private int craftStatus = 1;
 
     /**
      * 销货单id
@@ -225,7 +231,7 @@ public class ProductionPlanVo extends BaseEntity {
     /**
      * 打印状态
      */
-    private int printStatus;
+    private int printStatus = 0;
 
     /**
      * 发货数量
@@ -263,14 +269,14 @@ public class ProductionPlanVo extends BaseEntity {
     private Long userId;
 
     /**
-     * 是否补货
+     * 是否补货，0否，1是
      */
-    private int isBuhuo;
+    private int isBuhuo = 0;
 
     /**
-     * 是否系统单
+     * 是否系统单，0否，1是
      */
-    private String isSys;
+    private String isSys = "0";
 
     /**
      *