fix:优化代码

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/BulkOrderListController.java

@@ -31,16 +31,6 @@ public class BulkOrderListController extends BaseController {
         return bulkOrderListService.selectPageBulkOrderList(bulkOrderListBo, pageQuery);
     }
 
-    /**
-     * 新增大货订单列表
-     * @param bulkOrderListBo 大货订单列表BO对象
-     * @return 新增行数
-     */
-    @PostMapping()
-    public R<Void> insertBulkOrder(@Validated @RequestBody BulkOrderListBo bulkOrderListBo) {
-        return toAjax(bulkOrderListService.insertBulkOrder(bulkOrderListBo));
-    }
-
     /**
      * 修改大货订单列表
      * @param bulkOrderListBo 大货订单列表BO对象

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

@@ -0,0 +1,76 @@
+package org.dromara.bulk.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class CraftAttrBo {
+    /**
+     * 工艺价格
+     */
+    private String price;
+
+    /**
+     * 工艺ID
+     */
+    private Long id;
+
+    /**
+     * pid
+     */
+    private int pid;
+
+    /**
+     * 状态
+     */
+    private String status = "1";
+
+    /**
+     * 订单状态
+     */
+    private String order_status = "1";
+
+    /**
+     * 类型
+     */
+    private int type = 3;
+
+    /**
+     * 重量
+     */
+    private int weigh;
+
+    /**
+     * 工艺名称
+     */
+    private String title;
+
+    /**
+     * 工艺图片
+     */
+    private String image = "";
+
+    /**
+     * 创建时间
+     */
+    private String createtime;
+
+    /**
+     * 状态文本
+     */
+    private String status_text = "正常";
+
+    /**
+     * 垫片
+     */
+    private String spacer = "";
+
+    /**
+     * 是否有子工艺
+     */
+    private String haschild = "0";
+
+    /**
+     * 类型名称
+     */
+    private String type_name = "工艺类型";
+}

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

@@ -0,0 +1,76 @@
+package org.dromara.bulk.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class MaterialAttrBo {
+    /**
+     * 价格
+     */
+    private String price = "";
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * pid
+     */
+    private int pid;
+
+    /**
+     * 状态
+     */
+    private String status = "1";
+
+    /**
+     * 订单状态
+     */
+    private String order_status = "1";
+
+    /**
+     * 类型
+     */
+    private int type = 2;
+
+    /**
+     * 重量
+     */
+    private int weigh = 0;
+
+    /**
+     * 名称
+     */
+    private String title;
+
+    /**
+     * 图片
+     */
+    private String image = "";
+
+    /**
+     * 创建时间
+     */
+    private String createtime;
+
+    /**
+     * 状态文本
+     */
+    private String status_text = "正常";
+
+    /**
+     * 垫片
+     */
+    private String spacer = "";
+
+    /**
+     * 是否有子物料
+     */
+    private String haschild = "0";
+
+    /**
+     * 类型名称
+     */
+    private String type_name = "供货商名称";
+}

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

@@ -0,0 +1,37 @@
+package org.dromara.bulk.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class OemAttrBo {
+    /**
+     * 花型号 ID
+     */
+    private int id;
+
+    /**
+     * 花型号图片
+     */
+    private String image;
+
+    /**
+     * 花型号名称
+     */
+    private String code;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 用户订单id
+     */
+    private Long user_order_id;
+
+    /**
+     * 用户id
+     */
+    private Long user_id;
+
+}

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

