卢江海代码更改

DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs

@@ -65,12 +65,25 @@ namespace DOAN.Admin.WebApi.Controllers
         }
 
 
-        /// <summary>
+		/// <summary>
-        /// 查询报工详情
+		/// 查询工序列表
-        /// </summary>
+		/// </summary>
-        /// <param name="Id"></param>
+		/// <returns></returns>
-        /// <returns></returns>
+		[HttpPost("baseworkprocesseslist")]
-        [HttpGet("{Id}")]
+		[ActionPermissionFilter(Permission = "proreportwork:baseworkprocesseslist")]
+		public IActionResult QueryBaseWorkProcesses()
+		{
+			
+			var response = _ProReportworkService.GetBaseWorkProcesses();
+			return SUCCESS(response);
+		}
+
+		/// <summary>
+		/// 查询报工详情
+		/// </summary>
+		/// <param name="Id"></param>
+		/// <returns></returns>
+		[HttpGet("{Id}")]
         [ActionPermissionFilter(Permission = "proreportwork:query")]
         public IActionResult GetProReportwork(string Id)
         {

DOAN.Admin.WebApi/Controllers/System/SysProfileController.cs

@@ -37,11 +37,24 @@ namespace DOAN.Admin.WebApi.Controllers.System
             this.hostEnvironment = hostEnvironment;
         }
 
-        /// <summary>
+		/// <summary>
-        /// 个人中心用户信息获取
+		/// 获取全部用户
-        /// </summary>
+		/// </summary>
-        /// <returns></returns>
+		/// <returns></returns>
-        [HttpGet]
+		[HttpPost("list")]
+		[ActionPermissionFilter(Permission = "list")]
+		public IActionResult QuerySysUser()
+		{
+
+			var response = UserService.GetSysUser();
+			return SUCCESS(response);
+		}
+
+		/// <summary>
+		/// 个人中心用户信息获取
+		/// </summary>
+		/// <returns></returns>
+		[HttpGet]
         public IActionResult Profile()
         {
             long userId = HttpContext.GetUId();
@@ -55,6 +68,9 @@ namespace DOAN.Admin.WebApi.Controllers.System
             return SUCCESS(new { user, roles, postGroup }, TIME_FORMAT_FULL);
         }
 
+
+
+
         /// <summary>
         /// 修改用户
         /// </summary>

DOAN.Service/MES/Order/DeliveryScheduleService.cs

@@ -45,9 +45,11 @@ namespace DOAN.Service.MES.Order
                     MaterialName = o.MaterialName,
                     MaterialCode = o.MaterialCode,
                     DemandQuantity = o.DemandQuantity,
-                    DeliveryDate = o.DeliveryDate,
+					DeliveryQuantity= o.DeliveryQuantity,
-                    DeliveryQuantity = SqlFunc.Subqueryable<ProWorkorder>()
+					DeliveryDate = o.DeliveryDate,
-                    .Where(w => w.FeedOrder == o.OrderNoMes).Sum(it=>it.ShipmentNum),
+                    //DeliveryQuantity = SqlFunc.Subqueryable<ProWorkorder>()
+                    //.Where(w => w.FeedOrder == o.OrderNoMes).Sum(it=>it.ShipmentNum),
+
                     StartDate = o.StartDate,
                     EndDate = o.EndDate,
                     Orderindicator = o.Orderindicator,
