kingno
2025-04-03 a97ac998301461e6284595b1cf2c7b40ce5b2459
src/Bro.M135.Common/ProductModel.cs
@@ -1,4 +1,5 @@
using 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)