1

Mall.Model/Extend/Product/RB_Goods_SpecificationPrice_Extend.cs

@@ -22,6 +22,10 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public object AttrList { get; set; }
         /// <summary>
+        /// 规格值
+        /// </summary>
+        public string AttrStr { get; set; }
+        /// <summary>
         /// 查询排序
         /// </summary>
         public int? SortNum { get; set; }

Mall.Model/Extend/User/RB_Supplier_Extend.cs

@@ -12,5 +12,9 @@ namespace Mall.Model.Extend.User
         /// 账户信息
         /// </summary>
         public RB_ClientBankAccount ClientBankAccount { get; set; }
+        /// <summary>
+        /// ids
+        /// </summary>
+        public string SupplierIds { get; set; }
     }
 }

Mall.Repository/Property/RB_Supplies_MaterialRepository.cs

@@ -78,7 +78,10 @@ left join rb_property_category pc on sm.CategoryId=pc.Id
             {
                 where += " and sm." + nameof(RB_Supplies_Material_Extend.SupplierName) + " like '%" + dmodel.SupplierName + "%'";
             }
-
+            if (dmodel.WareHouseId > 0) 
+            {
+                where += " and sm." + nameof(RB_Supplies_Material_Extend.WareHouseId) + "=" + dmodel.WareHouseId;
+            }
             if (dmodel.CategoryId > 0)
             {
                 where += " and sm." + nameof(RB_Supplies_Material_Extend.CategoryId) + "=" + dmodel.CategoryId;

Mall.Repository/User/RB_SupplierRepository.cs

@@ -61,6 +61,10 @@ namespace Mall.Repository.User
             {
                 where += $@" and a.{nameof(RB_Supplier.ID)}={dmodel.ID}";
             }
+            if (!string.IsNullOrEmpty(dmodel.SupplierIds)) 
+            {
+                where += $@" and a.{nameof(RB_Supplier.ID)} in({dmodel.SupplierIds})";
+            }
             string sql = $@"select * from {TableName} as A where {where} order by Id desc";
             return Get<RB_Supplier_Extend>(sql).ToList();
         }

Mall.WebApi/Controllers/Property/PropertyController.cs

@@ -93,8 +93,11 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull("分类格式有误");
             }
+            if (requestParm.ERPEmpId <= 0) {
+                return ApiResult.ParamIsNull("请传递关联ERP用户id");
+            }
 
-            bool flag = propertyModule.SetSyncGoodsToMaterial(WareHouseId, categoryIdList, requestParm.ERPEmpId, requestParm.ERPGroupId);
+            bool flag = propertyModule.SetSyncGoodsToMaterial(WareHouseId, categoryIdList, requestParm.ERPEmpId, requestParm.ERPBranchId, requestParm.ERPGroupId, requestParm.TenantId, requestParm.MallBaseId, requestParm.EmpId);
             if (flag)
             {
                 return ApiResult.Success();