订单sku新增和导出增加成品品号字段

sd-business/src/main/java/com/sd/business/entity/order/po/OrderSku.java

@@ -149,4 +149,14 @@ public class OrderSku extends BasePo {
      */
     private String packageRemark;
 
+    /**
+     * E10成品品号
+     */
+    private String erpCode;
+
+    /**
+     * E10成品特征码
+     */
+    private String featureCode;
+
 }

sd-business/src/main/java/com/sd/business/entity/order/vo/OrderSkuExportVo.java

@@ -40,15 +40,30 @@ public class OrderSkuExportVo {
     @ExcelProperty(value = "bom品号", index = 2)
     private String bomSpecCode;
 
+
+    /**
+     * E10成品品号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "E10成品品号", index = 3)
+    private String erpCode;
+
+    /**
+     * E10成品特征码
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "特征码", index = 4)
+    private String featureCode;
+
     /**
      * 数量
      */
-    @ExcelProperty(value = "业务数量", index = 3)
+    @ExcelProperty(value = "业务数量", index = 5)
     private BigDecimal quantity;
 
     /**
      * sku总金额
      */
-    @ExcelProperty(value = "金额", index = 4)
+    @ExcelProperty(value = "金额", index = 6)
     private BigDecimal totalAmount;
 }

sd-business/src/main/java/com/sd/business/entity/sku/po/SkuSpec.java

@@ -56,26 +56,6 @@ public class SkuSpec extends BasePo {
     private String name;
 
     /**
-     * e10 品号
-     */
-    private String erpCode;
-
-    /**
-     * e10 特征码
-     */
-    private String featureCode;
-
-    /**
-     * e10 品号
-     */
-    private String erpCodeC2;
-
-    /**
-     * e10 特征码
-     */
-    private String featureCodeC2;
-
-    /**
      * 加工面板 字典:charge_item
      */
     private String machinedPanel;

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -1401,6 +1401,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
             orderSkuExportVo.setWlnCode(orderInfo.getWlnCode());
             orderSkuExportVo.setSkuSpecCode(skuSpec.getCode());
             orderSkuExportVo.setBomSpecCode(bomSpecBo.getBomSpecCode());
+            orderSkuExportVo.setErpCode(item.getErpCode());
+            orderSkuExportVo.setFeatureCode(item.getFeatureCode());
             orderSkuExportVo.setQuantity(item.getQuantity());
             orderSkuExportVo.setTotalAmount(subtotal.multiply(item.getQuantity()).add(orderPackagePrice));
             return orderSkuExportVo;