diff --git a/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs b/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs
index 8a1f975..18fac8f 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs
@@ -65,12 +65,25 @@ namespace DOAN.Admin.WebApi.Controllers
}
- ///
- /// 查询报工详情
- ///
- ///
- ///
- [HttpGet("{Id}")]
+ ///
+ /// 查询工序列表
+ ///
+ ///
+ [HttpPost("baseworkprocesseslist")]
+ [ActionPermissionFilter(Permission = "proreportwork:baseworkprocesseslist")]
+ public IActionResult QueryBaseWorkProcesses()
+ {
+
+ var response = _ProReportworkService.GetBaseWorkProcesses();
+ return SUCCESS(response);
+ }
+
+ ///
+ /// 查询报工详情
+ ///
+ ///
+ ///
+ [HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "proreportwork:query")]
public IActionResult GetProReportwork(string Id)
{
diff --git a/DOAN.Admin.WebApi/Controllers/System/SysProfileController.cs b/DOAN.Admin.WebApi/Controllers/System/SysProfileController.cs
index a2f1204..6b62cf4 100644
--- a/DOAN.Admin.WebApi/Controllers/System/SysProfileController.cs
+++ b/DOAN.Admin.WebApi/Controllers/System/SysProfileController.cs
@@ -37,11 +37,24 @@ namespace DOAN.Admin.WebApi.Controllers.System
this.hostEnvironment = hostEnvironment;
}
- ///
- /// 个人中心用户信息获取
- ///
- ///
- [HttpGet]
+ ///
+ /// 获取全部用户
+ ///
+ ///
+ [HttpPost("list")]
+ [ActionPermissionFilter(Permission = "list")]
+ public IActionResult QuerySysUser()
+ {
+
+ var response = UserService.GetSysUser();
+ return SUCCESS(response);
+ }
+
+ ///
+ /// 个人中心用户信息获取
+ ///
+ ///
+ [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);
}
+
+
+
///
/// 修改用户
///
diff --git a/DOAN.Service/MES/Order/DeliveryScheduleService.cs b/DOAN.Service/MES/Order/DeliveryScheduleService.cs
index d6831d9..5334ec0 100644
--- a/DOAN.Service/MES/Order/DeliveryScheduleService.cs
+++ b/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 = SqlFunc.Subqueryable()
- .Where(w => w.FeedOrder == o.OrderNoMes).Sum(it=>it.ShipmentNum),
+ DeliveryQuantity= o.DeliveryQuantity,
+ DeliveryDate = o.DeliveryDate,
+ //DeliveryQuantity = SqlFunc.Subqueryable()
+ //.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()
.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)
diff --git a/DOAN.Service/MES/Order/OrderPurchaseService.cs b/DOAN.Service/MES/Order/OrderPurchaseService.cs
index c9f24e1..bd45f0f 100644
--- a/DOAN.Service/MES/Order/OrderPurchaseService.cs
+++ b/DOAN.Service/MES/Order/OrderPurchaseService.cs
@@ -79,7 +79,7 @@ namespace DOAN.Service.MES.order
{
var predicate = Expressionable.Create()
.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)
diff --git a/DOAN.Service/MES/Product/IService/IProReportworkService.cs b/DOAN.Service/MES/Product/IService/IProReportworkService.cs
index 545270c..90a49ec 100644
--- a/DOAN.Service/MES/Product/IService/IProReportworkService.cs
+++ b/DOAN.Service/MES/Product/IService/IProReportworkService.cs
@@ -11,7 +11,14 @@ namespace DOAN.Service.MES.product.IService
public interface IProReportworkService : IBaseService
{
List GetRoute();
- List GetProcessByRoute(int route_id);
+
+ ///
+ /// 查询全部工序
+ ///
+ ///
+ List GetBaseWorkProcesses();
+
+ List GetProcessByRoute(int route_id);
PagedInfo GetList(ProReportworkQueryDto parm);
ProReportwork01 GetInfo(string Id);
diff --git a/DOAN.Service/MES/Product/ProReportworkService.cs b/DOAN.Service/MES/Product/ProReportworkService.cs
index b322736..9e951a3 100644
--- a/DOAN.Service/MES/Product/ProReportworkService.cs
+++ b/DOAN.Service/MES/Product/ProReportworkService.cs
@@ -20,6 +20,15 @@ public class ProReportworkService : BaseService, IProReportwork
return Context.Queryable().ToList();
}
+
+ ///
+ /// 查询全部工序
+ ///
+ ///
+ public List GetBaseWorkProcesses()
+ {
+ return Context.Queryable().ToList();
+ }
public List GetProcessByRoute(int route_id)
{
return Context.Queryable()
@@ -110,8 +119,9 @@ public class ProReportworkService : BaseService, IProReportwork
{
var predicate = Expressionable.Create()
.AndIF(!string.IsNullOrEmpty(parm.Workorder), it => it.Workorder.Contains(parm.Workorder))
- .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.Contains(parm.Worker))
+ .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))
diff --git a/DOAN.ServiceCore/Services/IService/ISysUserService.cs b/DOAN.ServiceCore/Services/IService/ISysUserService.cs
index ce30ce5..75de537 100644
--- a/DOAN.ServiceCore/Services/IService/ISysUserService.cs
+++ b/DOAN.ServiceCore/Services/IService/ISysUserService.cs
@@ -6,7 +6,13 @@ namespace DOAN.ServiceCore.Services
{
public interface ISysUserService : IBaseService
{
- public PagedInfo SelectUserList(SysUserQueryDto user, PagerInfo pager);
+ ///
+ /// 获取全部用户
+ ///
+ ///
+ List GetSysUser();
+
+ public PagedInfo SelectUserList(SysUserQueryDto user, PagerInfo pager);
///
/// 通过用户ID查询用户
diff --git a/DOAN.ServiceCore/Services/SysUserService.cs b/DOAN.ServiceCore/Services/SysUserService.cs
index a322c94..be1fee1 100644
--- a/DOAN.ServiceCore/Services/SysUserService.cs
+++ b/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;
}
- ///
- /// 根据条件分页查询用户列表
- ///
- ///
- public PagedInfo SelectUserList(SysUserQueryDto user, PagerInfo pager)
+ ///
+ /// 获取全部用户
+ ///
+ ///
+ public List GetSysUser()
+ {
+ return Context.Queryable().ToList();
+ }
+
+ ///
+ /// 根据条件分页查询用户列表
+ ///
+ ///
+ public PagedInfo SelectUserList(SysUserQueryDto user, PagerInfo pager)
{
var exp = Expressionable.Create();
exp.AndIF(!string.IsNullOrEmpty(user.UserName), u => u.UserName.Contains(user.UserName));