diff --git a/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs b/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs
index 0d328f2..9310a00 100644
--- a/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs
+++ b/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs
@@ -82,20 +82,20 @@ namespace QMAPP.FJC.TRACING.DAHandler
if (data.OrderPlan == null)
{
//BC316-MP4 装配首工位 进行计划强校验
- //if ("AIRBAG_WELD_BC316".Contains(data.MachineCode))
- //{
- // // QDA3 装配1 强校验第一条计划
- // var plan = new WorkOrderDAL().GetOrderInCell(data.WorkLocState.WORKCELL_CODE + "," + TYPE, 1, 1);
+ if ("AIRBAG_WELD_BC316".Contains(data.MachineCode))
+ {
+ // QDA3 装配1 强校验第一条计划
+ var plan = new WorkOrderDAL().GetOrderInCell(data.WorkLocState.WORKCELL_CODE , 1, 1);
- // if (plan.Count > 0)
- // {
- // DAL.FIS.OrderPlanDAL orderplandal = new DAL.FIS.OrderPlanDAL();
- // data.OrderPlan = orderplandal.Get(new Entity.FIS.OrderPlan { PID = plan[0].ORDERPLANID });
+ if (plan.Count > 0)
+ {
+ //DAL.FIS.OrderPlanDAL orderplandal = new DAL.FIS.OrderPlanDAL();
+ //data.OrderPlan = orderplandal.Get(new Entity.FIS.OrderPlan { PID = plan[0].ORDERPLANID });
- // DAL.ProductionPlan.WorkOrderDAL workorderdal = new DAL.ProductionPlan.WorkOrderDAL();
- // data.OrderPlan = workorderdal.GetOneByID(plan[0].ORDERPLANID);
- // }
- //}
+ DAL.ProductionPlan.WorkOrderDAL workorderdal = new DAL.ProductionPlan.WorkOrderDAL();
+ data.OrderPlan = workorderdal.GetOneByID(plan[0].ORDERPLANID);
+ }
+ }
if (!string.IsNullOrWhiteSpace(data.WorkLocState.CurrentState.ORDERPLAN_PID))
{
//DAL.FIS.OrderPlanDAL orderplandal = new DAL.FIS.OrderPlanDAL();
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 9ccbb90..2664995 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -213,15 +213,15 @@
-
+
+
-
-
+
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
index 515075e..48f1910 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
@@ -2048,9 +2048,22 @@ namespace QMAPP.WinForm.Forms.Operation
Report.FieldByName("BarCode").Value = string.Format("*{0}*", e052BarCode);//总装条码
Report.FieldByName("FullBarCode").Value = e052BarCode;//总装条码
-
- Report.FieldByName("PartCode").Value = bzd.color;//颜色
-
+
+ //只有BC316-MP4 的高配，需要增加4G配置的标识
+ if ("5CG.857.003 P AFI,5CG.857.003 P AGO,5CG.857.003 P AGI,5CG.857.003 R AFI".Contains(bzd.MATERIAL_CODE))
+ {
+ Report.FieldByName("PartCode").Value = "* IP";//颜色
+ }
+ else if ("5CG.857.003 Q AGX,5CG.857.003 Q AGZ,5CG.857.003 S AGI,5CG.857.003 S AHB,5CG.857.003 S AHD".Contains(bzd.MATERIAL_CODE))
+ {
+ Report.FieldByName("PartCode").Value = "4G IP";//颜色
+ }
+ else
+ {
+ Report.FieldByName("PartCode").Value = bzd.color;//颜色
+ }
+ //Report.FieldByName("PartCode").Value = bzd.color;//颜色
+
Report.DetailGrid.Recordset.Post();
}
catch (Exception err)
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
index 99258c4..43d40da 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
@@ -2079,6 +2079,7 @@ namespace QMAPP.WinForm.Forms.Operation
Report.FieldByName("FullBarCode").Value = e052BarCode;//总装条码
+ //只有BC316-MP4 的高配，需要增加4G配置的标识
if ("5CG.857.003 P AFI,5CG.857.003 P AGO,5CG.857.003 P AGI,5CG.857.003 R AFI".Contains(bzd.MATERIAL_CODE))
{
Report.FieldByName("PartCode").Value = "* IP";//颜色
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index 3517ae3..7249844 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -72,19 +72,19 @@
-
+ -->
- -->
+
-
+