From 58292c8566a09a78e405a2fa99dd651b067e3904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE=E7=94=B7?= <446507344@qq.com>
Date: Thu, 21 Mar 2024 11:15:10 +0800
Subject: [PATCH] 1
---
.../Operation/MainOperationBLL.cs | 3 ++-
.../Operation/MainOperationDAL.cs | 2 +-
.../DAHandler/DataAcquirer.cs | 16 ++++++++++++++++
APPQ5/QMAPP.WinForm/App.config | 17 ++++++++++-------
.../Forms/Operation/OperationForm_316.cs | 18 +++++++++++++++++-
.../WCF/QMFrameWork.WebServiceHost/Web.config | 10 +++++-----
6 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs b/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
index f3ab0a5..b36cbfd 100644
--- a/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
+++ b/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
@@ -4590,7 +4590,8 @@ namespace QMAPP.FJC.BLL.Operation
#region 获得加工参数标准值
var conditionPParameter = new ProcessParameter
{
- WORKCELL_CODE=condition.WORKCELL_CODE,
+ WORKCELL_CODE = condition.WORKCELL_CODE,
+ MACHINECODDE = condition.MACHINECODDE
};
diff --git a/APPQ5/QMAPP.FJC.DAL/Operation/MainOperationDAL.cs b/APPQ5/QMAPP.FJC.DAL/Operation/MainOperationDAL.cs
index c9cafb4..1502edf 100644
--- a/APPQ5/QMAPP.FJC.DAL/Operation/MainOperationDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/Operation/MainOperationDAL.cs
@@ -1819,7 +1819,7 @@ from T_AW_MAINOPERATION where 1=1 ";
sqlBuilder.Append(") tt ");
sqlBuilder.Append(" LEFT JOIN T_QM_USER O ON O.[USERID] = tt.[CREATEUSER]");
- sqlBuilder.AppendFormat(" LEFT JOIN {0} P ON tt.[PID]=P.[MOID]", condition.PARATABLENAME);
+ sqlBuilder.AppendFormat(" LEFT JOIN {0} P ON tt.[PRODUCTCODE]=P.[PRODUCTCODE]", condition.PARATABLENAME);
sqlBuilder.AppendFormat(" WHERE ROWINDEX BETWEEN {0} AND {1}", Convert.ToString(page.PageSize * (page.PageIndex - 1) + 1), Convert.ToString(page.PageSize * page.PageIndex));
//#endregion
//sqlBuilder.Clear().Append( " select abc.*,p.RESTTHICKNESS,o.USERNAME from ( select top 20 ROW_NUMBER() OVER (ORDER BY M.OPERATEDDATE DESC ) AS ROWINDEX,* from [T_AW_MAINOPERATION] M WHERE M.CREATEDATE >= '2012-01-01' AND M.CREATEDATE <= '2016-01-01' AND M.PROCESSTYPE = 6) abc left join "
diff --git a/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs b/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs
index a91f5bf..0d328f2 100644
--- a/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs
+++ b/APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs
@@ -10,6 +10,7 @@ using QMAPP.BLL;
using QMAPP.MD.DAL;
using QMAPP.FJC.Entity.Basic;
using QMFrameWork.Log;
+using QMAPP.FJC.DAL.ProductionPlan;
namespace QMAPP.FJC.TRACING.DAHandler
{
@@ -80,6 +81,21 @@ 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 (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);
+ // }
+ //}
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 a53f83d..9ccbb90 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -3,14 +3,14 @@
-
-
+
-
+
@@ -213,14 +213,17 @@
-
-
+
-
-
+
+
+
+
+
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
index 84aefb0..99258c4 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
@@ -2078,8 +2078,24 @@ namespace QMAPP.WinForm.Forms.Operation
Report.FieldByName("BarCode").Value = string.Format("*{0}*", e052BarCode);//总装条码
Report.FieldByName("FullBarCode").Value = e052BarCode;//总装条码
+
+ 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";//颜色
+ WriteFile("ZSN, ReadFetchRecordBox PartCode：* IP", @"D:\MES\Log");
+ }
+ 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";//颜色
+ WriteFile("ZSN, ReadFetchRecordBox PartCode：4G IP", @"D:\MES\Log");
+ }
+ else
+ {
+ Report.FieldByName("PartCode").Value = bzd.color;//颜色
+ WriteFile("ZSN, ReadFetchRecordBox PartCode："+ bzd.color, @"D:\MES\Log");
+ }
+
- Report.FieldByName("PartCode").Value = bzd.color;//颜色
Report.DetailGrid.Recordset.Post();
}
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index baecf26..3517ae3 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -72,19 +72,19 @@
- -->
+
-
+ -->
-