From 044e5d0e1491ef25976cf3e25cf7fdf2baf6cb7d Mon Sep 17 00:00:00 2001
From: kingno <30263@KINGNO>
Date: 星期二, 01 四月 2025 17:27:22 +0800
Subject: [PATCH] 合并
---
src/Bro.M135.Common/ProductModel.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/Bro.M135.Common/ProductModel.cs b/src/Bro.M135.Common/ProductModel.cs
index 5e1df4b..ecca1b3 100644
--- a/src/Bro.M135.Common/ProductModel.cs
+++ b/src/Bro.M135.Common/ProductModel.cs
@@ -193,7 +193,7 @@
});
});
- head = $"PID,鏉＄爜,姹囨�绘娴嬬粨鏋�,";
+ head = $"鏃堕棿,PID,鏍忓叿鐮�,鐗╂枡鐮�,鏉＄爜,姹囨�绘娴嬬粨鏋�,";
positionList = new List<string>();
Details = Details.OrderBy(u => u.PositionName).ToList();
@@ -233,7 +233,8 @@
});
});
- string data = $"{PID},{SN},{Result},";
+ //鏃堕棿,PID,鏍忓叿鐮�,鐗╂枡鐮�,鏉＄爜,姹囨�绘娴嬬粨鏋�,";
+ string data = $"{DateTime.Now.ToString("yyyyMMddHHmmss")}T,{PID},{BasketCode},{SEQUENCE},{SN},{Result},";
positionList.ForEach(pName =>
{
var detail = Details.FirstOrDefault(u => $"{u.STATION_CODE}_{u.PositionName}" == pName);
@@ -301,7 +302,7 @@
});
});
- head = $"鏃堕棿,PID,搴忓彿,鏉＄爜,";
+ head = $"鏃堕棿,鏍忓叿鐮�,PID,搴忓彿,鏉＄爜,";
foreach (var d in positionDetail)
{
@@ -338,7 +339,7 @@
});
});
- string data = $"{DateTime.Now.ToString("HH:mm:ss.fff")}T,{PID},{SEQUENCE},{SN},";
+ string data = $"{DateTime.Now.ToString("HH:mm:ss.fff")}T,{BasketCode},{PID},{SEQUENCE},{SN},";
positionDetail.ForEach(detail =>
{
if (!detail.IsDone)
--
Gitblit v1.8.0