提交代码

Property.Repository/Mall/RB_ERP_AuthorizeRepository.cs

@@ -56,6 +56,7 @@ LEFT JOIN rb_tenant as e on e.TenantId = a.TenantId where 1=1");
                     builder.Append($" AND a.{nameof(RB_ERP_Authorize_Extend.ERPGroupId)}={query.ERPGroupId}");
                 }
             }
+            builder.Append($"  order by a.{nameof(RB_WarehouseOut_Apply_Extend.ID)} desc");
             return GetPage<RB_ERP_Authorize_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
         }
 

Property.Repository/Mall/RB_WarehouseOut_ApplyRepository.cs

@@ -54,12 +54,14 @@ LEFT JOIN (SELECT ApplyId,COUNT(*) as Delivered from rb_warehouseout_goods where
                 {
                     builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.ApplyStatus)}={query.ApplyStatus}");
                 }
-                if (query.OutStatus > 0)
+                if (query.OutStatus > -1)
                 {
                     builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.OutStatus)}={query.OutStatus}");
                 }
-               
+
             }
+
+            builder.Append($"  order by a.{nameof(RB_WarehouseOut_Apply_Extend.ID)} desc");
             return GetPage<RB_WarehouseOut_Apply_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
         }
 
@@ -95,7 +97,7 @@ LEFT JOIN (SELECT ApplyId,COUNT(*) as Delivered from rb_warehouseout_goods where
                 {
                     builder.Append($" AND a.{nameof(RB_WarehouseOut_Apply_Extend.ApplyStatus)}={query.ApplyStatus}");
                 }
-                
+
             }
             return Get<RB_WarehouseOut_Apply_Extend>(builder.ToString()).ToList();
         }

Property.Repository/Supplies/RB_Supplies_StockOutRepository.cs

@@ -44,7 +44,10 @@ namespace Property.Repository
             {
                 where += " and sm." + nameof(RB_Supplies_Material.Name) + " like '%" + dmodel.SuppliesName.Trim() + "%'";
             }
-
+            if (dmodel.Id > 0)
+            {
+                where += " and ss." + nameof(RB_Supplies_StockOut_Extend.Id) + "=" + dmodel.Id;
+            }
             if (dmodel.WarehouseId > 0) {
                 where += " and ss." + nameof(RB_Supplies_StockOut_Extend.WarehouseId) + "=" + dmodel.WarehouseId;
             }

Property.WebApi/Controllers/Mall/WarehouseOutController.cs

@@ -296,7 +296,7 @@ namespace Property.WebApi.Controllers.Mall
             RB_Supplies_StockOut_Extend demodel = new RB_Supplies_StockOut_Extend();//出库申请表，等会儿组装
 
             demodel.WarehouseId = applyModel.WarehouseId;
-            demodel.EmployeeId = applyModel.CreateBy;
+            demodel.EmployeeId = oldModel.CreateBy;
             demodel.CreateBy = userInfo.EmployeeId;
             demodel.StockOutDate = NowStr;
             demodel.StockOutState = REBORN.Common.Enum.StockOutStatusEnum.StockOut;