采购

Mall.Model/Entity/Property/RB_Procurement.cs

@@ -129,5 +129,14 @@ namespace Mall.Model.Entity.Property
         /// 财务单据id
         /// </summary>
         public int? FinanceId { get; set; }
+
+        /// <summary>
+        /// 供应商id
+        /// </summary>
+        public int? SupplierId { get; set; }
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string SupplierName { get; set; }
     }
 }
\ No newline at end of file

Mall.Model/Extend/Property/RB_Procurement_Detail_Extend.cs

@@ -29,5 +29,9 @@ namespace Mall.Model.Extend.Property
         /// /틔id
         /// </summary>
         public int GoodsId { get; set; }
+        /// <summary>
+        /// 구鬧
+        /// </summary>
+        public string GoodsRemark { get; set; }
     }
 }
\ No newline at end of file

Mall.Model/Extend/Property/RB_Procurement_Extend.cs

@@ -40,5 +40,9 @@ namespace Mall.Model.Extend.Property
         /// 明细列表
         /// </summary>
         public List<RB_Procurement_Detail_Extend> DetailList { get; set; }
+        /// <summary>
+        /// 账户类型
+        /// </summary>
+        public int IsPublic { get; set; }
     }
 }
\ No newline at end of file

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -63,6 +63,9 @@ namespace Mall.Repository.Product
             if (dmodel.IsProxy > 0) {
                 where += $@" and g.{nameof(RB_Goods_Extend.IsProxy)}={dmodel.IsProxy}";
             }
+            if (dmodel.SupplierId > 0) {
+                where += $@" and g.{nameof(RB_Goods_Extend.SupplierId)}={dmodel.SupplierId}";
+            }
 
             string orderBy = " g.CreateDate desc";
             if (dmodel.OrderBy == 1)

Mall.WebApi/Controllers/Property/PropertyController.cs

@@ -43,6 +43,8 @@ namespace Mall.WebApi.Controllers.MallBase
             }
 
             demodel.RB_Group_Id = requestParm.ERPGroupId;
+            demodel.TenantId = requestParm.TenantId;
+            demodel.MallBaseId = requestParm.MallBaseId;
             var list = propertyModule.GetProcurementPageList(pagelist.pageIndex, pagelist.pageSize, demodel, out long count);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
@@ -92,7 +94,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 return ApiResult.ParamIsNull("请传递参数");
             }
 
-            var model = propertyModule.GetProcurementInfo(ProcurementId, requestParm.TenantId, requestParm.MallBaseId);
+            var model = propertyModule.GetProcurementInfo(ProcurementId, requestParm.TenantId, requestParm.MallBaseId, requestParm.ERPGroupId);
             return ApiResult.Success("",new {
                 model.Id,
                 model.WareHouseId,
@@ -171,10 +173,19 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull("请传递参数");
             }
+            if (requestParm.ERPGroupId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递参数");
+            }
             if (requestParm.EmpId <= 0) {
                 return ApiResult.ParamIsNull("请传递参数");
             }
-
+            if (demodel.IsPublic < 0) {
+                return ApiResult.ParamIsNull("请选择账户类型");
+            }
+            if ((demodel.SupplierId ?? 0) <= 0) {
+                return ApiResult.ParamIsNull("请传递供应商");
+            }
             if ((demodel.WareHouseId ?? 0) <= 0) {
                 return ApiResult.ParamIsNull("请传递仓库id");
             }

Mall.WebApi/appsettings.json

@@ -44,8 +44,8 @@
   "ExpendBranchId": 49, //财务支出创建人公司
   "ExpendDepartment": 331,
   "RebornDMC": "reborn_dmc",
-  "IncomeFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallIn",
-  "PaymentFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallOut",
+  "IncomeFinanceApi": "http://testapi.oytour.com/api/Mall/InsertFinanceBatchForMallIn",
+  "PaymentFinanceApi": "http://testapi.oytour.com/api/Mall/InsertFinanceBatchForMallOut",
   "FinanceKey": "FinanceMallInsertToERPViitto2020",
   "SettlementRate": "0.60",
   //"RedisSetting": {
@@ -65,7 +65,13 @@
     "TenantId": 1,
     "MallBaseId": 1,
     "RemitTypeId": 10,
-    "RemitAccountId": 3012
+    "RemitAccountId": 3012,
+    "ProcurementCTId": 224, //以下采购
+    "ProcurementFWId": 127,
+    "ProcurementDirector": 1756,
+    "ProcurementBranchId": 49,
+    "ProcurementDepartment": 331,
+    "ProcurementCurrencyId": 1
   },
   "InitializeImages": {
     "GradeEntranceImage": "1234566778"