RIZO/guiyang-fluorescent-line-lmes-backend
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生成工单数据优化

Browse Source
This commit is contained in:
quowingwang 2025-11-28 16:05:22 +08:00
parent 9f6c9bb2a7
commit 1600c5e2a3
5 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RIZO.Admin.WebApi/Controllers/Mes/WorkOrderInfo/WorkOrderItemController.cs
View File

@ -149,7 +149,6 @@ namespace RIZO.Admin.WebApi.Controllers.Mes.WorkOrderInfo
var response = _WorkOrderItemService.GetWorkOrderItemByCode(parm);
return SUCCESS(response);
}
/// <summary>
/// 手动首检校验是否已首检合格
/// </summary>
@ -162,6 +161,5 @@ namespace RIZO.Admin.WebApi.Controllers.Mes.WorkOrderInfo
var response = _WorkOrderItemService.GetFirstInspectionResult(strWorkOrderItemCode);
return response;
}
}
}

2
RIZO.Model/Mes/Dto/WorkOrderInfo/FlowCard.cs
View File

@ -13,8 +13,6 @@ namespace RIZO.Model.Mes.Dto.WorkOrderInfo
public string FlowCardNo { get; set; }
public string LineCode { get; set; }
public string LineName { get; set; }
public string ProcessCode { get; set; }
public string ProcessName { get; set; }
public string MaterialCode { get; set; }
public string MaterialName { get; set; }
public int TotalQty { get; set; }

14
RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderDto.cs
View File

@ -16,6 +16,7 @@ namespace RIZO.Model.Mes.Dto.WorkOrderInfo
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
}
/// <summary>
@ -90,6 +91,15 @@ namespace RIZO.Model.Mes.Dto.WorkOrderInfo
[ExcelColumn(Name = "最后修改时间")]
public DateTime? UpdateTime { get; set; }
[ExcelColumn(Name = "是否首检")]
public int FirstInspection { get; set; }
[ExcelColumn(Name = "是否首检合格")]
public int FirstInspectionResult { get; set; }
[ExcelColumn(Name = "首检合格时间")]
public DateTime? FirstInspectionTime { get; set; }
}
public class ScanCodeParm
{
@ -98,10 +108,6 @@ namespace RIZO.Model.Mes.Dto.WorkOrderInfo
public string LineCode { get; set; }
public string LineName { get; set; }
[Required(ErrorMessage = "工艺路线编码不能为空")]
public string ProcessCode { get; set; }
public string ProcessName { get; set; }
[Required(ErrorMessage = "扫码编码不能为空")]
public string IDCode { get; set; }

18
RIZO.Model/Mes/WorkOrderInfo/WorkOrder.cs
View File

@ -133,5 +133,23 @@ namespace RIZO.Model.Mes.WorkOrderInfo
[SugarColumn(ColumnName = "CreateDate")]
private string CreateDate { get; set; }
/// <summary>
/// 是否首检（0否，1是）
/// </summary>
[SugarColumn(ColumnName = "first_Inspection")]
public int FirstInspection { get; set; }
/// <summary>
/// 是否首检合格（0否，1是）
/// </summary>
[SugarColumn(ColumnName = "first_Inspection_result")]
public int FirstInspectionResult { get; set; }
/// <summary>
/// 首检合格时间
/// </summary>
[SugarColumn(ColumnName = "first_Inspection_time")]
public DateTime? FirstInspectionTime { get; set; }
}
}

19
RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs
View File

@ -179,13 +179,24 @@ namespace RIZO.Service.Mes.WorkOrderInfo
// return ApiResult.Error(400, "零件编码：" + flowCard.MaterialCode + "的工艺路线是"+routing.RoutingName+"与所选工艺路线不一致，请重新选择工艺路线");
// }
//}
//看扫流卡码能否得到一个唯一的流卡编码，若得不到则自己生产202511280001
//int Sequcence = 1;
//WorkOrderItem workOrderItem = Queryable()
// .Where(it => it.WorkOrderCode == partsBasketCard.WorkOrderCode).OrderByDescending(it => it.Sequcence).First();
//if (workOrderItem != null)
//{
// Sequcence = workOrderItem.Sequcence;
// Sequcence += 1;
//}
//string formattedSequence = Sequcence.ToString("D4");
//string strWorkOrderItemCode = partsBasketCard.WorkOrderCode + formattedSequence;
string strDay = DateTime.Now.ToString("yyyyMMdd");
//检验流卡二维码生成的工单是否重复生成
var WorkOrder = Queryable()
.Where(it => it.WorkOrderCode == flowCard.FlowCardNo).First(); ;
if (WorkOrder == null)
{
orderInfoNew.OrderDate = strDay;
orderInfoNew.WorkOrderCode = flowCard.FlowCardNo;
orderInfoNew.MaterialCode = flowCard.MaterialCode;
orderInfoNew.MaterialName = flowCard.MaterialName;
@ -193,10 +204,10 @@ namespace RIZO.Service.Mes.WorkOrderInfo
orderInfoNew.TotalQty = flowCard.TotalQty;
orderInfoNew.LineCode = flowCard.LineCode;
orderInfoNew.LineName = flowCard.LineName;
orderInfoNew.ProcessCode = flowCard.ProcessCode;
orderInfoNew.ProcessName = flowCard.ProcessName;
orderInfoNew.OrderDate = strDay;
//orderInfoNew.ProcessCode = flowCard.ProcessCode;
//orderInfoNew.ProcessName = flowCard.ProcessName;
orderInfoNew.OrderStatus = 1;
//根据前端是否能返回UserId
orderInfoNew.CreateBy = flowCard.UserId;
orderInfoNew.CreateName = flowCard.UserName;
orderInfoNew.UpdateBy = flowCard.UserId;