@@ -28,6 +28,11 @@ public class OrderListBo {
     @NotNull(message = "大货编号id不能为空")
     private Long daHuoNumberId;
 
+    /**
+     * 物料对象
+     */
+    private MaterialAttrBo material;
+
     /**
      * 款号
      */
@@ -36,6 +41,7 @@ public class OrderListBo {
     /**
      * 工厂名称
      */
+    @NotBlank(message = "工厂名称不能为空")
     private String garmentFactory;
 
     /**
@@ -91,12 +97,13 @@ public class OrderListBo {
     /**
      * 品牌组
      */
+    @NotBlank(message = "品牌组不能为空")
     private String brandGroup;
 
     /**
-     * 工艺id
+     * 工艺BO对象
      */
-    private String craftId;
+    private CraftAttrBo craft;
 
     /**
      * 工艺价格
@@ -157,10 +164,9 @@ public class OrderListBo {
     private String isSys = "0";
 
     /**
-     * 花型号
+     * 花型号BO对象
      */
-    @Size(max = 1,message = "0否，1是")
-    private String oemId;
+    private OemAttrBo oem;
 
     /**
      * 款式图的Url

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/BulkOrderListMapper.java

@@ -23,6 +23,8 @@ public interface BulkOrderListMapper extends BaseMapperPlus<BulkOrderList, BulkO
      */
     Page<BulkOrderListVo> selectVoPageWithImage(IPage<BulkOrderListVo> page, @Param(Constants.WRAPPER) Wrapper<BulkOrderList> wrapper);
 
+
+
 }
 
 

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

@@ -27,7 +27,6 @@ public interface NewBulkOrderMapstruct {
     @Mapping(target = "unitId", constant = "5")
     @Mapping(target = "defaultUnit", constant = "5")
     @Mapping(target = "goodsTypeExtend1Id", source = "orderList.daHuoNumberName")
-    @Mapping(target = "goodsTypeExtend4Id", source = "orderList.oemId")
     @Mapping(target = "craftPrice", source = "orderList.craftPrice")
     @Mapping(target = "duizhangStatus", constant = "0")
     BulkOrderList toBulkOrderList(NewBulkOrderBo newBulkOrderBo,

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

@@ -15,13 +15,6 @@ public interface BulkOrderListService {
      */
     TableDataInfo<BulkOrderListVo> selectPageBulkOrderList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery);
 
-    /**
-     * 新增大货订单
-     * @param bulkOrderListBo 大货订单BO对象
-     * @return 影响行数
-     */
-    int insertBulkOrder(BulkOrderListBo bulkOrderListBo);
-
     /**
      * 修改大货订单
      * @param bulkOrderListBo 大货订单BO对象

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

@@ -6,16 +6,15 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.BulkOrderList;
 import org.dromara.bulk.domain.bo.BulkOrderListBo;
 import org.dromara.bulk.domain.vo.BulkOrderListVo;
-import org.dromara.bulk.mapper.BulkOrderListMapper;
+import org.dromara.bulk.mapper.*;
+import org.dromara.bulk.mapstruct.NewBulkOrderMapstruct;
 import org.dromara.bulk.service.BulkOrderListService;
 import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.OrderNumberGenerator;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-
 
 /**
  * 大货订单列表服务层实现
@@ -24,7 +23,14 @@ import java.util.Arrays;
 @RequiredArgsConstructor
 public class BulkOrderListServiceImpl implements BulkOrderListService {
 
+    private final ProductionPlanMapper productionPlanMapper;
     private final BulkOrderListMapper bulkOrderListMapper;
+    private final UserOrderMapper userOrderMapper;
+    private final UserOrderTemplateMapper userOrderTemplateMapper;
+    private final AttachmentMapper attachmentMapper;
+    private final FlowerPatternMapper flowerPatternMapper;
+
+    private final NewBulkOrderMapstruct newBulkOrderMapstruct;
 
     /**
      * 查询大货订单列表分页信息
@@ -40,19 +46,6 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
         return TableDataInfo.build(page);
     }
 
-    /**
-     * 添加大货订单
-     * @param bulkOrderListBo 大货订单BO对象
-     * @return 添加行数
-     */
-    @Override
-    public int insertBulkOrder(BulkOrderListBo bulkOrderListBo) {
-        OrderNumberGenerator orderNumberGenerator = OrderNumberGenerator.getInstance();
-        bulkOrderListBo.setScNo(orderNumberGenerator.generateOrderNumber("SC"));
-        bulkOrderListBo.setSysNo(orderNumberGenerator.generateOrderNumber("SYS"));
-        return bulkOrderListMapper.insert(MapstructUtils.convert(bulkOrderListBo, BulkOrderList.class));
-    }
-
     /**
      * 修改大货订单
      * @param bulkOrderListBo 大货订单BO对象
@@ -70,7 +63,10 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
      */
     @Override
     public int deleteBulkOrderById(Long[] bulkOrderListIds) {
-        return bulkOrderListMapper.deleteByIds(Arrays.asList(bulkOrderListIds));
+        for (Long bulkOrderListId : bulkOrderListIds) {
+
+        }
+        return 1;
     }
 }
 

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

@@ -12,6 +12,7 @@ import org.dromara.bulk.mapstruct.NewBulkOrderMapstruct;
 import org.dromara.bulk.service.BulkOrderManagementService;
 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.mapper.ProductionPlanMapper;
 import org.dromara.system.domain.vo.SysOssVo;
@@ -41,7 +42,6 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
 
     /**
      * 新增生产订单
-     *
      * @param newBulkOrderBo 生产订单的BO对象
      * @return 添加结果
      */
@@ -81,10 +81,17 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                 // 订单列表映射
                 BulkOrderList bulkOrderList = newBulkOrderMapstruct.toBulkOrderList(
                     newBulkOrderBo,
-                    orderList, sysNo,
+                    orderList,
+                    sysNo,
                     purchaseCode,
                     userOrder.getId(),
                     productionPlan.getId());
+                bulkOrderList.setGoodsTypeExtend2Attr(JsonUtils.toJsonString(orderList.getMaterial()));
+                bulkOrderList.setGoodsTypeExtend3Attr(JsonUtils.toJsonString(orderList.getCraft()));
+
+                orderList.getOem().setUser_order_id(userOrder.getId());
+                orderList.getOem().setUser_id(newBulkOrderBo.getUserId());
+                bulkOrderList.setGoodsTypeExtend4Attr(JsonUtils.toJsonString(orderList.getOem()));
                 bulkOrderListMapper.insert(bulkOrderList);
 
                 // 处理模板