From a97ac998301461e6284595b1cf2c7b40ce5b2459 Mon Sep 17 00:00:00 2001
From: kingno <30263@KINGNO>
Date: 星期四, 03 四月 2025 14:09:36 +0800
Subject: [PATCH] 优化数据库字段的json传输 新增打印机
---
src/Bro.M135.Common/ProductModel.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/Bro.M135.Common/ProductModel.cs b/src/Bro.M135.Common/ProductModel.cs
index 5e1df4b..780342e 100644
--- a/src/Bro.M135.Common/ProductModel.cs
+++ b/src/Bro.M135.Common/ProductModel.cs
@@ -1,4 +1,5 @@
锘縰sing Bro.Common.Helper;
+using Bro.Common.Interface;
using Bro.Common.Model;
using Bro.M135.DBManager;
using Newtonsoft.Json;
@@ -53,11 +54,11 @@
{
if (!string.IsNullOrWhiteSpace(d.FAIData))
{
- d.SpecList = JsonConvert.DeserializeObject<List<Spec>>(d.FAIData);
+ d.SpecList = JsonConvert.DeserializeObject<List<ISpec>>(d.FAIData);
}
else
{
- d.SpecList = new List<Spec>();
+ d.SpecList = new List<ISpec>();
}
if (!string.IsNullOrWhiteSpace(d.DefectDesc))
@@ -193,7 +194,7 @@
});
});
- head = $"PID,鏉＄爜,姹囨�绘娴嬬粨鏋�,";
+ head = $"鏃堕棿,PID,鏍忓叿鐮�,鐗╂枡鐮�,鏉＄爜,姹囨�绘娴嬬粨鏋�,";
positionList = new List<string>();
Details = Details.OrderBy(u => u.PositionName).ToList();
@@ -233,7 +234,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 +303,7 @@
});
});
- head = $"鏃堕棿,PID,搴忓彿,鏉＄爜,";
+ head = $"鏃堕棿,鏍忓叿鐮�,PID,搴忓彿,鏉＄爜,";
foreach (var d in positionDetail)
{
@@ -338,7 +340,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