问题处理

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

@@ -119,7 +119,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         //权限过滤：产品-子公司看自己的产品，总公司看全部，物料没有限制
         if (Objects.equals(dto.getDefinition(), 1)) {
             Long companyId = SecurityUtils.getCompanyId();
-            if (!Objects.equals(companyId, 100)) {
+            if (!Objects.equals(companyId, 100L)) {
                 wrapper.eq(ProductInfo::getCompanyId, companyId);
             }
         }

hx-sale/src/main/java/com/fjhx/sale/entity/ext/po/ExtQuotationProductBom.java

@@ -70,4 +70,17 @@ public class ExtQuotationProductBom extends BasePo {
      */
     private Long quotationProductBomId;
 
+    /**
+     * 成本价
+     */
+    private BigDecimal costPrice;
+    /**
+     * 销售价
+     */
+    private BigDecimal salePrice;
+    /**
+     * 物料类型 1原材料 2包材辅材
+     */
+    private Integer type;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/quotation/po/QuotationProductBom.java

@@ -65,4 +65,18 @@ public class QuotationProductBom extends BasePo {
      */
     private String remark;
 
+    /**
+     * 成本价
+     */
+    private BigDecimal costPrice;
+    /**
+     * 销售价
+     */
+    private BigDecimal salePrice;
+    /**
+     * 物料类型 1原材料 2包材辅材
+     */
+    private Integer type;
+
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -83,7 +83,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 
         //权限过滤：库存-子公司看自己的,总公司看全部
         Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100)) {
+        if (!Objects.equals(companyId, 100L)) {
             wrapper.eq("w.company_id", companyId);
         }
 

hx-wms/src/main/java/com/fjhx/wms/service/warehouse/impl/WarehouseServiceImpl.java

@@ -39,7 +39,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse
 
         //权限过滤：仓库-子公司看自己的,总公司看全部
         Long companyId = SecurityUtils.getCompanyId();
-        if (!Objects.equals(companyId, 100)) {
+        if (!Objects.equals(companyId, 100L)) {
             wrapper.eq(Warehouse::getCompanyId, companyId);
         }