diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.cs
index ce72621..65bac0b 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.cs
+++ b/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
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
index ed4213f..3c4725c 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
+++ b/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标签
///
/// 物料号是否为固定值
- public void Print052QRCODE(bool cBoxVANstr)
+ /// 主码
+ 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>(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(B9IPCService.BarCodeReplacementBLL_Insert.ToString(), new BarCodeReplacement() { ProductCode = PRODUCT_CODE, Type = "BZD条码重打" });
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index ac985c4..c641097 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -65,6 +65,10 @@
+
+
+
+