合同BOM数量不需要乘产品数量

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -364,8 +364,9 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         Map<Long, AvailableStockBo> inOutBoMap = new ConcurrentHashMap<>();
         for (ContractProductBom bom : cpBList) {
             Long materialId = bom.getMaterialId();
-            ContractProduct contractProduct = productMap.get(bom.getContractProductId());
-            BigDecimal multiply = bom.getQuantity().multiply(contractProduct.getQuantity());
+//            ContractProduct contractProduct = productMap.get(bom.getContractProductId());
+//            BigDecimal multiply = bom.getQuantity().multiply(contractProduct.getQuantity());
+            BigDecimal multiply = bom.getQuantity();
 
             //合并相同物料
             AvailableStockBo inOutBo = inOutBoMap.get(materialId);

hx-sale/src/main/resources/mapper/contract/ContractProductBomMapper.xml

@@ -5,7 +5,8 @@
             resultType="com.fjhx.sale.entity.contract.vo.ContractProductBomVo">
         SELECT cpb.contract_id,
         cpb.material_id,
-        sum(cpb.quantity * cp.quantity) AS quantity,
+        -- sum(cpb.quantity * cp.quantity) AS quantity,
+        sum(cpb.quantity) AS quantity,
         cpb.*
         FROM contract_product_bom cpb
         LEFT JOIN contract_product cp ON cpb.contract_product_id = cp.id