diff --git a/APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs b/APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs
index c3a14cd..7f52cb4 100644
--- a/APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs
+++ b/APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs
@@ -34,7 +34,7 @@ namespace QMAPP.FJC.TRACING.DataValidators
DateTime serviceTime = dal.GetServiceDateTime();
TimeSpan ts = serviceTime.Subtract(preStatTime);
- return new ValidateResult(false, $"未达到{timeCheck.Operator}{(Convert.ToDecimal(timeCheck.Check_Value) / 3600).ToString("#0.0")}小时验证标准");
+ return new ValidateResult(false, $"未达到{timeCheck.Operator}{(Convert.ToDecimal(timeCheck.Check_Value) / 3600).ToString("#0.0")}小时验证标准,条码时间{(Convert.ToDecimal(ts.TotalSeconds) / 3600).ToString("#0.0")}小时");
}
diff --git a/APPQ5/QMAPP.FJC.Web/Models/CheckTime/ProductTimeModel.cs b/APPQ5/QMAPP.FJC.Web/Models/CheckTime/ProductTimeModel.cs
index 00b4575..9355076 100644
--- a/APPQ5/QMAPP.FJC.Web/Models/CheckTime/ProductTimeModel.cs
+++ b/APPQ5/QMAPP.FJC.Web/Models/CheckTime/ProductTimeModel.cs
@@ -162,7 +162,23 @@ namespace QMAPP.FJC.Web.Models.CheckTime
[DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss")]
public DateTime UPDATEDATE { get; set; }
+ ///
+ /// 采集点
+ ///
+ [Description("采集点")]
+ [HTMLInput(UpdateRead = true, required = false, MaxLength = 200)]
+ [InputType(inputType.text)]
+ [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center)]
+ public string DAI_Code { get; set; }
+ ///
+ /// 验证值2
+ ///
+ [Description("验证值2")]
+ [HTMLInput(UpdateRead = false, required = false, MaxLength = 200)]
+ [InputType(inputType.text)]
+ [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center)]
+ public string Check_ValueTo { get; set; }
diff --git a/APPQ5/QMAPP.FJC.Web/Views/ProductTime/ProductTimeEdit.aspx b/APPQ5/QMAPP.FJC.Web/Views/ProductTime/ProductTimeEdit.aspx
index 9397360..0d27d2c 100644
--- a/APPQ5/QMAPP.FJC.Web/Views/ProductTime/ProductTimeEdit.aspx
+++ b/APPQ5/QMAPP.FJC.Web/Views/ProductTime/ProductTimeEdit.aspx
@@ -75,6 +75,14 @@
<%=Html.QC(p => p.Check_Value)%>
|
+
+
+
+ <%=Html.QV(p=>p.Check_ValueTo) %>
+ |
+
+ <%=Html.QC(p => p.Check_ValueTo)%>
+ |
@@ -108,7 +116,14 @@
<%=Html.QC(p => p.Remark)%>
|
-
+
+
+ <%=Html.QV(p=>p.DAI_Code) %>
+ |
+
+ <%=Html.QC(p => p.DAI_Code)%>
+ |
+
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
index 5bfdcc9..8849d78 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
@@ -477,6 +477,16 @@ namespace QMAPP.WinForm.Forms.TianJin
var orders = new List();
orders.Add(order1);
+ if (dgvPlan.Rows.Count > 1)
+ {
+ var orders2 = new List();
+ var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[1].DataBoundItem;
+ orders2.Add(order2);
+ if (orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7))
+ {
+ MessageBox.Show("计划工单即将变换配置,请注意!");
+ }
+ }
List labels = new List();
@@ -647,6 +657,17 @@ namespace QMAPP.WinForm.Forms.TianJin
var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[i].DataBoundItem;
orders.Add(order1);
+ if ((i+1)<= count)
+ {
+ var orders2 = new List();
+ var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[i + 1].DataBoundItem;
+ orders2.Add(order2);
+ if (orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7))
+ {
+ MessageBox.Show("计划工单即将变换配置,请注意!");
+ }
+ }
+
toolStripButton1.Enabled = false;
List labels = new List();