fix:继续完善新增逻辑

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

@@ -73,7 +73,7 @@ public class BulkOrderListBo extends BaseEntity {
     /**
     * 默认单位
     */
-    private Long defaultUnit;
+    private int defaultUnit;
 
     /**
     * 进价
@@ -113,7 +113,7 @@ public class BulkOrderListBo extends BaseEntity {
     private String remark;
 
     /**
-    * 面料id
+    * 面料id(大货编号)
     */
     private String goodsTypeExtend1Id;
 
@@ -285,4 +285,6 @@ public class BulkOrderListBo extends BaseEntity {
      * 商品图片
      */
     private String image;
+
+
 }

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

@@ -4,9 +4,40 @@ import lombok.Data;
 
 import java.util.List;
 
+/**
+ * 创建新生产计划BO类
+ */
+
 @Data
 public class NewBulkOrderBo {
-    private Long customers_id;
 
+    /**
+     * 用户id
+     */
+    private Long user_id;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 电话
+     */
+    private int phone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 订单信息列表
+     */
     private List<OrderListBo> orderLists;
 }

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

@@ -2,6 +2,7 @@ package org.dromara.bulk.domain.bo;
 
 import lombok.Data;
 import org.dromara.commodityManagement.domain.bo.CraftBo;
+import org.dromara.commodityManagement.domain.bo.OemBo;
 import org.dromara.commodityManagement.domain.bo.TemplateBo;
 
 import java.util.Date;
@@ -73,7 +74,7 @@ public class OrderListBo {
     /**
      * 版图列表
      */
-    private List<TemplateBo> templateList;
+    private List<TemplateBo> templateList;//未找到表
 
     /**
      * 烧花,0否，1是
@@ -123,7 +124,7 @@ public class OrderListBo {
     /**
      * 花型号
      */
-    private String OemNumber;
+    private OemBo Oem;
 
     /**
      * 款式图

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

@@ -7,12 +7,14 @@ import org.dromara.bulk.domain.bo.NewBulkOrderBo;
 import org.dromara.bulk.domain.bo.OrderListBo;
 import org.dromara.bulk.mapper.BulkOrderListMapper;
 import org.dromara.bulk.service.BulkOrderManagementService;
+import org.dromara.commodityManagement.mapper.OemMapper;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.OrderNumberGenerator;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.productionManagement.domain.ProductionPlan;
 import org.dromara.productionManagement.domain.bo.ProductionPlanBo;
 import org.dromara.productionManagement.mapper.ProductionPlanMapper;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
 /**
@@ -24,6 +26,7 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
 
     private final ProductionPlanMapper productionPlanMapper;
     private final BulkOrderListMapper bulkOrderListMapper;
+    private final OemMapper oemMapper;
 
     @Override
     public int insertBulkOrder(NewBulkOrderBo newBulkOrderBo) {
@@ -31,30 +34,100 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
         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);
+            ProductionPlanBo productionPlanBo = initProductionPlanBo(orderList, sysNo, purchaseCode);
             productionPlanMapper.insert(MapstructUtils.convert(productionPlanBo, ProductionPlan.class));
 
-            BulkOrderListBo bulkOrderListBo = new BulkOrderListBo();
-            bulkOrderListBo.setSysNo(sysNo);
-            bulkOrderListBo.setScNo(purchaseCode);
-            bulkOrderListBo.setGarmentFactory(orderList.getGarmentFactory());
-            bulkOrderListBo.setGarmentFactoryPeople(orderList.getGarmentFactoryPeople());
-            bulkOrderListBo.setGarmentFactoryTel(orderList.getGarmentFactoryTel());
-            bulkOrderListBo.setReceivingAddress(orderList.getReceivingAddress());
-            bulkOrderListBo.setCurrentTimeConsumption(orderList.getCurrentTimeConsumption());
-            bulkOrderListBo.setOrderTime(orderList.getOrderTime());
-            bulkOrderListBo.setTargetDate(orderList.getTargetDate());
-            bulkOrderListBo.setBaseCloth(orderList.getBaseCloth());
-            bulkOrderListBo.setBaseClothPrice(orderList.getBaseClothPrice());
-            bulkOrderListBo.setBrandGroup(orderList.getBrandGroup());
-            bulkOrderListBo.setGoodsTypeExtend3Id(JsonUtils.toJsonString(orderList.getCraft()));
+            BulkOrderListBo bulkOrderListBo = initBulkOrderListBo(orderList, sysNo, purchaseCode);
             bulkOrderListMapper.insert(MapstructUtils.convert(bulkOrderListBo, BulkOrderList.class));
         }
 
         return 0;
     }
+
+    /**
+     * 初始化大货订单列表BO对象
+     * @param orderList 订单列表
+     * @param sysNo 系统单号
+     * @param purchaseCode 生产单号
+     * @return 构建完毕的BO对象
+     */
+    @NotNull
+    private BulkOrderListBo initBulkOrderListBo(@NotNull OrderListBo orderList, String sysNo, String purchaseCode) {
+        BulkOrderListBo bulkOrderListBo = new BulkOrderListBo();
+        //设置系统单号
+        bulkOrderListBo.setSysNo(sysNo);
+        //设置生产单号
+        bulkOrderListBo.setScNo(purchaseCode);
+        //设置商品ID
+        bulkOrderListBo.setGoodsId(9L);
+        //设置商品编号
+        bulkOrderListBo.setGoodsCode("SP001");
+        //设置商品名称
+        bulkOrderListBo.setGoodsName("图片下单");
+        //设置单位ID
+        bulkOrderListBo.setUnitId(5);
+        //设置默认单位ID
+        bulkOrderListBo.setDefaultUnit(5);
+        //设置大货编号
+        bulkOrderListBo.setGoodsTypeExtend1Id(orderList.getDaHuoNumber());
+        //设置成衣厂
+        bulkOrderListBo.setGarmentFactory(orderList.getGarmentFactory());
+        //设置成衣厂联系人
+        bulkOrderListBo.setGarmentFactoryPeople(orderList.getGarmentFactoryPeople());
+        //设置成衣厂电话
+        bulkOrderListBo.setGarmentFactoryTel(orderList.getGarmentFactoryTel());
+        //设置收货地址
+        bulkOrderListBo.setReceivingAddress(orderList.getReceivingAddress());
+        //设置当前消耗时间
+        bulkOrderListBo.setCurrentTimeConsumption(orderList.getCurrentTimeConsumption());
+        //设置下单时间
+        bulkOrderListBo.setOrderTime(orderList.getOrderTime());
+        //设置目标时间
+        bulkOrderListBo.setTargetDate(orderList.getTargetDate());
+        //设置底布
+        bulkOrderListBo.setBaseCloth(orderList.getBaseCloth());
+        //设置底布价格
+        bulkOrderListBo.setBaseClothPrice(orderList.getBaseClothPrice());
+        //设置品牌组
+        bulkOrderListBo.setBrandGroup(orderList.getBrandGroup());
+        //设置工艺类型并转换为JSON格式后存入
+        bulkOrderListBo.setGoodsTypeExtend3Attr(JsonUtils.toJsonString(orderList.getCraft()));
+        //设置花型号类型并转换为JSON格式存入
+        bulkOrderListBo.setGoodsTypeExtend4Attr(JsonUtils.toJsonString(orderList.getOem()));
+        return bulkOrderListBo;
+    }
+
+    /**
+     * 初始化生产计划BO对象
+     * @param orderList 订单列表
+     * @param sysNo 系统单号
+     * @param purchaseCode 生产单号
+     * @return 构建完毕的生产计划BO对象
+     */
+    @NotNull
+    private ProductionPlanBo initProductionPlanBo(@NotNull OrderListBo orderList, String sysNo, String purchaseCode) {
+        ProductionPlanBo productionPlanBo = new ProductionPlanBo();
+        //设置系统单号
+        productionPlanBo.setSysNo(sysNo);
+        //设置生产单号
+        productionPlanBo.setPurchaseCode(purchaseCode);
+        //设置是否烧花
+        productionPlanBo.setIsBurnFlowers(orderList.getIsBurnFlowers());
+        //设置是否快返
+        productionPlanBo.setIsQuickReturn(orderList.getIsQuickReturn());
+        //设置是否作废
+        productionPlanBo.setIsToVoid(orderList.getIsToVoid());
+        //设置是否多色
+        productionPlanBo.setIsMulticolor(orderList.getIsMulticolor());
+        //设置是否首单
+        productionPlanBo.setIsFirstOrder(orderList.getIsFirstOrder());
+        //设置是否紧急
+        productionPlanBo.setIsUrgent(orderList.getIsUrgent());
+        //设置是否补货
+        productionPlanBo.setIsBuhuo(orderList.getIsBuhuo());
+        //设置是否系统单
+        productionPlanBo.setIsSys(orderList.getIsSys());
+        return productionPlanBo;
+    }
 }