采购重新发起问题处理

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/po/PurchaseDetail.java

@@ -127,4 +127,21 @@ public class PurchaseDetail extends BasePo {
     @TableField(exist = false)
     private BigDecimal defectiveQuantity;
 
+    /**
+     * 产品定义
+     */
+    @TableField(exist = false)
+    private Integer productDefinition;
+
+    /**
+     * 申购数量
+     */
+    @TableField(exist = false)
+    private BigDecimal subscribeQuantity;
+    /**
+     * 已采购数量
+     */
+    @TableField(exist = false)
+    private BigDecimal purchaseQuantity;
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -335,6 +335,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
                     p.setProductUnit(vo.getUnit());
                     p.setProductSpec(vo.getSpec());
                     p.setProductCustomCode(vo.getCustomCode());
+                    p.setProductDefinition(vo.getDefinition());
                     //赋值次品数量
                     List<Stock> stockList = stockMap.get(p.getBussinessId());
                     if (ObjectUtils.isNotEmpty(stockList)) {
@@ -347,6 +348,20 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
                         }
                         p.setDefectiveQuantity(defectiveQuantity);
                     }
+                    //赋值申购数量
+                    SubscribeDetail subscribeDetail1 = subscribeDetailService.getById(p.getSubscribeDetailId());
+                    if (ObjectUtils.isNotEmpty(subscribeDetail1)) {
+                        p.setSubscribeQuantity(subscribeDetail1.getCount());
+                    }
+                    //赋值已采购数量
+                    List<PurchaseDetail> list = purchaseDetailService.list(q -> q.eq(PurchaseDetail::getSubscribeDetailId, p.getSubscribeDetailId()));
+                    if (ObjectUtils.isNotEmpty(list)) {
+                        BigDecimal count = list.stream()
+                                .map(PurchaseDetail::getCount)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                        p.setPurchaseQuantity(count);
+                    }
+
                 }
             }
         }

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlowByWdly.java

@@ -25,7 +25,7 @@ import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.service.contract.ContractProductService;
-import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;