diff --git a/MDM/Models/Process/Dto/ProcessParameterDto.cs b/MDM/Models/Process/Dto/ProcessParameterDto.cs
index 9281211..4ab6333 100644
--- a/MDM/Models/Process/Dto/ProcessParameterDto.cs
+++ b/MDM/Models/Process/Dto/ProcessParameterDto.cs
@@ -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; }
 
 
 
diff --git a/MDM/Models/Process/ProcessParameter.cs b/MDM/Models/Process/ProcessParameter.cs
index 92b141c..afd2c9e 100644
--- a/MDM/Models/Process/ProcessParameter.cs
+++ b/MDM/Models/Process/ProcessParameter.cs
@@ -140,6 +140,6 @@ namespace MDM.Model.Process
         /// 采集值 
         /// </summary>
         [SugarColumn(ColumnName = "collected_value")]
-        public decimal CollectedValue { get; set; }
+        public string CollectedValue { get; set; }
     }
 }
\ No newline at end of file
diff --git a/RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderDto.cs b/RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderDto.cs
index 5280e64..bd3c7ae 100644
--- a/RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderDto.cs
+++ b/RIZO.Model/Mes/Dto/WorkOrderInfo/WorkOrderDto.cs
@@ -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
     {
diff --git a/RIZO.Model/Mes/WorkOrderInfo/WorkOrder.cs b/RIZO.Model/Mes/WorkOrderInfo/WorkOrder.cs
index baa752d..8161c4c 100644
--- a/RIZO.Model/Mes/WorkOrderInfo/WorkOrder.cs
+++ b/RIZO.Model/Mes/WorkOrderInfo/WorkOrder.cs
@@ -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; }
+
+
     }
 }
\ No newline at end of file
diff --git a/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs b/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs
index 202a328..c85f385 100644
--- a/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs
+++ b/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs
@@ -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;