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-12-19 09:47:32 +08:00
parent df1b99628d
commit fb130197d8
5 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MDM/Models/Process/Dto/ProcessParameterDto.cs
View File

@ -84,7 +84,7 @@ namespace MDM.Model.Process.Dto
public string UpdatedBy { get; set; }
[ExcelColumn(Name = "采集值")]
public decimal CollectedValue { get; set; }
public string CollectedValue { get; set; }

2
MDM/Models/Process/ProcessParameter.cs
View File

@ -140,6 +140,6 @@ namespace MDM.Model.Process
/// 采集值
/// </summary>
[SugarColumn(ColumnName = "collected_value")]
public decimal CollectedValue { get; set; }
public string CollectedValue { get; set; }
}
}

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

@ -100,6 +100,10 @@ namespace RIZO.Model.Mes.Dto.WorkOrderInfo
[ExcelColumn(Name = "首检合格时间")]
public DateTime? FirstInspectionTime { get; set; }
[ExcelColumn(Ignore = true)]
public string FlowCardNo { get; set; }
[ExcelColumn(Ignore = true)]
public int Sequcence { get; set; }
}
public class ScanCodeParm
{

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

@ -151,5 +151,20 @@ namespace RIZO.Model.Mes.WorkOrderInfo
/// </summary>
[SugarColumn(ColumnName = "first_Inspection_time")]
public DateTime? FirstInspectionTime { get; set; }
/// <summary>
/// 二维码唯一字段防止重复扫码
/// </summary>
[SugarColumn(ColumnName = "flowcard_no")]
public string FlowCardNo { get; set; }
/// <summary>
/// 序号
/// </summary>
[SugarColumn(ColumnName = "sequcence")]
public int Sequcence { get; set; }
}
}

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

@ -180,23 +180,24 @@ namespace RIZO.Service.Mes.WorkOrderInfo
//}
//看扫流卡码能否得到一个唯一的流卡编码，若得不到则自己生产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");
int Sequcence = 1;
WorkOrder item = Queryable()
.Where(it => it.WorkOrderCode.Contains(strDay)).OrderByDescending(it => it.Sequcence).First();
if (item != null)
{
Sequcence = item.Sequcence;
Sequcence += 1;
}
string formattedSequence = Sequcence.ToString("D4");
string strWorkOrderCode = "WO"+strDay+ formattedSequence;
//检验流卡二维码生成的工单是否重复生成
var WorkOrder = Queryable()
.Where(it => it.WorkOrderCode == flowCard.FlowCardNo).First(); ;
.Where(it => it.FlowCardNo == flowCard.FlowCardNo).First(); ;
if (WorkOrder == null)
{
orderInfoNew.WorkOrderCode = flowCard.FlowCardNo;
orderInfoNew.WorkOrderCode = strWorkOrderCode;
orderInfoNew.FlowCardNo = flowCard.FlowCardNo;
orderInfoNew.MaterialCode = flowCard.MaterialCode;
orderInfoNew.MaterialName = flowCard.MaterialName;
orderInfoNew.BatchNumber = flowCard.BatchNumber;