1

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 (tmodel == null)
+                    if (rmodel != null && rmodel.Enabled == 1 && tmodel != null)
                     {
-                            return true;
-                        }
                         var financeObj = new { StockInId = Id };
                         string sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
                         var resultInfo = new