生产工单

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

@@ -65,4 +65,14 @@ public class ProductionWorkOrder extends BasePo {
      */
     private Date completeTime;
 
+    /**
+     * 类型 1单片 2批量
+     */
+    private Integer type;
+
+    /**
+     * 批量工单主id
+     */
+    private Long masterId;
+
 }

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

@@ -121,6 +121,7 @@ public class ProductionWorkOrderServiceImpl extends ServiceImpl<ProductionWorkOr
             BigDecimal quantity = orderSku.getQuantity();
             for (int i = 0; i < quantity.intValue(); i++) {
                 ProductionWorkOrder productionWorkOrder = new ProductionWorkOrder();
+                productionWorkOrder.setType(1);
                 productionWorkOrder.setCode(code + String.format("-%05d", num));
                 productionWorkOrder.setOrderId(orderId);
                 productionWorkOrder.setOrderSkuId(orderSku.getId());

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

@@ -549,6 +549,7 @@ public class StockPreparationServiceImpl implements StockPreparationService {
         for (OrderSku orderSku : list) {
             for (int i = 0; i < orderSku.getQuantity().intValue(); i++) {
                 ProductionWorkOrder productionWorkOrder = new ProductionWorkOrder();
+                productionWorkOrder.setType(1);
                 productionWorkOrder.setCode(code + String.format("-%05d", num));
                 productionWorkOrder.setOrderId(id);
                 productionWorkOrder.setOrderSkuId(orderSku.getId());

sd-business/src/main/java/com/sd/business/service/purchase/impl/PurchaseServiceImpl.java

@@ -32,7 +32,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -166,6 +169,8 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
     @Override
     public void edit(PurchaseDto purchaseDto) {
 
+        purchaseDto.setCode(null);
+
         // 保存采购合同
         this.updateById(purchaseDto);