@@ -77,7 +79,7 @@ namespace DOAN.Service.MES.Order
         {
             var predicate = Expressionable.Create<OrderPurchase, ProWorkorder>()
                 .AndIF(!string.IsNullOrEmpty(parm.OrderNoMes), (o, w) => o.OrderNoMes.Contains(parm.OrderNoMes))
-                .AndIF(!string.IsNullOrEmpty(parm.PurchaseOrderErp), (o, w) => o.OrderNoMes.Contains(parm.PurchaseOrderErp))
+                .AndIF(!string.IsNullOrEmpty(parm.PurchaseOrderErp), (o, w) => o.PurchaseOrderErp.Contains(parm.PurchaseOrderErp))
                 .AndIF(parm.ImportDate != null && parm.ImportDate[0] > DateTime.MinValue, (o, w) => o.ImportDate >= parm.ImportDate[0])
                 .AndIF(parm.ImportDate != null && parm.ImportDate[1] > DateTime.MinValue, (o, w) => o.ImportDate <= parm.ImportDate[1])
                 .AndIF(parm.Orderindicator>-1,(o,w)=>o.Orderindicator==parm.Orderindicator)

DOAN.Service/MES/Order/OrderPurchaseService.cs

@@ -79,7 +79,7 @@ namespace DOAN.Service.MES.order
         {
             var predicate = Expressionable.Create<OrderPurchase>()
                 .AndIF(!string.IsNullOrEmpty(parm.OrderNoMes), it => it.OrderNoMes.Contains(parm.OrderNoMes))
-                .AndIF(!string.IsNullOrEmpty(parm.PurchaseOrderErp), it => it.OrderNoMes.Contains(parm.PurchaseOrderErp))
+                .AndIF(!string.IsNullOrEmpty(parm.PurchaseOrderErp), it => it.PurchaseOrderErp.Contains(parm.PurchaseOrderErp))
                 .AndIF(parm.ImportDate != null && parm.ImportDate[0] > DateTime.MinValue, it => it.ImportDate >= parm.ImportDate[0])
                 .AndIF(parm.ImportDate != null && parm.ImportDate[1] > DateTime.MinValue, it => it.ImportDate <= parm.ImportDate[1])
                 .AndIF(parm.Orderindicator > -1, it => it.Orderindicator == parm.Orderindicator)

DOAN.Service/MES/Product/IService/IProReportworkService.cs

@@ -11,7 +11,14 @@ namespace DOAN.Service.MES.product.IService
     public interface IProReportworkService : IBaseService<ProReportwork01>
     {
         List<BaseWorkRoute> GetRoute();
-        List<BaseWorkProcesses>  GetProcessByRoute(int route_id);
+
+		/// <summary>
+		/// 查询全部工序
+		/// </summary>
+		/// <returns></returns>
+		List<BaseWorkProcesses> GetBaseWorkProcesses();
+
+		List<BaseWorkProcesses>  GetProcessByRoute(int route_id);
         PagedInfo<ProReportworkDto> GetList(ProReportworkQueryDto parm);
 
         ProReportwork01 GetInfo(string Id);

DOAN.Service/MES/Product/ProReportworkService.cs

@@ -20,6 +20,15 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
         return Context.Queryable<BaseWorkRoute>().ToList();
     
     }
+
+    /// <summary>
+    /// 查询全部工序
+    /// </summary>
+    /// <returns></returns>
+    public List<BaseWorkProcesses> GetBaseWorkProcesses()
+    {
+		return Context.Queryable<BaseWorkProcesses>().ToList();
+	}
    public  List<BaseWorkProcesses> GetProcessByRoute(int route_id)
     {
        return  Context.Queryable<BaseRelWorkRouteProcesses>()
@@ -110,8 +119,9 @@ public class ProReportworkService : BaseService<ProReportwork01>, IProReportwork
     {
         var predicate = Expressionable.Create<ProReportwork01>()
                 .AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder))
-                .AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker))
+				//.AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker.Contains(parm.Worker))
-                .AndIF(parm.RouteId>0, it => it.RouteId == parm.RouteId)
+				.AndIF(!string.IsNullOrEmpty(parm.Worker), it => it.Worker==parm.Worker)
+				.AndIF(parm.RouteId>0, it => it.RouteId == parm.RouteId)
                 .AndIF(parm.ProcessId > 0, it => it.ProcessId == parm.ProcessId)
                 .AndIF(parm.JobDateTime != null && parm.JobDateTime[0] > DateTime.MinValue, it => it.JobDateTime >= parm.JobDateTime[0])
                 .AndIF(parm.JobDateTime != null && parm.JobDateTime[1] > DateTime.MinValue, it => it.JobDateTime <= parm.JobDateTime[1].AddDays(1))

DOAN.ServiceCore/Services/IService/ISysUserService.cs

@@ -6,7 +6,13 @@ namespace DOAN.ServiceCore.Services
 {
     public interface ISysUserService : IBaseService<SysUser>
     {
-        public PagedInfo<SysUser> SelectUserList(SysUserQueryDto user, PagerInfo pager);
+        /// <summary>
+        /// 获取全部用户
+        /// </summary>
+        /// <returns></returns>
+        List<SysUser> GetSysUser();
+
+		public PagedInfo<SysUser> SelectUserList(SysUserQueryDto user, PagerInfo pager);
 
         /// <summary>
         /// 通过用户ID查询用户

DOAN.ServiceCore/Services/SysUserService.cs

@@ -7,6 +7,7 @@ using DOAN.Model;
 using DOAN.Model.System;
 using DOAN.Model.System.Dto;
 using DOAN.Repository;
+using DOAN.Model.MES.base_;
 
 namespace DOAN.ServiceCore.Services
 {
@@ -33,11 +34,20 @@ namespace DOAN.ServiceCore.Services
             UserMsgService = userMsgService;
         }
 
-        /// <summary>
+		/// <summary>
-        /// 根据条件分页查询用户列表
+		/// 获取全部用户
-        /// </summary>
+		/// </summary>
-        /// <returns></returns>
+		/// <returns></returns>
-        public PagedInfo<SysUser> SelectUserList(SysUserQueryDto user, PagerInfo pager)
+		public List<SysUser> GetSysUser()
+		{
+			return Context.Queryable<SysUser>().ToList();
+		}
+
+		/// <summary>
+		/// 根据条件分页查询用户列表
+		/// </summary>
+		/// <returns></returns>
+		public PagedInfo<SysUser> SelectUserList(SysUserQueryDto user, PagerInfo pager)
         {
             var exp = Expressionable.Create<SysUser>();
             exp.AndIF(!string.IsNullOrEmpty(user.UserName), u => u.UserName.Contains(user.UserName));