浏览代码

生产工单

24282 1 年之前
父节点
当前提交
88936b3867

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

@@ -38,6 +38,7 @@ import com.sd.business.entity.order.po.*;
 import com.sd.business.entity.order.vo.*;
 import com.sd.business.entity.price.po.PriceBillingStandard;
 import com.sd.business.entity.price.po.PriceBillingStandardDetail;
+import com.sd.business.entity.production.po.ProductionWorkOrder;
 import com.sd.business.entity.sku.po.SkuSpec;
 import com.sd.business.entity.statement.po.StatementOfAccount;
 import com.sd.business.entity.statement.vo.StatementOrderClassifyTotalCountVo;
@@ -1034,6 +1035,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         orderSkuBomService.remove(q -> q.eq(OrderSkuBom::getOrderId, id));
         orderPackageBomService.remove(q -> q.eq(OrderPackageBom::getOrderId, id));
         orderSkuProductionCostService.remove(q -> q.eq(OrderSkuProductionCost::getOrderId, id));
+        productionWorkOrderService.remove(q -> q.eq(ProductionWorkOrder::getOrderId, id));
 
         ObsFileUtil.removeFile(id);
     }

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

@@ -18,6 +18,7 @@ import com.sd.business.mapper.production.ProductionWorkOrderMapper;
 import com.sd.business.service.order.OrderService;
 import com.sd.business.service.order.OrderSkuService;
 import com.sd.business.service.production.ProductionWorkOrderService;
+import com.sd.business.service.sku.SkuSpecService;
 import com.sd.mq.enums.WorkOrderStatusEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,6 +48,9 @@ public class ProductionWorkOrderServiceImpl extends ServiceImpl<ProductionWorkOr
     @Autowired
     private OrderSkuService orderSkuService;
 
+    @Autowired
+    private SkuSpecService skuSpecService;
+
     @Override
     public Page<ProductionWorkOrderVo> getPage(ProductionWorkOrderSelectDto dto) {
         IWrapper<ProductionWorkOrder> wrapper = getWrapper();
@@ -117,6 +121,10 @@ public class ProductionWorkOrderServiceImpl extends ServiceImpl<ProductionWorkOr
             }
         }
 
+        skuSpecService.attributeAssign(productionWorkOrderList, ProductionWorkOrder::getSkuSpecId, (item, skuSpec) -> {
+            item.setMachinedPanel(skuSpec.getMachinedPanel());
+        });
+
         saveBatch(productionWorkOrderList);
     }
 

+ 2 - 1
sd-business/src/main/java/com/sd/business/service/production/impl/StockPreparationServiceImpl.java

@@ -215,6 +215,8 @@ public class StockPreparationServiceImpl implements StockPreparationService {
         });
 
         if (!productionWorkOrderList.isEmpty()) {
+            skuSpecService.attributeAssign(productionWorkOrderList, ProductionWorkOrder::getSkuSpecId,
+                    (item, skuSpec) -> item.setMachinedPanel(skuSpec.getMachinedPanel()));
             productionWorkOrderService.saveBatch(productionWorkOrderList);
         }
 
@@ -431,7 +433,6 @@ public class StockPreparationServiceImpl implements StockPreparationService {
      */
     private void addWorkOrder(Long id, String code, List<OrderSku> list, List<ProductionWorkOrder> productionWorkOrderList) {
 
-
         int num = 1;
 
         for (OrderSku orderSku : list) {