删除多余字段、 sku关联主材bom与打印纸bom

sd-business/src/main/java/com/sd/business/entity/production/po/ProductionWorkOrder.java

@@ -51,11 +51,6 @@ public class ProductionWorkOrder extends BasePo {
     private Long bomSpecId;
 
     /**
-     * 加工面板 字典:charge_item
-     */
-    private String machinedPanel;
-
-    /**
      * 状态 0待投产 1已扫描 2生产中 3生产完成 4生产异常 5重新排单
      */
     private Integer status;

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

@@ -41,11 +41,6 @@ public class SkuSpec extends BasePo {
     private Long artworkLibraryId;
 
     /**
-     * 规格图
-     */
-    private String specImgUrl;
-
-    /**
      * 品号
      */
     private String code;
@@ -81,11 +76,6 @@ public class SkuSpec extends BasePo {
     private String featureCodeC2;
 
     /**
-     * 加工面板 字典:charge_item
-     */
-    private String machinedPanel;
-
-    /**
      * 长 cm
      */
     private BigDecimal length;
@@ -106,11 +96,16 @@ public class SkuSpec extends BasePo {
     private BigDecimal netWeight;
 
     /**
-     * bom id
+     * 主材bom id
      */
     private Long bomSpecId;
 
     /**
+     * 打印纸bom id
+     */
+    private Long printingPaperBomSpecId;
+
+    /**
      * 描述
      */
     private String remark;

sd-business/src/main/java/com/sd/business/entity/sku/vo/SkuSpecVo.java

@@ -17,16 +17,26 @@ import java.util.List;
 public class SkuSpecVo extends SkuSpec {
 
     /**
-     * bom规格编码
+     * 主材bom规格编码
      */
     private String bomSpecCode;
 
     /**
-     * bom规格名称
+     * 主材bom规格名称
      */
     private String bomSpecName;
 
     /**
+     * 打印纸bom规格编码
+     */
+    private String printingPaperBomSpecCode;
+
+    /**
+     * 打印纸bom规格名称
+     */
+    private String printingPaperBomSpecName;
+
+    /**
      * 设计图
      */
     private String designImgUrl;

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

@@ -783,6 +783,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         skuSpecPriceVo.setPackingLabor(BigDecimal.ZERO);
         skuSpecPriceVo.setManagementFee(BigDecimal.ZERO);
 
+        // TODO 根据收费项目赋值价格
         for (PriceBillingStandardDetail priceBillingStandardDetail : priceBillingStandardDetailList) {
             String chargeItem = priceBillingStandardDetail.getChargeItem();
             BigDecimal chargePrice = ObjectUtil.defaultIfNull(priceBillingStandardDetail.getChargePrice(), BigDecimal.ZERO);
@@ -800,12 +801,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     skuSpecPriceVo.setManagementFee(chargePrice);
                     break;
                 default:
-                    if (Objects.equals(chargeItem, skuSpec.getMachinedPanel())
-                            && dto.getQuantity().compareTo(priceBillingStandardDetail.getSectionMin()) >= 0
-                            && dto.getQuantity().compareTo(priceBillingStandardDetail.getSectionMax()) < 0) {
-                        skuSpecPriceVo.setCustomProcessingFee(chargePrice);
-                        skuSpecPriceVo.setCustomProcessingType(chargeItem);
-                    }
+                    //if (Objects.equals(chargeItem, skuSpec.getMachinedPanel())
+                    //        && dto.getQuantity().compareTo(priceBillingStandardDetail.getSectionMin()) >= 0
+                    //        && dto.getQuantity().compareTo(priceBillingStandardDetail.getSectionMax()) < 0) {
+                    //    skuSpecPriceVo.setCustomProcessingFee(chargePrice);
+                    //    skuSpecPriceVo.setCustomProcessingType(chargeItem);
+                    //}
             }
         }
 

sd-business/src/main/java/com/sd/business/service/production/impl/ProductionWorkOrderServiceImpl.java

@@ -134,10 +134,6 @@ public class ProductionWorkOrderServiceImpl extends ServiceImpl<ProductionWorkOr
             }
         }
 
-        skuSpecService.attributeAssign(productionWorkOrderList, ProductionWorkOrder::getSkuSpecId, (item, skuSpec) -> {
-            item.setMachinedPanel(skuSpec.getMachinedPanel());
-        });
-
         saveBatch(productionWorkOrderList);
 
         sendMq(productionWorkOrderList);

sd-business/src/main/java/com/sd/business/service/sku/impl/SkuServiceImpl.java

@@ -110,10 +110,13 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
                 .selectAs(ArtworkLibrary::getFileUrl, SkuSpecVo::getSharedFolder)
                 .selectAs(BomSpec::getCode, SkuSpecVo::getBomSpecCode)
                 .selectAs(BomSpec::getName, SkuSpecVo::getBomSpecName)
+                .selectAs("bs", BomSpec::getCode, SkuSpecVo::getPrintingPaperBomSpecCode)
+                .selectAs("bs", BomSpec::getName, SkuSpecVo::getPrintingPaperBomSpecName)
 
                 .from(SkuSpec.class)
                 .leftJoin(ArtworkLibrary.class, SkuSpec::getArtworkLibraryId)
                 .leftJoin(BomSpec.class, SkuSpec::getBomSpecId)
+                .leftJoin("bs", BomSpec.class, SkuSpec::getPrintingPaperBomSpecId)
 
                 .eq(SkuSpec::getSkuId, id)
                 .list();

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -580,6 +580,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
             return;
         }
 
+        // TODO 根据收费项目赋值价格
         for (PriceBillingStandardDetail priceBillingStandardDetail : priceBillingStandardDetailList) {
             String chargeItem = priceBillingStandardDetail.getChargeItem();
             BigDecimal chargePrice = priceBillingStandardDetail.getChargePrice();
@@ -595,12 +596,12 @@ public class WlnOrderServiceImpl implements WlnOrderService {
                     orderSku.setManagementFee(chargePrice);
                     break;
                 default:
-                    if (Objects.equals(chargeItem, skuSpec.getMachinedPanel())
-                            && orderSku.getQuantity().compareTo(priceBillingStandardDetail.getSectionMin()) >= 0
-                            && orderSku.getQuantity().compareTo(priceBillingStandardDetail.getSectionMax()) < 0) {
-                        orderSku.setCustomProcessingType(chargeItem);
-                        orderSku.setCustomProcessingFee(chargePrice);
-                    }
+                    //if (Objects.equals(chargeItem, skuSpec.getMachinedPanel())
+                    //        && orderSku.getQuantity().compareTo(priceBillingStandardDetail.getSectionMin()) >= 0
+                    //        && orderSku.getQuantity().compareTo(priceBillingStandardDetail.getSectionMax()) < 0) {
+                    //    orderSku.setCustomProcessingType(chargeItem);
+                    //    orderSku.setCustomProcessingFee(chargePrice);
+                    //}
             }
         }
     }