fix:优化映射

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

@@ -17,11 +17,6 @@ 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

@@ -54,6 +54,7 @@ public interface NewBulkOrderMapstruct {
      * @param orderNumber 生成的订单号
      * @return ProductionPlan
      */
+    @Mapping(target = "purchaseTime", source = "orderList.orderTime")
     @Mapping(target = "orderNum", source = "orderNumber")
     @Mapping(target = "goodsCode", constant = "SP001")
     @Mapping(target = "goodsName", constant = "图片下单")
@@ -62,7 +63,7 @@ public interface NewBulkOrderMapstruct {
     @Mapping(target = "examineStatus", constant = "0")
     @Mapping(target = "status", constant = "0")
     @Mapping(target = "mrpStatus", constant = "0")
-    BulkOrderPlan toProductionPlan(NewBulkOrderBo newBulkOrder,
+    BulkOrderPlan toBulkOrderPlan(NewBulkOrderBo newBulkOrder,
                                    OrderListBo orderList,
                                    String sysNo,
                                    String purchaseCode,

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

@@ -64,7 +64,7 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                 userOrderMapper.insert(userOrder);
 
                 // 生产计划映射
-                BulkOrderPlan bulkOrderPlan = newBulkOrderMapstruct.toProductionPlan(
+                BulkOrderPlan bulkOrderPlan = newBulkOrderMapstruct.toBulkOrderPlan(
                     newBulkOrderBo,
                     orderList,
                     sysNo,
@@ -86,7 +86,6 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                 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);