From c6448ba26453efc6bcdc94d6f75a7bf55a37b056 Mon Sep 17 00:00:00 2001 From: quowingwang Date: Wed, 26 Nov 2025 10:27:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=B7=A5=E5=8D=95=E4=BB=8E?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RIZO.Model/Mes/Dto/WorkOrderInfo/FlowCard.cs | 4 ++-- RIZO.Model/Mes/Dto/WorkOrderInfo/PartsBasketCard.cs | 5 +++++ RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/RIZO.Model/Mes/Dto/WorkOrderInfo/FlowCard.cs b/RIZO.Model/Mes/Dto/WorkOrderInfo/FlowCard.cs index 7b5f592..f9f4308 100644 --- a/RIZO.Model/Mes/Dto/WorkOrderInfo/FlowCard.cs +++ b/RIZO.Model/Mes/Dto/WorkOrderInfo/FlowCard.cs @@ -12,9 +12,9 @@ namespace RIZO.Model.Mes.Dto.WorkOrderInfo // 示例:FLOW-20251121-0001(建议包含日期+序号,确保唯一) 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; } diff --git a/RIZO.Model/Mes/Dto/WorkOrderInfo/PartsBasketCard.cs b/RIZO.Model/Mes/Dto/WorkOrderInfo/PartsBasketCard.cs index ee78df8..b0cbc1b 100644 --- a/RIZO.Model/Mes/Dto/WorkOrderInfo/PartsBasketCard.cs +++ b/RIZO.Model/Mes/Dto/WorkOrderInfo/PartsBasketCard.cs @@ -17,6 +17,11 @@ namespace RIZO.Model.Mes.Dto.WorkOrderInfo //是否清洗 public int IfClean { get; set; } + public string lineCode { get; set; } + public string lineName { get; set; } + + public string ProcessCode { get; set; } + public string ProcessName { get; set; } public string UserId { get; set; } public string UserName { get; set; } } diff --git a/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs b/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs index 2abb1f4..ad76963 100644 --- a/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs +++ b/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs @@ -137,6 +137,8 @@ namespace RIZO.Service.Mes.WorkOrderInfo //假设扫码结果是json形式 //{ // "FlowCardNo": "0001", + // "LineCode" : "001", + // "LineName" : "001", // "MaterialCode": "GEAR-001", // "MaterialName": "齿轮(A型)", // "BatchNumber": "Batch-20251122-01",