问题处理

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -297,24 +297,28 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
 
         //获取物料价格
         BigDecimal materialPrice = BigDecimal.ZERO;
+        List<Long> mIds;
         if (ObjectUtil.isNotEmpty(id)) {
-            List<Long> mIds = productBomDetailService.listObject(ProductBomDetail::getProductId, q -> q
+            mIds = productBomDetailService.listObject(ProductBomDetail::getProductId, q -> q
                     .eq(ProductBomDetail::getProductId, id)
             );
+        } else {
+            mIds = Arrays.asList(productInfo.getRawMaterialId());
+        }
 
-            List<ProductInfo> list = this.list(q -> q.in(ProductInfo::getId, mIds));
-            for (ProductInfo materialInfo : list) {
-                if (ObjectUtil.equals(materialInfo.getClass(), 100)) {
-                    //原材料
-                    BigDecimal multiply = length.multiply(width).multiply(materialInfo.getPrice());
-                    materialPrice = materialPrice.add(multiply);
-                } else {
-                    //普通物料
-                    materialPrice = materialPrice.add(materialInfo.getPrice());
+        List<ProductInfo> list = this.list(q -> q.in(ProductInfo::getId, mIds));
+        for (ProductInfo materialInfo : list) {
+            if (ObjectUtil.equals(materialInfo.getClass(), 100)) {
+                //原材料
+                BigDecimal multiply = length.multiply(width).multiply(materialInfo.getPrice());
+                materialPrice = materialPrice.add(multiply);
+            } else {
+                //普通物料
+                materialPrice = materialPrice.add(materialInfo.getPrice());
 
-                }
             }
         }
+
         //获取工序价格
         List<ProcessesBo> processesList = baseMapper.getProcessesByTechnologyId(productInfo.getTechnologyId());
         BigDecimal processesPrice = processesList.stream().map(ProcessesBo::getCostPrice).reduce(BigDecimal.ZERO, BigDecimal::add);

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

@@ -167,7 +167,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
 
         //获取生产公司信息
         List<Long> companyIds = records.stream().map(ProductionOrderDetail::getCompanyId).collect(Collectors.toList());
-        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);
+        Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(null);
 
 
         for (ProductionOrderDetailVo record : records) {
@@ -206,7 +206,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
 
             //赋值生产公司名称
             record.setCompanyName(companyNameMap.get(record.getCompanyId()));
-            record.setCompanyName(companyNameMap.get(record.getContractCompanyId()));
+            record.setContractCompanyName(companyNameMap.get(record.getContractCompanyId()));
 
         }