Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Module.Property/PropertyModule.cs

@@ -777,7 +777,7 @@ namespace Mall.Module.Property
                             UpdateDate = demodel.UpdateDate
                         }, trans);
 
-                        if (false)
+                        if (demodel.StockInState == 1)
                         {
                             //新增库存表数据
                             var ilist = supplies_InventoryRepository.GetList(new RB_Supplies_Inventory_Extend() { RB_Group_Id = demodel.RB_Group_Id, WarehouseId = demodel.WarehouseId, SuppliesId = item.SuppliesId });
@@ -849,12 +849,8 @@ namespace Mall.Module.Property
                     #region 新增耗材入库流程
 
                     //判断是否需要流程审批                    
-                    if (rmodel != null && rmodel.Enabled == 1)
+                    if (rmodel != null && rmodel.Enabled == 1 && tmodel != null)
                     {
-                        if (tmodel == null)
-                        {
-                            return true;
-                        }
                         var financeObj = new { StockInId = Id };
                         string sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
                         var resultInfo = new

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -101,22 +101,6 @@ namespace Mall.WebApi.Controllers.User
                     return ApiResult.Failed("请输入供应商返佣比例");
                 }
             }
-            //if (string.IsNullOrEmpty(demodel.ClientBankAccount.OpenBankName))
-            //{
-            //    return ApiResult.Failed("请填写开户行！");
-            //}
-            //if (string.IsNullOrEmpty(demodel.ClientBankAccount.AccountHolder))
-            //{
-            //    return ApiResult.Failed("请填写开户人！");
-            //}
-            //if (string.IsNullOrEmpty(demodel.ClientBankAccount.CardNum))
-            //{
-            //    return ApiResult.Failed("请填写卡号！");
-            //}
-            //if (supplierModule.ExistsClientAccount(demodel.ClientBankAccount.ID, demodel.ClientBankAccount.CardNum, 2, Convert.ToInt32(Config.RB_Branch_Id)))
-            //{
-            //    return ApiResult.Failed("卡号重复！");
-            //}
             demodel.TenantId = UserInfo.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
             demodel.CreateDate = DateTime.Now;
@@ -124,9 +108,7 @@ namespace Mall.WebApi.Controllers.User
             demodel.ClientBankAccount.RB_Branch_Id = Convert.ToInt32(Config.RB_Branch_Id);
             demodel.ClientBankAccount.RB_Group_Id = 2;
             demodel.ClientBankAccount.Type = Common.Enum.Finance.ClientTypeEnum.Other;
-
             demodel.ClientBankAccount.CreateBy = Convert.ToInt32(Config.NetworkDirector);
-
             if (demodel.ID > 0)
             {
                 demodel.BankAccountId = demodel.ClientBankAccount.ID;