wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
alex
2023-07-17 13:36:24 +08:00
parent b8b040981b 615f230860
commit c0e586d007
11 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
EquipMgr/Tnb.EquipMgr/EqpDaqService.cs
View File

@@ -39,10 +39,10 @@ namespace Tnb.EquipMgr
}
var result = await db.Queryable<EqpDaq>()
.LeftJoin<UserEntity>((a,b)=>a.create_id==b.Id)
.WhereIF(input!=null,a=>a.equip_id==input.equip_id)
.WhereIF(queryJson!=null && queryJson.ContainsKey("data_source"),a=>a.data_source==queryJson["data_source"])
.WhereIF(queryJson!=null && queryJson.ContainsKey("label_name"),a=>a.label_name.Contains(queryJson["label_name"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("label_point"),a=>a.label_point.Contains(queryJson["label_point"]))
.WhereIF(input!=null,a=>a.equip_id==input!.equip_id)
.WhereIF(queryJson!=null && queryJson.ContainsKey("data_source"),a=>a.data_source==queryJson!["data_source"])
.WhereIF(queryJson!=null && queryJson.ContainsKey("label_name"),a=>a.label_name.Contains(queryJson!["label_name"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("label_point"),a=>a.label_point.Contains(queryJson!["label_point"]))
.Select((a,b) => new EquipDaqQueryOutput
{
id = a.id,

2
EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs
View File

@@ -89,7 +89,7 @@ namespace Tnb.EquipMgr
.LeftJoin<UserEntity >((a, b,c) => a.modify_id == c.Id)
.LeftJoin<EqpEquipment >((a, b,c,d) => a.equip_id == d.id)
.Where((a,b,c,d)=>a.equip_id==input.equip_id)
.WhereIF(queryJson!=null && queryJson.ContainsKey("file_name"),(a,b,c,d)=>a.file_name.Contains(queryJson["file_name"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("file_name"),(a,b,c,d)=>a.file_name.Contains(queryJson!["file_name"]))
.Select((a, b, c,d) => new EquipFileQueryOutput
{
id = a.id,

6
EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs
View File

@@ -47,7 +47,7 @@ namespace Tnb.EquipMgr
id = SnowflakeIdHelper.NextId(),
equip_id = input.equip_id,
spare_parts_id = spare_parts_id,
create_id = _userManager.UserId,
create_id = _userManager?.UserId ?? "",
create_time = DateTime.Now,
org_id = orgId,
});
@@ -71,8 +71,8 @@ namespace Tnb.EquipMgr
.LeftJoin<DictionaryTypeEntity>((a, b, c) => c.EnCode == Tnb.BasicData.DictConst.SparePartsType && c.DeleteMark == null)
.LeftJoin<DictionaryDataEntity>((a, b,c,d) => d.DictionaryTypeId == c.Id && b.type_id == d.EnCode)
.Where((a,b,c,d)=>a.equip_id==input.equip_id)
.WhereIF(queryJson!=null && queryJson.ContainsKey("code"),(a,b,c,d)=>b.code.Contains(queryJson["code"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("name"),(a,b,c,d)=>b.name.Contains(queryJson["name"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("code"),(a,b,c,d)=>b.code.Contains(queryJson!["code"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("name"),(a,b,c,d)=>b.name.Contains(queryJson!["name"]))
.Select((a, b, c,d) => new EquipSparePartsQueryOutput
{
id = a.id,

4
EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs
View File

@@ -43,8 +43,8 @@ namespace Tnb.EquipMgr
.LeftJoin<UserEntity >((a, b,c) => a.modify_id == c.Id)
.LeftJoin<EqpEquipment >((a, b,c,d) => a.equip_id == d.id)
.Where((a,b,c,d)=>a.equip_id==input.equip_id)
.WhereIF(queryJson!=null && queryJson.ContainsKey("code"),(a,b,c,d)=>a.code.Contains(queryJson["code"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("name"),(a,b,c,d)=>a.name.Contains(queryJson["name"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("code"),(a,b,c,d)=>a.code.Contains(queryJson!["code"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("name"),(a,b,c,d)=>a.name.Contains(queryJson!["name"]))
.Select((a, b, c,d) => new SubEquipQueryOutput
{
id = a.id,

4
EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs
View File

@@ -37,8 +37,8 @@ namespace Tnb.EquipMgr
queryJson = JsonConvert.DeserializeObject<Dictionary<string, string>>(input?.queryJson ?? "");
}
var result = await db.Queryable<EqpTechnologyParameter>()
.WhereIF(input!=null,a=>a.equip_id==input.equip_id)
.WhereIF(queryJson!=null && queryJson.ContainsKey("name"),a=>a.name.Contains(queryJson["name"]))
.WhereIF(input!=null,a=>a.equip_id==input!.equip_id)
.WhereIF(queryJson!=null && queryJson.ContainsKey("name"),a=>a.name.Contains(queryJson!["name"]))
.Select(a => new EquipTechnologyParameterQueryOutput
{
id = a.id,

2
EquipMgr/Tnb.EquipMgr/EqpWorkshopChangeLogService.cs
View File

@@ -42,7 +42,7 @@ namespace Tnb.EquipMgr
var result = await db.Queryable<EqpWorkshopChangeLog>()
.LeftJoin<OrganizeEntity>((a,b)=>a.old_workshop_id==b.Id)
.LeftJoin<OrganizeEntity>((a,b,c)=>a.new_workshop_id==c.Id)
.WhereIF(input!=null,a=>a.equip_id==input.equip_id)
.WhereIF(input!=null,a=>a.equip_id==input!.equip_id)
//.WhereIF(queryJson!=null && queryJson.ContainsKey("name"),a=>a.name.Contains(queryJson["name"]))
.Select((a,b,c) => new EquipWorkshopChangeQueryOutput
{

8
EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs
View File

@@ -52,7 +52,7 @@ namespace Tnb.EquipMgr
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
Dictionary<string, object>? queryJson = new Dictionary<string, object>();
string requisitionCode = "";
string? requisitionCode = "";
DateTime[] requisitionTimeArr = null;
DateTime[] estimatedReturnArr = null;
if (input!=null && !string.IsNullOrEmpty(input.queryJson))
@@ -60,15 +60,15 @@ namespace Tnb.EquipMgr
queryJson = JsonConvert.DeserializeObject<Dictionary<string, object>>(input?.queryJson ?? "");
}
if (queryJson.TryGetValue("requisition_code", out var value))
if (queryJson!.TryGetValue("requisition_code", out var value))
{
requisitionCode = value.ToString();
}
if (queryJson.TryGetValue("requisition_time", out var value1))
if (queryJson!.TryGetValue("requisition_time", out var value1))
{
requisitionTimeArr = value1.ToObject<long[]>().Select(x=>DateTimeOffset.FromUnixTimeSeconds(x/1000).ToLocalTime().DateTime).ToArray();
}
if (queryJson.TryGetValue("estimated_return_time", out var value2))
if (queryJson!.TryGetValue("estimated_return_time", out var value2))
{
estimatedReturnArr = value2.ToObject<long[]>().Select(x=>DateTimeOffset.FromUnixTimeSeconds(x/1000).ToLocalTime().DateTime).ToArray();
}

15
EquipMgr/Tnb.EquipMgr/ToolMoldReturnService.cs
View File

@@ -49,15 +49,20 @@ namespace Tnb.EquipMgr
await _runService.Create(templateEntity, input);
string locationId = "";
string? locationId = "";
if (input.data.TryGetValue("location_id", out var value))
{
locationId = value.ToString();
}
await _db.Updateable<ToolMolds>()
.SetColumns(x => x.mold_status == Tnb.BasicData.DictConst.ZKTypeId)
.SetColumnsIF(!string.IsNullOrEmpty(locationId),x=>x.location_id==locationId)
.Where(X => X.id == input.data["mold_id"]).ExecuteCommandAsync();
string moldId = input.data.ContainsKey("mold_id") ? input.data["mold_id"].ToString() : "";
if (!string.IsNullOrEmpty(moldId))
{
await _db.Updateable<ToolMolds>()
.SetColumns(x => x.mold_status == Tnb.BasicData.DictConst.ZKTypeId)
.SetColumnsIF(!string.IsNullOrEmpty(locationId),x=>x.location_id==locationId)
.Where(X => X.id == moldId).ExecuteCommandAsync();
}
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);

18
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListTreeOutput.cs
View File

@@ -36,7 +36,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 物料规格型号
/// </summary>
public string material_standard { get; set; } = string.Empty;
public string? material_standard { get; set; } = string.Empty;
/// <summary>
/// 工单类型：1-正常工单、2-返工工单、3-试制工单
@@ -51,32 +51,32 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 计划生产数量
/// </summary>
public string plan_qty { get; set; } = string.Empty;
public string? plan_qty { get; set; } = string.Empty;
/// <summary>
/// 已投入数量
/// </summary>
public string input_qty { get; set; } = string.Empty;
public string? input_qty { get; set; } = string.Empty;
/// <summary>
/// 已完工数量
/// </summary>
public string complete_qty { get; set; } = string.Empty;
public string? complete_qty { get; set; } = string.Empty;
/// <summary>
/// 报废数量
/// </summary>
public string scrap_qty { get; set; } = string.Empty;
public string? scrap_qty { get; set; } = string.Empty;
/// <summary>
/// 计划开始时间
/// </summary>
public string plan_start_date { get; set; } = string.Empty;
public string? plan_start_date { get; set; } = string.Empty;
/// <summary>
/// 计划结束时间
/// </summary>
public string plan_end_date { get; set; } = string.Empty;
public string? plan_end_date { get; set; } = string.Empty;
/// <summary>
/// 是否生派工单
@@ -112,7 +112,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 创建时间
/// </summary>
public string create_time { get; set; } = string.Empty;
public string? create_time { get; set; } = string.Empty;
/// <summary>
/// 修改用户
@@ -131,7 +131,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 已排产数量
/// </summary>
public string scheduled_qty { get; set; } = string.Empty;
public string? scheduled_qty { get; set; } = string.Empty;
/// <summary>
/// 父工单id
/// </summary>

6
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskManageListOutput.cs
View File

@@ -3,7 +3,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public class PrdTaskManageListOutput
{
public string id { get; set; } = string.Empty;
public string mo_task_code { get; set; } = string.Empty;
public string? mo_task_code { get; set; } = string.Empty;
public string material_id { get; set; } = string.Empty;
public string mold_id { get; set; } = string.Empty;
public string eqp_id { get; set; } = string.Empty;
@@ -11,7 +11,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string plan_end_date { get; set; } = string.Empty;
public int? plan_qty { get; set; }
public int? complete_qty { get; set; }
public string mo_task_status { get; set; } = string.Empty;
public string schedule_type { get; set; } = string.Empty;
public string? mo_task_status { get; set; } = string.Empty;
public string? schedule_type { get; set; } = string.Empty;
}
}

4
ProductionMgr/Tnb.ProductionMgr/PrdTaskManageService.cs
View File

@@ -144,8 +144,8 @@ namespace Tnb.ProductionMgr
material_id = c.code+"/"+c.name,
mold_id = d.mold_code+"/"+d.mold_name,
eqp_id = b.code+"/"+b.name,
plan_start_date = a.estimated_start_date.Value.ToString("yyyy-MM-dd"),
plan_end_date = a.estimated_end_date.Value.ToString("yyyy-MM-dd"),
plan_start_date = a.estimated_start_date==null ? "" : a.estimated_start_date.Value.ToString("yyyy-MM-dd"),
plan_end_date = a.estimated_end_date==null ? "" : a.estimated_end_date.Value.ToString("yyyy-MM-dd"),
plan_qty = a.scheduled_qty,
complete_qty = a.reported_work_qty,
mo_task_status = a.mo_task_status,