Browse Source

修复bug

master
songnan.zhang 2 years ago
parent
commit
c1abf52ecf
  1. 2
      APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs
  2. 16
      APPQ5/QMAPP.FJC.Web/Models/CheckTime/ProductTimeModel.cs
  3. 17
      APPQ5/QMAPP.FJC.Web/Views/ProductTime/ProductTimeEdit.aspx
  4. 21
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs

2
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")}小时");
}

16
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; }
/// <summary>
/// 采集点
/// </summary>
[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; }
/// <summary>
/// 验证值2
/// </summary>
[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; }

17
APPQ5/QMAPP.FJC.Web/Views/ProductTime/ProductTimeEdit.aspx

@ -75,6 +75,14 @@
<td>
<%=Html.QC(p => p.Check_Value)%>
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p=>p.Check_ValueTo) %>
</th>
<td>
<%=Html.QC(p => p.Check_ValueTo)%>
</td>
</tr>
<tr>
<th align="right">
@ -108,7 +116,14 @@
<%=Html.QC(p => p.Remark)%>
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p=>p.DAI_Code) %>
</th>
<td>
<%=Html.QC(p => p.DAI_Code)%>
</td>
</tr>
</table>
</td>
</tr>

21
APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs

@ -477,6 +477,16 @@ namespace QMAPP.WinForm.Forms.TianJin
var orders = new List<FJC.Entity.ProductionPlan.WorkOrder>();
orders.Add(order1);
if (dgvPlan.Rows.Count > 1)
{
var orders2 = new List<FJC.Entity.ProductionPlan.WorkOrder>();
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<LabelData> labels = new List<LabelData>();
@ -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<FJC.Entity.ProductionPlan.WorkOrder>();
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<LabelData> labels = new List<LabelData>();

Loading…
Cancel
Save