fix:优化映射关系

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

@@ -170,7 +170,7 @@ public class BulkOrderList extends TenantEntity {
     private double gongyiPrice;
 
     /**
-    * 款号
+    * 款号(大货编号)
     */
     private String itemNumber;
 
@@ -237,14 +237,17 @@ public class BulkOrderList extends TenantEntity {
     * 目标日期
     */
     private Date targetDate;
+
     /**
     * 订单id
     */
     private Long userOrderId;
+
     /**
     * 销货单id
     */
     private Long goodsSalesInfoId;
+
     /**
     * 下单码数类型
     */

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

@@ -1,8 +1,9 @@
 package org.dromara.bulk.domain.bo;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -10,7 +11,8 @@ import java.util.List;
  */
 
 @Data
-public class NewBulkOrderBo {
+@EqualsAndHashCode(callSuper = true)
+public class NewBulkOrderBo extends BaseEntity {
 
     /**
      * 用户id
@@ -32,11 +34,6 @@ public class NewBulkOrderBo {
      */
     private String remark;
 
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
     /**
      * 订单信息列表
      */

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

@@ -22,6 +22,11 @@ public class OrderListBo {
      */
     private Long daHuoNumberId;
 
+    /**
+     * 款号
+     */
+    private String itemNumber;
+
     /**
      * 工厂名称
      */
@@ -77,6 +82,11 @@ public class OrderListBo {
      */
     private String craftId;
 
+    /**
+     * 工艺价格
+     */
+    private double craftPrice;
+
     /**
      * 版图列表
      */

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

@@ -17,53 +17,51 @@ import java.util.List;
 public interface NewBulkOrderMapstruct {
 
     // BulkOrderList映射
-    @Mapping(target = "sysNo", ignore = true)
-    @Mapping(target = "scNo", ignore = true)
-    @Mapping(target = "goodsId", ignore = true)
+    @Mapping(target = "scNo", source = "purchaseCode")
     @Mapping(target = "goodsCode", constant = "SP001")
     @Mapping(target = "goodsName", constant = "图片下单")
     @Mapping(target = "unitId", constant = "5")
     @Mapping(target = "defaultUnit", constant = "5")
-    @Mapping(target = "goodsTypeExtend1Id", source = "daHuoNumberName")
-    BulkOrderList toBulkOrderList(OrderListBo source);
+    @Mapping(target = "goodsTypeExtend1Id", source = "orderList.daHuoNumberName")
+    @Mapping(target = "goodsTypeExtend4Id", source = "orderList.oemId")
+    @Mapping(target = "gongyiPrice", source = "orderList.craftPrice")
+    @Mapping(target = "duizhangStatus", constant = "0")
+    BulkOrderList toBulkOrderList(NewBulkOrderBo newBulkOrderBo,
+                                  OrderListBo orderList,
+                                  String sysNo,
+                                  String purchaseCode,
+                                  Long userOrderId,
+                                  Long planId);
 
     // ProductionPlan映射
-    @Mapping(target = "sysNo", source = "sysNo")
-    @Mapping(target = "purchaseCode", source = "purchaseCode")
     @Mapping(target = "orderNum", source = "orderNumber")
-    @Mapping(target = "userId", source = "newBulkOrderBo.userId")
-    @Mapping(target = "isBurnFlowers", source = "orderList.isBurnFlowers")
-    @Mapping(target = "isQuickReturn", source = "orderList.isQuickReturn")
-    @Mapping(target = "isToVoid", source = "orderList.isToVoid")
-    @Mapping(target = "isMulticolor", source = "orderList.isMulticolor")
-    @Mapping(target = "isFirstOrder", source = "orderList.isFirstOrder")
-    @Mapping(target = "isUrgent", source = "orderList.isUrgent")
-    @Mapping(target = "isBuhuo", source = "orderList.isBuhuo")
-    @Mapping(target = "isSys", source = "orderList.isSys")
-    ProductionPlan toProductionPlan(NewBulkOrderBo newBulkOrderBo,
+    @Mapping(target = "goodsCode", constant = "SP001")
+    @Mapping(target = "goodsName", constant = "图片下单")
+    @Mapping(target = "price", constant = "5")
+    @Mapping(target = "defaultUnit", constant = "5")
+    @Mapping(target = "examineStatus", constant = "0")
+    @Mapping(target = "status", constant = "0")
+    @Mapping(target = "mrpStatus", constant = "0")
+    ProductionPlan toProductionPlan(NewBulkOrderBo newBulkOrder,
                                     OrderListBo orderList,
                                     String sysNo,
                                     String purchaseCode,
                                     String orderNumber);
 
     // UserOrder映射
-    @Mapping(target = "userId", source = "newBulkOrderBo.userId")
-    @Mapping(target = "name", source = "newBulkOrderBo.userName")
-    @Mapping(target = "phone", source = "newBulkOrderBo.userPhone")
+    @Mapping(target = "name", source = "newBulkOrder.userName")
+    @Mapping(target = "phone", source = "newBulkOrder.userPhone")
     @Mapping(target = "address", source = "orderList.receivingAddress")
-    @Mapping(target = "orderNumber", source = "orderNumber")
-    @Mapping(target = "remark", source = "remark")
-    UserOrder toUserOrder(NewBulkOrderBo newBulkOrderBo,
+    UserOrder toUserOrder(NewBulkOrderBo newBulkOrder,
                           OrderListBo orderList,
                           String orderNumber,
                           String remark);
 
     // UserOrderTemplate列表映射
-    @Mapping(target = "userId", source = "newBulkOrderBo.userId")
     @Mapping(target = "orderId", source = "orderId")
     @Mapping(target = "planId", source = "planId")
     @Mapping(target = "itemId", source = "orderList.daHuoNumberId")
-    UserOrderTemplate toUserOrderTemplate(NewBulkOrderBo newBulkOrderBo,
+    UserOrderTemplate toUserOrderTemplate(NewBulkOrderBo newBulkOrder,
                                           OrderListBo orderList,
                                           Long orderId,
                                           Long planId,

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

@@ -51,12 +51,15 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                 String purchaseCode = orderNumberGenerator.generateOrderNumber("SC");
                 String orderNumber = orderNumberGenerator.generateOrderNumber("DH");
 
-                // 使用Mapper转换
-                BulkOrderList bulkOrderList = newBulkOrderMapstruct.toBulkOrderList(orderList);
-                bulkOrderList.setSysNo(sysNo);
-                bulkOrderList.setScNo(purchaseCode);
-                bulkOrderList.setGoodsId(9L);
-                bulkOrderListMapper.insert(bulkOrderList);
+                // 用户订单映射
+                UserOrder userOrder = newBulkOrderMapstruct.toUserOrder(
+                    newBulkOrderBo,
+                    orderList,
+                    orderNumber,
+                    newBulkOrderBo.getRemark()
+                );
+                userOrder.setCreateTime(newBulkOrderBo.getCreateTime());
+                userOrderMapper.insert(userOrder);
 
                 // 生产计划映射
                 ProductionPlan productionPlan = newBulkOrderMapstruct.toProductionPlan(
@@ -69,15 +72,14 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                 productionPlan.setCreateTime(newBulkOrderBo.getCreateTime());
                 productionPlanMapper.insert(productionPlan);
 
-                // 用户订单映射
-                UserOrder userOrder = newBulkOrderMapstruct.toUserOrder(
-                    newBulkOrderBo,
-                    orderList,
-                    orderNumber,
-                    newBulkOrderBo.getRemark()
-                );
-                userOrder.setCreateTime(newBulkOrderBo.getCreateTime());
-                userOrderMapper.insert(userOrder);
+                // 订单列表映射
+                BulkOrderList bulkOrderList = newBulkOrderMapstruct.toBulkOrderList(newBulkOrderBo, orderList, sysNo, purchaseCode, userOrder.getId(), productionPlan.getId());
+                bulkOrderList.setGoodsId(9L);
+                bulkOrderListMapper.insert(bulkOrderList);
+
+
+
+
 
                 // 处理模板
                 if (orderList.getTemplateList() != null) {

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

@@ -1,5 +1,6 @@
 package org.dromara.productionManagement.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -78,12 +79,14 @@ public class ProductionPlan {
     /**
      * 基本数量
      */
-    private double basicNmber;
+    @TableField("basic_nmber")
+    private double basicNumber;
 
     /**
      * 基本份数
      */
-    private double basicFenNmber;
+    @TableField("basic_fen_nmber")
+    private double basicFenNumber;
 
     /**
      * 底布单价
@@ -93,12 +96,14 @@ public class ProductionPlan {
     /**
      * 工艺单价
      */
-    private double gongyiPrice;
+    @TableField("gongyi_price")
+    private double craftPrice;
 
     /**
      * 单价
      */
-    private double unitPrice;
+    @TableField("unit_price")
+    private double price;
 
     /**
      * 金额
@@ -203,7 +208,7 @@ public class ProductionPlan {
     /**
      * 销货单id
      */
-    private Long goodsSalesId;
+    private Long goodsSalesId = 0L;
 
     /**
      * 宽幅

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

@@ -79,12 +79,12 @@ public class ProductionPlanBo{
     /**
      * 基本数量
      */
-    private double basicNmber;
+    private double basicNumber;
 
     /**
      * 基本份数
      */
-    private double basicFenNmber;
+    private double basicFenNumber;
 
     /**
      * 底布单价
@@ -94,12 +94,12 @@ public class ProductionPlanBo{
     /**
      * 工艺单价
      */
-    private double gongyiPrice;
+    private double craftPrice;
 
     /**
      * 单价
      */
-    private double unitPrice;
+    private double price;
 
     /**
      * 金额

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

@@ -79,12 +79,12 @@ public class ProductionPlanVo{
     /**
      * 基本数量
      */
-    private double basicNmber;
+    private double basicNumber;
 
     /**
      * 基本份数
      */
-    private double basicFenNmber;
+    private double basicFenNumber;
 
     /**
      * 底布单价
@@ -94,12 +94,12 @@ public class ProductionPlanVo{
     /**
      * 工艺单价
      */
-    private double gongyiPrice;
+    private double craftPrice;
 
     /**
      * 单价
      */
-    private double unitPrice;
+    private double price;
 
     /**
      * 金额