BC316 BZD打印完善

APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.cs

@@ -114,7 +114,7 @@ namespace QMAPP.WinForm.Forms.Operation
                         //    return;
                         //}
 
-                        _parentForm.Print052QRCODE(false);
+                        _parentForm.Print052QRCODE(false,txtMainCode.Text);
 
                     }
                     else

APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs

@@ -1135,8 +1135,8 @@ namespace QMAPP.WinForm.Forms.Operation
                     case "PRINT_ASSY": //状态变化动作为 打印总成码
                         {
                             //TODO:清空界面数据 复位启动信号
-                            //PrintAssemblyLabe(result.ProcessCode);
-                            Print052QRCODE(true);
+                            //PrintAssemblyLabel(result.ProcessCode);
+                            Print052QRCODE(true, result.ProcessCode);
                             break;
                         }
 
@@ -1659,7 +1659,8 @@ namespace QMAPP.WinForm.Forms.Operation
         /// 打印052标签
         /// </summary>
         /// <param name="cBoxVANstr">物料号是否为固定值</param>
-        public void Print052QRCODE(bool cBoxVANstr)
+        /// <param name="processcode">主码</param>
+        public void Print052QRCODE(bool cBoxVANstr, string processcode)
         {
             try
             {
@@ -1670,7 +1671,7 @@ namespace QMAPP.WinForm.Forms.Operation
 
                 //数据填充
                 //Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReadFetchRecordBox);
-
+                processMainCode = processcode;
 
                 string reportPath = System.Configuration.ConfigurationManager.AppSettings["AssemblyPrintingTemplatePath"].ToString();
 
@@ -2529,7 +2530,7 @@ namespace QMAPP.WinForm.Forms.Operation
                     var config = _agent.InvokeServiceFunction<DataResult<BZDConfig>>(B9IPCService.BZDConfigBLL_Get.ToString(), new BZDConfig() { PID = record.MPID });
                     string e052BarCode = record.BZDCODE;
                     var MATERIAL_CODE = config.Result.MATERIALCODDE;
-                    var color = config.Result.configDetail;
+                    var color = config.Result.ColorDetail;
 
                     //添加补打记录
                     _agent.InvokeServiceFunction<int>(B9IPCService.BarCodeReplacementBLL_Insert.ToString(), new BarCodeReplacement() { ProductCode = PRODUCT_CODE, Type = "BZD条码重打" });

ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

@@ -66,6 +66,10 @@
 
     <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>
     
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=CDMESADM;Password=CDmes123;" 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" />-->