Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES
This commit is contained in:
commit
484518ebd6
@ -1,97 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using SqlSugar;
|
||||
namespace ZR.Model.mes.md
|
||||
{
|
||||
/// <summary>
|
||||
/// 物料清单
|
||||
///</summary>
|
||||
[SugarTable("md_bom")]
|
||||
public class MdBom
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 流水号
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
|
||||
public int Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 父产品id
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "parent_product_id")]
|
||||
public int? ParentProductId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 产品编号
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "product_code")]
|
||||
public string ProductCode { get; set; }
|
||||
/// <summary>
|
||||
/// 产品名称
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "product_name")]
|
||||
public string ProductName { get; set; }
|
||||
/// <summary>
|
||||
/// 零件类型
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "product_type")]
|
||||
public string ProductType { get; set; }
|
||||
/// <summary>
|
||||
/// 安全库存
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "safety_stock")]
|
||||
public int? SafetyStock { get; set; }
|
||||
/// <summary>
|
||||
/// 位置/来源
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "product_position")]
|
||||
public string ProductPosition { get; set; }
|
||||
/// <summary>
|
||||
/// 需求数量
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "requireNum")]
|
||||
public int? RequireNum { get; set; }
|
||||
/// <summary>
|
||||
/// 单位id
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "unit_id")]
|
||||
public int? UnitId { get; set; }
|
||||
/// <summary>
|
||||
/// 租户号
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "TENANT_ID")]
|
||||
public string TenantId { get; set; }
|
||||
/// <summary>
|
||||
/// 乐观锁
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "REVISION")]
|
||||
public int? Revision { get; set; }
|
||||
/// <summary>
|
||||
/// 创建人
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "CREATED_BY")]
|
||||
public string CreatedBy { get; set; }
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "CREATED_TIME")]
|
||||
public DateTime? CreatedTime { get; set; }
|
||||
/// <summary>
|
||||
/// 更新人
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "UPDATED_BY")]
|
||||
public string UpdatedBy { get; set; }
|
||||
/// <summary>
|
||||
/// 更新时间
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "UPDATED_TIME")]
|
||||
public DateTime? UpdatedTime { get; set; }
|
||||
|
||||
|
||||
[SqlSugar.SugarColumn(IsIgnore = true)]
|
||||
public List<MdBom> Child { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -33,18 +33,18 @@ namespace ZR.Service.mes.qc
|
||||
{
|
||||
int totalNum = 0;
|
||||
var predicate = Expressionable.Create<QcQualityStatisticsFirst>()
|
||||
.AndIF(starttime>new DateTime(2023, 1, 1, 0,0, 0), it => it.StartTime>=starttime)
|
||||
.AndIF(endTime > new DateTime(2023, 1, 1, 0,0, 0), it => it.EndTime<=endTime)
|
||||
.AndIF(!string.IsNullOrEmpty(workorderid),it=>it.Equals(workorderid))
|
||||
.AndIF(!string.IsNullOrEmpty(partnumber),it=>it.Equals(partnumber))
|
||||
.AndIF(!string.IsNullOrEmpty(team),it=>it.Equals(team))
|
||||
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
|
||||
.AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.EndTime <= endTime)
|
||||
.AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Equals(workorderid))
|
||||
.AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Equals(partnumber))
|
||||
.AndIF(!string.IsNullOrEmpty(team), it => it.Team.Equals(team))
|
||||
.AndIF(!string.IsNullOrEmpty(product_description), it => it.ProductDescription.Contains(product_description))
|
||||
.ToExpression();
|
||||
|
||||
|
||||
List<QcQualityStatisticsFirst> data = Context.Queryable<QcQualityStatisticsFirst>().Where(predicate).OrderBy(it => it.WorkorderId).OrderBy(it=>it.Remark2).ToPageList(pageNum, pageSize, ref totalNum);
|
||||
|
||||
|
||||
List<QcQualityStatisticsFirst> data = Context.Queryable<QcQualityStatisticsFirst>().Where(predicate).OrderBy(it => it.WorkorderId).OrderBy(it => it.Remark2).ToPageList(pageNum, pageSize, ref totalNum);
|
||||
|
||||
|
||||
return (data, totalNum);
|
||||
}
|
||||
|
||||
@ -62,15 +62,15 @@ namespace ZR.Service.mes.qc
|
||||
/// <param name="pageSize"></param>
|
||||
/// <returns></returns>
|
||||
/// <exception cref="NotImplementedException"></exception>
|
||||
public (List<QcQualityStatisticsAgain>,int) GetQualityStatisticsTable_again(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
|
||||
public (List<QcQualityStatisticsAgain>, int) GetQualityStatisticsTable_again(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
|
||||
{
|
||||
int totalNum = 0;
|
||||
var predicate = Expressionable.Create<QcQualityStatisticsAgain>()
|
||||
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
|
||||
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
|
||||
.AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.EndTime <= endTime)
|
||||
.AndIF(!string.IsNullOrEmpty(workorderid), it => it.Equals(workorderid))
|
||||
.AndIF(!string.IsNullOrEmpty(partnumber), it => it.Equals(partnumber))
|
||||
.AndIF(!string.IsNullOrEmpty(team), it => it.Equals(team))
|
||||
.AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Equals(workorderid))
|
||||
.AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Equals(partnumber))
|
||||
.AndIF(!string.IsNullOrEmpty(team), it => it.Team.Equals(team))
|
||||
.AndIF(!string.IsNullOrEmpty(product_description), it => it.ProductDescription.Contains(product_description))
|
||||
.ToExpression();
|
||||
|
||||
@ -94,15 +94,15 @@ namespace ZR.Service.mes.qc
|
||||
/// <param name="pageSize"></param>
|
||||
/// <returns></returns>
|
||||
/// <exception cref="NotImplementedException"></exception>
|
||||
public (List<QcQualityStatisticsFinal>,int) GetQualityStatisticsTable_final(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
|
||||
public (List<QcQualityStatisticsFinal>, int) GetQualityStatisticsTable_final(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
|
||||
{
|
||||
int totalNum = 0;
|
||||
var predicate = Expressionable.Create<QcQualityStatisticsFinal>()
|
||||
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
|
||||
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
|
||||
.AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.EndTime <= endTime)
|
||||
.AndIF(!string.IsNullOrEmpty(workorderid), it => it.Equals(workorderid))
|
||||
.AndIF(!string.IsNullOrEmpty(partnumber), it => it.Equals(partnumber))
|
||||
.AndIF(!string.IsNullOrEmpty(team), it => it.Equals(team))
|
||||
.AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Equals(workorderid))
|
||||
.AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Equals(partnumber))
|
||||
.AndIF(!string.IsNullOrEmpty(team), it => it.Team.Equals(team))
|
||||
.AndIF(!string.IsNullOrEmpty(product_description), it => it.ProductDescription.Contains(product_description))
|
||||
.ToExpression();
|
||||
|
||||
@ -127,19 +127,18 @@ namespace ZR.Service.mes.qc
|
||||
/// <param name="pageSize"></param>
|
||||
/// <returns></returns>
|
||||
/// <exception cref="NotImplementedException"></exception>
|
||||
public (List<QcQualityStatisticsTotal>,int) GetQualityStatisticsTable_total(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
|
||||
public (List<QcQualityStatisticsTotal>, int) GetQualityStatisticsTable_total(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
|
||||
{
|
||||
int totalNum = 0;
|
||||
var predicate = Expressionable.Create<QcQualityStatisticsTotal>()
|
||||
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
|
||||
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
|
||||
.AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.EndTime <= endTime)
|
||||
.AndIF(!string.IsNullOrEmpty(workorderid), it => it.Equals(workorderid))
|
||||
.AndIF(!string.IsNullOrEmpty(partnumber), it => it.Equals(partnumber))
|
||||
.AndIF(!string.IsNullOrEmpty(team), it => it.Equals(team))
|
||||
.AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Equals(workorderid))
|
||||
.AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Equals(partnumber))
|
||||
.AndIF(!string.IsNullOrEmpty(team), it => it.Team.Equals(team))
|
||||
.AndIF(!string.IsNullOrEmpty(product_description), it => it.ProductDescription.Contains(product_description))
|
||||
.ToExpression();
|
||||
|
||||
|
||||
List<QcQualityStatisticsTotal> data = Context.Queryable<QcQualityStatisticsTotal>().Where(predicate).OrderBy(it => it.WorkorderId).OrderBy(it => it.Remark2).ToPageList(pageNum, pageSize, ref totalNum);
|
||||
|
||||
|
||||
|
||||
@ -42,7 +42,6 @@ namespace ZR.Service.mes.qu
|
||||
Id = qc.Id,
|
||||
FkMaterialrequisitionId = qc.FkMaterialrequisitionId,
|
||||
Workblankpartnumber = wm.Workblankpartnumber,
|
||||
|
||||
Status = wm.Status,
|
||||
Year = wm.Year,
|
||||
Week = wm.Week,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user