From f62c6e0b3015e7ffbf178cad71795d03a166f240 Mon Sep 17 00:00:00 2001
From: "songnan.zhang" <446507344@qq.com>
Date: Tue, 10 Jan 2023 08:11:16 +0800
Subject: [PATCH] 11

---
 APP/QMAPP.Web/Web.config                                 | 7 ++++---
 APPMD/QMAPP.MD.Web/Web.config                            | 5 +++--
 APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs              | 2 +-
 APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs                | 6 ++++++
 APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs             | 4 ++--
 APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs     | 2 +-
 APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx       | 6 ++++++
 APPQ5/QMAPP.FJC.Web/Web.config                           | 8 ++++----
 APPQ5/QMAPP.WinForm/App.config                           | 8 ++++----
 APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs    | 4 ++--
 ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config | 6 +++---
 11 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config
index c591aa7..3845737 100644
--- a/APP/QMAPP.Web/Web.config
+++ b/APP/QMAPP.Web/Web.config
@@ -55,10 +55,11 @@
     <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
   
 
-    -->
+ 
 <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
-
-<!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->
+   -->
+    
+<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
 
     <!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
 
diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config
index 38f27f9..e382847 100644
--- a/APPMD/QMAPP.MD.Web/Web.config
+++ b/APPMD/QMAPP.MD.Web/Web.config
@@ -30,7 +30,9 @@
 
     <!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
 
-    <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
+    <!--<add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />-->
+
+    <add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_VW276PA_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
 
 
     <!-- <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
@@ -42,7 +44,6 @@
     
    <add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
 
-    <add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_VW276PA_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
 
     <add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
 
diff --git a/APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs b/APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs
index e94a9da..5de9f02 100644
--- a/APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs
@@ -164,7 +164,7 @@ namespace QMAPP.FJC.DAL.FIS
                 sqlBuilder.AppendLine("	  LEFT JOIN T_QM_USER C ON  C.USERID=O.CREATEUSER	");
                 sqlBuilder.AppendLine("	  LEFT JOIN T_QM_USER U ON U.USERID=O.UPDATEUSER	");
 
-                whereBuilder.AppendFormat(" AND O.WORKCENTER_CODE in (select distinct WORKCENTER from T_PP_ORDERINDENTITY where ORDER_TYPE='{0}')", condition.ORDER_TYPE);
+                whereBuilder.AppendFormat(" AND O.WORKCENTER_CODE in (select distinct WORKCENTER from T_PP_ORDERINDENTITY where ORDER_TYPE IN ('{0}','DOORPLANK018D'))", condition.ORDER_TYPE);
       
                 //查询条件
                 if (string.IsNullOrEmpty(condition.FACTORY_CODE) == false)
diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs
index 604dc13..8218aa0 100644
--- a/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs
@@ -185,6 +185,12 @@ namespace QMAPP.FJC.DAL.TianJin
                     whereBuilder.Append(" AND A.ProductCode = @ProductCode");
                     parameters.Add(new DataParameter { ParameterName = "ProductCode", DataType = DbType.String, Value = condition.ProductCode });
                 }
+                if (string.IsNullOrEmpty(condition.MATERIALNAME) == false)
+                {
+                    whereBuilder.Append(" AND m.MATERIAL_NAME = @MATERIALNAME");
+                    parameters.Add(new DataParameter { ParameterName = "MATERIALNAME", DataType = DbType.String, Value = condition.MATERIALNAME });
+                }
+                
                 if (condition.BeginTime != DateTime.MinValue)
                     whereBuilder.Append($" and A.CREATEDATE >= '{condition.BeginTime}' ");
                 if (condition.EndTime != DateTime.MinValue)
diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
index 25d7ad6..b52b98a 100644
--- a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
@@ -1323,8 +1323,8 @@ namespace QMAPP.FJC.DAL.TianJin
                 strValues.Append("'" + ppastecard.PASTECARDNO + "',");
                 strValues.Append("'" + ppastecard.PASTECARDDATE + "',");
 
-                strValues.Append("'" + ppastecard.PRODUCTIONNAME + "'");
-                //strValues.Append("'" + ppastecard.PLANTNAME + "'");
+                strValues.Append("'" + ppastecard.PRODUCTIONNAME + "',");
+                strValues.Append("'" + ppastecard.PLANTNAME + "'");
 
                 strSql.Append(" INSERT INTO T_DAS_PASTE_CARDINDEX ");
                 strSql.Append(" (" + strFields.ToString() + ")");
diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs
index b7796dc..c8e2f8e 100644
--- a/APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs
+++ b/APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs
@@ -34,7 +34,7 @@ namespace QMAPP.FJC.Web.Controllers
             StorageModel seachModel = new StorageModel();
             if (callback == true)
                 TryGetSelectBuffer<StorageModel>(out seachModel);
-            seachModel.rownumbers = false;
+            seachModel.rownumbers = true;
             seachModel.url = "/Storage/GetList";
             return View("StorageList", seachModel);
         }
diff --git a/APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx b/APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx
index 975e328..65b46f5 100644
--- a/APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx
+++ b/APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx
@@ -20,6 +20,12 @@
             </th>
             <td>
                 <%=Html.QC(p => p.MATERIALCODE)%> 
+            </td>
+             <th align="right">
+                <%=Html.QV(p => p.MATERIALNAME)%>
+            </th>
+            <td>
+                <%=Html.QC(p => p.MATERIALNAME)%> 
             </td>
             <th align="right">
                 <%=Html.QV(p => p.BeginTime)%>
diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config
index a5ef590..9307f2f 100644
--- a/APPQ5/QMAPP.FJC.Web/Web.config
+++ b/APPQ5/QMAPP.FJC.Web/Web.config
@@ -42,14 +42,14 @@
     <!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
 
     <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
-
-    <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
     <!--
+    <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
+   
    
     <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;max pool size=10240;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-
-    <add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->
+-->
+    <add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
 
   </connectionStrings>
   <!--日志组件配置开始-->
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index aa4a837..8a730dc 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -15,13 +15,13 @@
 
     <!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
 -->
-    <!--
+    <!--  -->
     <add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_VW276PA_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
-    -->
+    
     <!--<add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>-->
-
+   <!--
     <add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
-    <!--
+ 
   <add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>-->
 
     <!--<add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />-->
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
index 8ab0f43..392545b 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
@@ -547,7 +547,7 @@ namespace QMAPP.WinForm.Forms.TianJin
 
                 WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "      开始打印" + labeldata.OrderNo);
 
-                PrintLabel(labels);
+                //PrintLabel(labels);
 
                 WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "      开始变成打印状态" + labeldata.OrderNo);
 
@@ -738,7 +738,7 @@ namespace QMAPP.WinForm.Forms.TianJin
 
                 //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "      开始打印" + labeldata.OrderNo);
 
-                PrintLabel(labels);
+                //PrintLabel(labels);
 
                 //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "      开始变成打印状态" + labeldata.OrderNo);
                 //变更打印状态 0=>1
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index bfbc7cc..b5271d5 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -75,16 +75,16 @@
     <!--
     <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
 
-     -->
+    
 <add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
-
+ -->
 <!--<add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>-->
 
     <!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_VW276PA_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->
       
     <!--<add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>-->
 
-   <!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->
+   <add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
 
     <!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->