From 33e4b20a090df3ee351277e78ee4e171be43e492 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 24 11月 2024 17:01:36 +0800
Subject: [PATCH] 222
---
CC/iWareCC_ASRS/Connected Services/PrintBaseService/PrintWcfService.wsdl | 115 +++
CC/iWareCommon/log4net_iWare.config | 16
CC/iWareCC_ASRS/Connected Services/PrintBaseService/Reference.cs | 391 +++++++++++
CC/iWareCC_ASRS/FormCC.cs | 6
CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.PrintResponse.datasource | 10
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs | 166 +---
CC/iWareCC_ASRS/Connected Services/PrintBaseService/configuration.svcinfo | 10
CC/iWareCC_ASRS/Connected Services/PrintBaseService/item.xsd | 42 +
CC/iWareCC_ASRS/FormCC.Designer.cs | 156 ++--
LA24030_LuLiPackageLine_Print/打印模板文件/包装条码模板_二维码.btw | 0
LA24030_LuLiPackageLine_Print/printer基础服务/Express_printer.exe | 0
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsConfig/PrintClassifyEnum.cs | 18
CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.GetImageResponse.datasource | 10
CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.Print3Response.datasource | 10
CC/iWareCC_ASRS/App.config | 28
CC/iWareCC_ASRS/Common/SystemWarningMsg.cs | 2
CC/iWareCC_ASRS/Connected Services/PrintBaseService/item1.xsd | 21
CC/iWareCommon/Utils/Log4Net/LogType.cs | 2
LA24030_LuLiPackageLine_Print/printer基础服务/Express_printer.exe.config | 40 +
CC/iWareModel/EnumType/WMS/PrintClassifyEnum.cs | 22
CC/iWareCC_ASRS/Common/SystemValue.cs | 2
CC/iWareModel/EnumType/WMS/PrintTypeEnum.cs | 57 +
LA24030_LuLiPackageLine_Print/printer基础服务/Express_printer.vshost.exe | 0
LA24030_LuLiPackageLine_Print/printer基础服务/Express_printer.vshost.exe.manifest | 11
CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.GetPrinterStatusResponse.datasource | 10
/dev/null | 178 -----
CC/iWareCC_ASRS/WmsTask/PrintHandler.cs | 152 ++++
CC/iWareModel/iWareModel.csproj | 2
LA24030_LuLiPackageLine_Print/printer基础服务/Express_printer.vshost.exe.config | 40 +
CC/iWareCC_ASRS/Connected Services/PrintBaseService/item.disco | 4
CC/iWareCC_ASRS/Connected Services/PrintBaseService/Reference.svcmap | 35 +
CC/iWareCC_ASRS/Connected Services/PrintBaseService/item2.xsd | 88 ++
CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.Print2Response.datasource | 10
CC/iWareCC_ASRS/Connected Services/PrintBaseService/configuration91.svcinfo | 201 ++++++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/ReportCenter/PrintTypeEnum.cs | 51 -
CC/iWareCC_ASRS/iWareCC.csproj | 43 +
36 files changed, 1,488 insertions(+), 461 deletions(-)
diff --git a/CC/iWareCC_ASRS/App.config b/CC/iWareCC_ASRS/App.config
index 73b7e3a..3325369 100644
--- a/CC/iWareCC_ASRS/App.config
+++ b/CC/iWareCC_ASRS/App.config
@@ -66,17 +66,29 @@
</services>
<bindings>
<basicHttpBinding>
- <binding name="BasicHttpBinding_ISrmService"/>
- <binding name="BasicHttpBinding_IRgvService"/>
- <binding name="BasicHttpBinding_IRgvService1"/>
- <binding name="BasicHttpBinding_IStationService"/>
+ <binding name="BasicHttpBinding_ISrmService" />
+ <binding name="BasicHttpBinding_IRgvService" />
+ <binding name="BasicHttpBinding_IRgvService1" />
+ <binding name="BasicHttpBinding_IStationService" />
+ <binding name="BasicHttpBinding_IPrintWcfService" />
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.10.5:8733/Design_Time_Addresses/iWareSda/SrmService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_ISrmService" contract="SrmService.ISrmService" name="BasicHttpBinding_ISrmService"/>
- <endpoint address="http://192.168.10.5:8733/Design_Time_Addresses/iWareSda/RgvService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IRgvService" contract="RgvService.IRgvService" name="BasicHttpBinding_IRgvService"/>
- <endpoint address="http://localhost:8733/Design_Time_Addresses/iWareSda/RgvService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IRgvService1" contract="RgvService.IRgvService" name="BasicHttpBinding_IRgvService1"/>
- <endpoint address="http://localhost:8733/Design_Time_Addresses/iWareSda/StationService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IStationService" contract="StationService.IStationService" name="BasicHttpBinding_IStationService"/>
+ <endpoint address="http://192.168.10.5:8733/Design_Time_Addresses/iWareSda/SrmService/"
+ binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_ISrmService"
+ contract="SrmService.ISrmService" name="BasicHttpBinding_ISrmService" />
+ <endpoint address="http://192.168.10.5:8733/Design_Time_Addresses/iWareSda/RgvService/"
+ binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IRgvService"
+ contract="RgvService.IRgvService" name="BasicHttpBinding_IRgvService" />
+ <endpoint address="http://localhost:8733/Design_Time_Addresses/iWareSda/RgvService/"
+ binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IRgvService1"
+ contract="RgvService.IRgvService" name="BasicHttpBinding_IRgvService1" />
+ <endpoint address="http://localhost:8733/Design_Time_Addresses/iWareSda/StationService/"
+ binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IStationService"
+ contract="StationService.IStationService" name="BasicHttpBinding_IStationService" />
+ <endpoint address="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/"
+ binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IPrintWcfService"
+ contract="PrintBaseService.IPrintWcfService" name="BasicHttpBinding_IPrintWcfService" />
</client>
</system.serviceModel>
</configuration>
diff --git a/CC/iWareCC_ASRS/Common/SystemValue.cs b/CC/iWareCC_ASRS/Common/SystemValue.cs
index 43dc6bd..c94df98 100644
--- a/CC/iWareCC_ASRS/Common/SystemValue.cs
+++ b/CC/iWareCC_ASRS/Common/SystemValue.cs
@@ -134,6 +134,8 @@
/// </summary>
public static bool isAllowRuning_DataProcess_RobotBuffer_ModeChange = false;
+ public static bool isAllowRuning_PrintHandler = false;
+
/// <summary>
/// 鏄惁鍏佽鎵ц 鍫嗗灈鏈哄叆鍙ｆ壂鐮佹娴嬬嚎绋�
/// </summary>
diff --git a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
index 0387ee2..22792ea 100644
--- a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
+++ b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
@@ -101,7 +101,7 @@
/// <summary>
/// 杈撻�佺嚎浠诲姟瀹屾垚纭鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_ConveyorsReleaseFinish = string.Empty;
+ public static string _lbl_Alert_PrintHandler = string.Empty;
/// <summary>
/// 娓呯悊鏁版嵁鐜板満 鐨勮鍛婃秷鎭�
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/PrintWcfService.wsdl b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/PrintWcfService.wsdl
new file mode 100644
index 0000000..335e35e
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/PrintWcfService.wsdl
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://tempuri.org/" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" name="PrintWcfService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://tempuri.org/Imports">
+ <xsd:import schemaLocation="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/?xsd=xsd0" namespace="http://tempuri.org/" />
+ <xsd:import schemaLocation="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
+ <xsd:import schemaLocation="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/?xsd=xsd2" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="IPrintWcfService_Print_InputMessage">
+ <wsdl:part name="parameters" element="tns:Print" />
+ </wsdl:message>
+ <wsdl:message name="IPrintWcfService_Print_OutputMessage">
+ <wsdl:part name="parameters" element="tns:PrintResponse" />
+ </wsdl:message>
+ <wsdl:message name="IPrintWcfService_Print2_InputMessage">
+ <wsdl:part name="parameters" element="tns:Print2" />
+ </wsdl:message>
+ <wsdl:message name="IPrintWcfService_Print2_OutputMessage">
+ <wsdl:part name="parameters" element="tns:Print2Response" />
+ </wsdl:message>
+ <wsdl:message name="IPrintWcfService_Print3_InputMessage">
+ <wsdl:part name="parameters" element="tns:Print3" />
+ </wsdl:message>
+ <wsdl:message name="IPrintWcfService_Print3_OutputMessage">
+ <wsdl:part name="parameters" element="tns:Print3Response" />
+ </wsdl:message>
+ <wsdl:message name="IPrintWcfService_GetImage_InputMessage">
+ <wsdl:part name="parameters" element="tns:GetImage" />
+ </wsdl:message>
+ <wsdl:message name="IPrintWcfService_GetImage_OutputMessage">
+ <wsdl:part name="parameters" element="tns:GetImageResponse" />
+ </wsdl:message>
+ <wsdl:message name="IPrintWcfService_GetPrinterStatus_InputMessage">
+ <wsdl:part name="parameters" element="tns:GetPrinterStatus" />
+ </wsdl:message>
+ <wsdl:message name="IPrintWcfService_GetPrinterStatus_OutputMessage">
+ <wsdl:part name="parameters" element="tns:GetPrinterStatusResponse" />
+ </wsdl:message>
+ <wsdl:portType name="IPrintWcfService">
+ <wsdl:operation name="Print">
+ <wsdl:input wsaw:Action="http://tempuri.org/IPrintWcfService/Print" message="tns:IPrintWcfService_Print_InputMessage" />
+ <wsdl:output wsaw:Action="http://tempuri.org/IPrintWcfService/PrintResponse" message="tns:IPrintWcfService_Print_OutputMessage" />
+ </wsdl:operation>
+ <wsdl:operation name="Print2">
+ <wsdl:input wsaw:Action="http://tempuri.org/IPrintWcfService/Print2" message="tns:IPrintWcfService_Print2_InputMessage" />
+ <wsdl:output wsaw:Action="http://tempuri.org/IPrintWcfService/Print2Response" message="tns:IPrintWcfService_Print2_OutputMessage" />
+ </wsdl:operation>
+ <wsdl:operation name="Print3">
+ <wsdl:input wsaw:Action="http://tempuri.org/IPrintWcfService/Print3" message="tns:IPrintWcfService_Print3_InputMessage" />
+ <wsdl:output wsaw:Action="http://tempuri.org/IPrintWcfService/Print3Response" message="tns:IPrintWcfService_Print3_OutputMessage" />
+ </wsdl:operation>
+ <wsdl:operation name="GetImage">
+ <wsdl:input wsaw:Action="http://tempuri.org/IPrintWcfService/GetImage" message="tns:IPrintWcfService_GetImage_InputMessage" />
+ <wsdl:output wsaw:Action="http://tempuri.org/IPrintWcfService/GetImageResponse" message="tns:IPrintWcfService_GetImage_OutputMessage" />
+ </wsdl:operation>
+ <wsdl:operation name="GetPrinterStatus">
+ <wsdl:input wsaw:Action="http://tempuri.org/IPrintWcfService/GetPrinterStatus" message="tns:IPrintWcfService_GetPrinterStatus_InputMessage" />
+ <wsdl:output wsaw:Action="http://tempuri.org/IPrintWcfService/GetPrinterStatusResponse" message="tns:IPrintWcfService_GetPrinterStatus_OutputMessage" />
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="BasicHttpBinding_IPrintWcfService" type="tns:IPrintWcfService">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="Print">
+ <soap:operation soapAction="http://tempuri.org/IPrintWcfService/Print" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="Print2">
+ <soap:operation soapAction="http://tempuri.org/IPrintWcfService/Print2" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="Print3">
+ <soap:operation soapAction="http://tempuri.org/IPrintWcfService/Print3" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="GetImage">
+ <soap:operation soapAction="http://tempuri.org/IPrintWcfService/GetImage" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="GetPrinterStatus">
+ <soap:operation soapAction="http://tempuri.org/IPrintWcfService/GetPrinterStatus" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="PrintWcfService">
+ <wsdl:port name="BasicHttpBinding_IPrintWcfService" binding="tns:BasicHttpBinding_IPrintWcfService">
+ <soap:address location="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/" />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/Reference.cs b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/Reference.cs
new file mode 100644
index 0000000..237f02b
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/Reference.cs
@@ -0,0 +1,391 @@
+锘�//------------------------------------------------------------------------------
+// <auto-generated>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+// 杩愯鏃剁増鏈�:4.0.30319.42000
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
+// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace iWareCC.PrintBaseService {
+
+
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ [System.ServiceModel.ServiceContractAttribute(ConfigurationName="PrintBaseService.IPrintWcfService")]
+ public interface IPrintWcfService {
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IPrintWcfService/Print", ReplyAction="http://tempuri.org/IPrintWcfService/PrintResponse")]
+ iWareCC.PrintBaseService.PrintResponse Print(iWareCC.PrintBaseService.PrintRequest request);
+
+ // CODEGEN: 姝ｅ湪鐢熸垚娑堟伅鍗忓畾锛屽簲涓鸿鎿嶄綔鍏锋湁澶氫釜杩斿洖鍊笺��
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IPrintWcfService/Print", ReplyAction="http://tempuri.org/IPrintWcfService/PrintResponse")]
+ System.Threading.Tasks.Task<iWareCC.PrintBaseService.PrintResponse> PrintAsync(iWareCC.PrintBaseService.PrintRequest request);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IPrintWcfService/Print2", ReplyAction="http://tempuri.org/IPrintWcfService/Print2Response")]
+ iWareCC.PrintBaseService.Print2Response Print2(iWareCC.PrintBaseService.Print2Request request);
+
+ // CODEGEN: 姝ｅ湪鐢熸垚娑堟伅鍗忓畾锛屽簲涓鸿鎿嶄綔鍏锋湁澶氫釜杩斿洖鍊笺��
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IPrintWcfService/Print2", ReplyAction="http://tempuri.org/IPrintWcfService/Print2Response")]
+ System.Threading.Tasks.Task<iWareCC.PrintBaseService.Print2Response> Print2Async(iWareCC.PrintBaseService.Print2Request request);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IPrintWcfService/Print3", ReplyAction="http://tempuri.org/IPrintWcfService/Print3Response")]
+ iWareCC.PrintBaseService.Print3Response Print3(iWareCC.PrintBaseService.Print3Request request);
+
+ // CODEGEN: 姝ｅ湪鐢熸垚娑堟伅鍗忓畾锛屽簲涓鸿鎿嶄綔鍏锋湁澶氫釜杩斿洖鍊笺��
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IPrintWcfService/Print3", ReplyAction="http://tempuri.org/IPrintWcfService/Print3Response")]
+ System.Threading.Tasks.Task<iWareCC.PrintBaseService.Print3Response> Print3Async(iWareCC.PrintBaseService.Print3Request request);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IPrintWcfService/GetImage", ReplyAction="http://tempuri.org/IPrintWcfService/GetImageResponse")]
+ iWareCC.PrintBaseService.GetImageResponse GetImage(iWareCC.PrintBaseService.GetImageRequest request);
+
+ // CODEGEN: 姝ｅ湪鐢熸垚娑堟伅鍗忓畾锛屽簲涓鸿鎿嶄綔鍏锋湁澶氫釜杩斿洖鍊笺��
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IPrintWcfService/GetImage", ReplyAction="http://tempuri.org/IPrintWcfService/GetImageResponse")]
+ System.Threading.Tasks.Task<iWareCC.PrintBaseService.GetImageResponse> GetImageAsync(iWareCC.PrintBaseService.GetImageRequest request);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IPrintWcfService/GetPrinterStatus", ReplyAction="http://tempuri.org/IPrintWcfService/GetPrinterStatusResponse")]
+ iWareCC.PrintBaseService.GetPrinterStatusResponse GetPrinterStatus(iWareCC.PrintBaseService.GetPrinterStatusRequest request);
+
+ // CODEGEN: 姝ｅ湪鐢熸垚娑堟伅鍗忓畾锛屽簲涓鸿鎿嶄綔鍏锋湁澶氫釜杩斿洖鍊笺��
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IPrintWcfService/GetPrinterStatus", ReplyAction="http://tempuri.org/IPrintWcfService/GetPrinterStatusResponse")]
+ System.Threading.Tasks.Task<iWareCC.PrintBaseService.GetPrinterStatusResponse> GetPrinterStatusAsync(iWareCC.PrintBaseService.GetPrinterStatusRequest request);
+ }
+
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ [System.ServiceModel.MessageContractAttribute(WrapperName="Print", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
+ public partial class PrintRequest {
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
+ public System.Collections.Generic.Dictionary<string, object> data;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=1)]
+ public int copies;
+
+ public PrintRequest() {
+ }
+
+ public PrintRequest(System.Collections.Generic.Dictionary<string, object> data, int copies) {
+ this.data = data;
+ this.copies = copies;
+ }
+ }
+
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ [System.ServiceModel.MessageContractAttribute(WrapperName="PrintResponse", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
+ public partial class PrintResponse {
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
+ public bool PrintResult;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=1)]
+ public string msg;
+
+ public PrintResponse() {
+ }
+
+ public PrintResponse(bool PrintResult, string msg) {
+ this.PrintResult = PrintResult;
+ this.msg = msg;
+ }
+ }
+
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ [System.ServiceModel.MessageContractAttribute(WrapperName="Print2", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
+ public partial class Print2Request {
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
+ public System.Collections.Generic.Dictionary<string, object> data;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=1)]
+ public int copies;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=2)]
+ public string tpl;
+
+ public Print2Request() {
+ }
+
+ public Print2Request(System.Collections.Generic.Dictionary<string, object> data, int copies, string tpl) {
+ this.data = data;
+ this.copies = copies;
+ this.tpl = tpl;
+ }
+ }
+
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ [System.ServiceModel.MessageContractAttribute(WrapperName="Print2Response", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
+ public partial class Print2Response {
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
+ public bool Print2Result;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=1)]
+ public string msg;
+
+ public Print2Response() {
+ }
+
+ public Print2Response(bool Print2Result, string msg) {
+ this.Print2Result = Print2Result;
+ this.msg = msg;
+ }
+ }
+
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ [System.ServiceModel.MessageContractAttribute(WrapperName="Print3", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
+ public partial class Print3Request {
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
+ public System.Collections.Generic.Dictionary<string, object> data;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=1)]
+ public int copies;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=2)]
+ public string tpl;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=3)]
+ public string printerName;
+
+ public Print3Request() {
+ }
+
+ public Print3Request(System.Collections.Generic.Dictionary<string, object> data, int copies, string tpl, string printerName) {
+ this.data = data;
+ this.copies = copies;
+ this.tpl = tpl;
+ this.printerName = printerName;
+ }
+ }
+
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ [System.ServiceModel.MessageContractAttribute(WrapperName="Print3Response", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
+ public partial class Print3Response {
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
+ public bool Print3Result;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=1)]
+ public string msg;
+
+ public Print3Response() {
+ }
+
+ public Print3Response(bool Print3Result, string msg) {
+ this.Print3Result = Print3Result;
+ this.msg = msg;
+ }
+ }
+
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ [System.ServiceModel.MessageContractAttribute(WrapperName="GetImage", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
+ public partial class GetImageRequest {
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
+ public System.Collections.Generic.Dictionary<string, object> data;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=1)]
+ public string templateUrl;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=2)]
+ public int width;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=3)]
+ public int height;
+
+ public GetImageRequest() {
+ }
+
+ public GetImageRequest(System.Collections.Generic.Dictionary<string, object> data, string templateUrl, int width, int height) {
+ this.data = data;
+ this.templateUrl = templateUrl;
+ this.width = width;
+ this.height = height;
+ }
+ }
+
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ [System.ServiceModel.MessageContractAttribute(WrapperName="GetImageResponse", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
+ public partial class GetImageResponse {
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
+ public string GetImageResult;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=1)]
+ public string msg;
+
+ public GetImageResponse() {
+ }
+
+ public GetImageResponse(string GetImageResult, string msg) {
+ this.GetImageResult = GetImageResult;
+ this.msg = msg;
+ }
+ }
+
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ [System.ServiceModel.MessageContractAttribute(WrapperName="GetPrinterStatus", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
+ public partial class GetPrinterStatusRequest {
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
+ public string printerName;
+
+ public GetPrinterStatusRequest() {
+ }
+
+ public GetPrinterStatusRequest(string printerName) {
+ this.printerName = printerName;
+ }
+ }
+
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ [System.ServiceModel.MessageContractAttribute(WrapperName="GetPrinterStatusResponse", WrapperNamespace="http://tempuri.org/", IsWrapped=true)]
+ public partial class GetPrinterStatusResponse {
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=0)]
+ public int GetPrinterStatusResult;
+
+ [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://tempuri.org/", Order=1)]
+ public string msg;
+
+ public GetPrinterStatusResponse() {
+ }
+
+ public GetPrinterStatusResponse(int GetPrinterStatusResult, string msg) {
+ this.GetPrinterStatusResult = GetPrinterStatusResult;
+ this.msg = msg;
+ }
+ }
+
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ public interface IPrintWcfServiceChannel : iWareCC.PrintBaseService.IPrintWcfService, System.ServiceModel.IClientChannel {
+ }
+
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+ public partial class PrintWcfServiceClient : System.ServiceModel.ClientBase<iWareCC.PrintBaseService.IPrintWcfService>, iWareCC.PrintBaseService.IPrintWcfService {
+
+ public PrintWcfServiceClient() {
+ }
+
+ public PrintWcfServiceClient(string endpointConfigurationName) :
+ base(endpointConfigurationName) {
+ }
+
+ public PrintWcfServiceClient(string endpointConfigurationName, string remoteAddress) :
+ base(endpointConfigurationName, remoteAddress) {
+ }
+
+ public PrintWcfServiceClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) :
+ base(endpointConfigurationName, remoteAddress) {
+ }
+
+ public PrintWcfServiceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) :
+ base(binding, remoteAddress) {
+ }
+
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+ iWareCC.PrintBaseService.PrintResponse iWareCC.PrintBaseService.IPrintWcfService.Print(iWareCC.PrintBaseService.PrintRequest request) {
+ return base.Channel.Print(request);
+ }
+
+ public bool Print(System.Collections.Generic.Dictionary<string, object> data, int copies, out string msg) {
+ iWareCC.PrintBaseService.PrintRequest inValue = new iWareCC.PrintBaseService.PrintRequest();
+ inValue.data = data;
+ inValue.copies = copies;
+ iWareCC.PrintBaseService.PrintResponse retVal = ((iWareCC.PrintBaseService.IPrintWcfService)(this)).Print(inValue);
+ msg = retVal.msg;
+ return retVal.PrintResult;
+ }
+
+ public System.Threading.Tasks.Task<iWareCC.PrintBaseService.PrintResponse> PrintAsync(iWareCC.PrintBaseService.PrintRequest request) {
+ return base.Channel.PrintAsync(request);
+ }
+
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+ iWareCC.PrintBaseService.Print2Response iWareCC.PrintBaseService.IPrintWcfService.Print2(iWareCC.PrintBaseService.Print2Request request) {
+ return base.Channel.Print2(request);
+ }
+
+ public bool Print2(System.Collections.Generic.Dictionary<string, object> data, int copies, string tpl, out string msg) {
+ iWareCC.PrintBaseService.Print2Request inValue = new iWareCC.PrintBaseService.Print2Request();
+ inValue.data = data;
+ inValue.copies = copies;
+ inValue.tpl = tpl;
+ iWareCC.PrintBaseService.Print2Response retVal = ((iWareCC.PrintBaseService.IPrintWcfService)(this)).Print2(inValue);
+ msg = retVal.msg;
+ return retVal.Print2Result;
+ }
+
+ public System.Threading.Tasks.Task<iWareCC.PrintBaseService.Print2Response> Print2Async(iWareCC.PrintBaseService.Print2Request request) {
+ return base.Channel.Print2Async(request);
+ }
+
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+ iWareCC.PrintBaseService.Print3Response iWareCC.PrintBaseService.IPrintWcfService.Print3(iWareCC.PrintBaseService.Print3Request request) {
+ return base.Channel.Print3(request);
+ }
+
+ public bool Print3(System.Collections.Generic.Dictionary<string, object> data, int copies, string tpl, string printerName, out string msg) {
+ iWareCC.PrintBaseService.Print3Request inValue = new iWareCC.PrintBaseService.Print3Request();
+ inValue.data = data;
+ inValue.copies = copies;
+ inValue.tpl = tpl;
+ inValue.printerName = printerName;
+ iWareCC.PrintBaseService.Print3Response retVal = ((iWareCC.PrintBaseService.IPrintWcfService)(this)).Print3(inValue);
+ msg = retVal.msg;
+ return retVal.Print3Result;
+ }
+
+ public System.Threading.Tasks.Task<iWareCC.PrintBaseService.Print3Response> Print3Async(iWareCC.PrintBaseService.Print3Request request) {
+ return base.Channel.Print3Async(request);
+ }
+
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+ iWareCC.PrintBaseService.GetImageResponse iWareCC.PrintBaseService.IPrintWcfService.GetImage(iWareCC.PrintBaseService.GetImageRequest request) {
+ return base.Channel.GetImage(request);
+ }
+
+ public string GetImage(System.Collections.Generic.Dictionary<string, object> data, string templateUrl, int width, int height, out string msg) {
+ iWareCC.PrintBaseService.GetImageRequest inValue = new iWareCC.PrintBaseService.GetImageRequest();
+ inValue.data = data;
+ inValue.templateUrl = templateUrl;
+ inValue.width = width;
+ inValue.height = height;
+ iWareCC.PrintBaseService.GetImageResponse retVal = ((iWareCC.PrintBaseService.IPrintWcfService)(this)).GetImage(inValue);
+ msg = retVal.msg;
+ return retVal.GetImageResult;
+ }
+
+ public System.Threading.Tasks.Task<iWareCC.PrintBaseService.GetImageResponse> GetImageAsync(iWareCC.PrintBaseService.GetImageRequest request) {
+ return base.Channel.GetImageAsync(request);
+ }
+
+ [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+ iWareCC.PrintBaseService.GetPrinterStatusResponse iWareCC.PrintBaseService.IPrintWcfService.GetPrinterStatus(iWareCC.PrintBaseService.GetPrinterStatusRequest request) {
+ return base.Channel.GetPrinterStatus(request);
+ }
+
+ public int GetPrinterStatus(string printerName, out string msg) {
+ iWareCC.PrintBaseService.GetPrinterStatusRequest inValue = new iWareCC.PrintBaseService.GetPrinterStatusRequest();
+ inValue.printerName = printerName;
+ iWareCC.PrintBaseService.GetPrinterStatusResponse retVal = ((iWareCC.PrintBaseService.IPrintWcfService)(this)).GetPrinterStatus(inValue);
+ msg = retVal.msg;
+ return retVal.GetPrinterStatusResult;
+ }
+
+ public System.Threading.Tasks.Task<iWareCC.PrintBaseService.GetPrinterStatusResponse> GetPrinterStatusAsync(iWareCC.PrintBaseService.GetPrinterStatusRequest request) {
+ return base.Channel.GetPrinterStatusAsync(request);
+ }
+ }
+}
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/Reference.svcmap b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/Reference.svcmap
new file mode 100644
index 0000000..c4f7e7a
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/Reference.svcmap
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ReferenceGroup xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="38054518-e228-42c4-afef-d517881bfcda" xmlns="urn:schemas-microsoft-com:xml-wcfservicemap">
+ <ClientOptions>
+ <GenerateAsynchronousMethods>false</GenerateAsynchronousMethods>
+ <GenerateTaskBasedAsynchronousMethod>true</GenerateTaskBasedAsynchronousMethod>
+ <EnableDataBinding>true</EnableDataBinding>
+ <ExcludedTypes />
+ <ImportXmlTypes>false</ImportXmlTypes>
+ <GenerateInternalTypes>false</GenerateInternalTypes>
+ <GenerateMessageContracts>false</GenerateMessageContracts>
+ <NamespaceMappings />
+ <CollectionMappings />
+ <GenerateSerializableTypes>true</GenerateSerializableTypes>
+ <Serializer>Auto</Serializer>
+ <UseSerializerForFaults>true</UseSerializerForFaults>
+ <ReferenceAllAssemblies>true</ReferenceAllAssemblies>
+ <ReferencedAssemblies />
+ <ReferencedDataContractTypes />
+ <ServiceContractMappings />
+ </ClientOptions>
+ <MetadataSources>
+ <MetadataSource Address="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/" Protocol="http" SourceId="1" />
+ </MetadataSources>
+ <Metadata>
+ <MetadataFile FileName="item.disco" MetadataType="Disco" ID="82d6c1a0-79dc-466a-87b0-a3a3ac1d30f2" SourceId="1" SourceUrl="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/?disco" />
+ <MetadataFile FileName="PrintWcfService.wsdl" MetadataType="Wsdl" ID="91a0fe4c-f2a6-4c0c-b812-d831ffbd1f0e" SourceId="1" SourceUrl="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/?wsdl" />
+ <MetadataFile FileName="item.xsd" MetadataType="Schema" ID="a38e31dd-e1f6-4718-8fd4-c9546391fdb3" SourceId="1" SourceUrl="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/?xsd=xsd1" />
+ <MetadataFile FileName="item1.xsd" MetadataType="Schema" ID="416970ff-358f-476f-ad80-80bdc758bc06" SourceId="1" SourceUrl="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/?xsd=xsd2" />
+ <MetadataFile FileName="item2.xsd" MetadataType="Schema" ID="245a0976-6810-4b88-8124-8d592bcdf72d" SourceId="1" SourceUrl="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/?xsd=xsd0" />
+ </Metadata>
+ <Extensions>
+ <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
+ <ExtensionFile FileName="configuration.svcinfo" Name="configuration.svcinfo" />
+ </Extensions>
+</ReferenceGroup>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/configuration.svcinfo b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/configuration.svcinfo
new file mode 100644
index 0000000..2c23664
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/configuration.svcinfo
@@ -0,0 +1,10 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<configurationSnapshot xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
+ <behaviors />
+ <bindings>
+ <binding digest="System.ServiceModel.Configuration.BasicHttpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:<?xml version="1.0" encoding="utf-16"?><Data name="BasicHttpBinding_IPrintWcfService" />" bindingType="basicHttpBinding" name="BasicHttpBinding_IPrintWcfService" />
+ </bindings>
+ <endpoints>
+ <endpoint normalizedDigest="<?xml version="1.0" encoding="utf-16"?><Data address="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IPrintWcfService" contract="PrintBaseService.IPrintWcfService" name="BasicHttpBinding_IPrintWcfService" />" digest="<?xml version="1.0" encoding="utf-16"?><Data address="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IPrintWcfService" contract="PrintBaseService.IPrintWcfService" name="BasicHttpBinding_IPrintWcfService" />" contractName="PrintBaseService.IPrintWcfService" name="BasicHttpBinding_IPrintWcfService" />
+ </endpoints>
+</configurationSnapshot>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/configuration91.svcinfo b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/configuration91.svcinfo
new file mode 100644
index 0000000..ef2f0e0
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/configuration91.svcinfo
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<SavedWcfConfigurationInformation xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="9.1" CheckSum="C2B4zp1X1tHOQR07SgzooxkIZejeWzSPAZ1JMJSprRw=">
+ <bindingConfigurations>
+ <bindingConfiguration bindingType="basicHttpBinding" name="BasicHttpBinding_IPrintWcfService">
+ <properties>
+ <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>BasicHttpBinding_IPrintWcfService</serializedValue>
+ </property>
+ <property path="/closeTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/openTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/receiveTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/sendTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/allowCookies" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/bypassProxyOnLocal" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/hostNameComparisonMode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HostNameComparisonMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>StrongWildcard</serializedValue>
+ </property>
+ <property path="/maxBufferPoolSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int64, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/maxBufferSize" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>65536</serializedValue>
+ </property>
+ <property path="/maxReceivedMessageSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int64, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/proxyAddress" isComplexType="false" isExplicitlyDefined="false" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/readerQuotas" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement</serializedValue>
+ </property>
+ <property path="/readerQuotas/maxDepth" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>0</serializedValue>
+ </property>
+ <property path="/readerQuotas/maxStringContentLength" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>0</serializedValue>
+ </property>
+ <property path="/readerQuotas/maxArrayLength" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>0</serializedValue>
+ </property>
+ <property path="/readerQuotas/maxBytesPerRead" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>0</serializedValue>
+ </property>
+ <property path="/readerQuotas/maxNameTableCharCount" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>0</serializedValue>
+ </property>
+ <property path="/textEncoding" isComplexType="false" isExplicitlyDefined="false" clrType="System.Text.Encoding, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.Text.UTF8Encoding</serializedValue>
+ </property>
+ <property path="/transferMode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.TransferMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>Buffered</serializedValue>
+ </property>
+ <property path="/useDefaultWebProxy" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/messageEncoding" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.WSMessageEncoding, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>Text</serializedValue>
+ </property>
+ <property path="/security" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.BasicHttpSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.ServiceModel.Configuration.BasicHttpSecurityElement</serializedValue>
+ </property>
+ <property path="/security/mode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.BasicHttpSecurityMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>None</serializedValue>
+ </property>
+ <property path="/security/transport" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.HttpTransportSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.ServiceModel.Configuration.HttpTransportSecurityElement</serializedValue>
+ </property>
+ <property path="/security/transport/clientCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HttpClientCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>None</serializedValue>
+ </property>
+ <property path="/security/transport/proxyCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HttpProxyCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>None</serializedValue>
+ </property>
+ <property path="/security/transport/extendedProtectionPolicy" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement</serializedValue>
+ </property>
+ <property path="/security/transport/extendedProtectionPolicy/policyEnforcement" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.PolicyEnforcement, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>Never</serializedValue>
+ </property>
+ <property path="/security/transport/extendedProtectionPolicy/protectionScenario" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.ProtectionScenario, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>TransportSelected</serializedValue>
+ </property>
+ <property path="/security/transport/extendedProtectionPolicy/customServiceNames" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ServiceNameElementCollection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>(闆嗗悎)</serializedValue>
+ </property>
+ <property path="/security/transport/realm" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/security/message" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.BasicHttpMessageSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.ServiceModel.Configuration.BasicHttpMessageSecurityElement</serializedValue>
+ </property>
+ <property path="/security/message/clientCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.BasicHttpMessageCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>UserName</serializedValue>
+ </property>
+ <property path="/security/message/algorithmSuite" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.Security.SecurityAlgorithmSuite, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>Default</serializedValue>
+ </property>
+ </properties>
+ </bindingConfiguration>
+ </bindingConfigurations>
+ <endpoints>
+ <endpoint name="BasicHttpBinding_IPrintWcfService" contract="PrintBaseService.IPrintWcfService" bindingType="basicHttpBinding" address="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/" bindingConfiguration="BasicHttpBinding_IPrintWcfService">
+ <properties>
+ <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/</serializedValue>
+ </property>
+ <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/binding" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>basicHttpBinding</serializedValue>
+ </property>
+ <property path="/bindingConfiguration" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>BasicHttpBinding_IPrintWcfService</serializedValue>
+ </property>
+ <property path="/contract" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>PrintBaseService.IPrintWcfService</serializedValue>
+ </property>
+ <property path="/headers" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.AddressHeaderCollectionElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.ServiceModel.Configuration.AddressHeaderCollectionElement</serializedValue>
+ </property>
+ <property path="/headers/headers" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.Channels.AddressHeaderCollection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue><Header /></serializedValue>
+ </property>
+ <property path="/identity" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.IdentityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.ServiceModel.Configuration.IdentityElement</serializedValue>
+ </property>
+ <property path="/identity/userPrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.UserPrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.ServiceModel.Configuration.UserPrincipalNameElement</serializedValue>
+ </property>
+ <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/identity/servicePrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.ServicePrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.ServiceModel.Configuration.ServicePrincipalNameElement</serializedValue>
+ </property>
+ <property path="/identity/servicePrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/identity/dns" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.DnsElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.ServiceModel.Configuration.DnsElement</serializedValue>
+ </property>
+ <property path="/identity/dns/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/identity/rsa" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.RsaElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.ServiceModel.Configuration.RsaElement</serializedValue>
+ </property>
+ <property path="/identity/rsa/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/identity/certificate" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.ServiceModel.Configuration.CertificateElement</serializedValue>
+ </property>
+ <property path="/identity/certificate/encodedValue" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/identity/certificateReference" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateReferenceElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>System.ServiceModel.Configuration.CertificateReferenceElement</serializedValue>
+ </property>
+ <property path="/identity/certificateReference/storeName" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.StoreName, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>My</serializedValue>
+ </property>
+ <property path="/identity/certificateReference/storeLocation" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.StoreLocation, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>LocalMachine</serializedValue>
+ </property>
+ <property path="/identity/certificateReference/x509FindType" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.X509FindType, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>FindBySubjectDistinguishedName</serializedValue>
+ </property>
+ <property path="/identity/certificateReference/findValue" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/identity/certificateReference/isChainIncluded" isComplexType="false" isExplicitlyDefined="false" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>False</serializedValue>
+ </property>
+ <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue>BasicHttpBinding_IPrintWcfService</serializedValue>
+ </property>
+ <property path="/kind" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ <property path="/endpointConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <serializedValue />
+ </property>
+ </properties>
+ </endpoint>
+ </endpoints>
+</SavedWcfConfigurationInformation>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.GetImageResponse.datasource b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.GetImageResponse.datasource
new file mode 100644
index 0000000..47c1901
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.GetImageResponse.datasource
@@ -0,0 +1,10 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is automatically generated by Visual Studio .Net. It is
+ used to store generic object data source configuration information.
+ Renaming the file extension or editing the content of this file may
+ cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="GetImageResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+ <TypeInfo>iWareCC.PrintBaseService.GetImageResponse, Connected Services.PrintBaseService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.GetPrinterStatusResponse.datasource b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.GetPrinterStatusResponse.datasource
new file mode 100644
index 0000000..b2d942f
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.GetPrinterStatusResponse.datasource
@@ -0,0 +1,10 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is automatically generated by Visual Studio .Net. It is
+ used to store generic object data source configuration information.
+ Renaming the file extension or editing the content of this file may
+ cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="GetPrinterStatusResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+ <TypeInfo>iWareCC.PrintBaseService.GetPrinterStatusResponse, Connected Services.PrintBaseService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.Print2Response.datasource b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.Print2Response.datasource
new file mode 100644
index 0000000..128e3b4
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.Print2Response.datasource
@@ -0,0 +1,10 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is automatically generated by Visual Studio .Net. It is
+ used to store generic object data source configuration information.
+ Renaming the file extension or editing the content of this file may
+ cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="Print2Response" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+ <TypeInfo>iWareCC.PrintBaseService.Print2Response, Connected Services.PrintBaseService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.Print3Response.datasource b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.Print3Response.datasource
new file mode 100644
index 0000000..0bda6a2
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.Print3Response.datasource
@@ -0,0 +1,10 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is automatically generated by Visual Studio .Net. It is
+ used to store generic object data source configuration information.
+ Renaming the file extension or editing the content of this file may
+ cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="Print3Response" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+ <TypeInfo>iWareCC.PrintBaseService.Print3Response, Connected Services.PrintBaseService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.PrintResponse.datasource b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.PrintResponse.datasource
new file mode 100644
index 0000000..d1172c3
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/iWareCC.PrintBaseService.PrintResponse.datasource
@@ -0,0 +1,10 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is automatically generated by Visual Studio .Net. It is
+ used to store generic object data source configuration information.
+ Renaming the file extension or editing the content of this file may
+ cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="PrintResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+ <TypeInfo>iWareCC.PrintBaseService.PrintResponse, Connected Services.PrintBaseService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/item.disco b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/item.disco
new file mode 100644
index 0000000..41b9add
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/item.disco
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<discovery xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.xmlsoap.org/disco/">
+ <contractRef ref="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/?wsdl" docRef="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+</discovery>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/item.xsd b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/item.xsd
new file mode 100644
index 0000000..d58e7f3
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/item.xsd
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:tns="http://schemas.microsoft.com/2003/10/Serialization/" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/2003/10/Serialization/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="anyType" nillable="true" type="xs:anyType" />
+ <xs:element name="anyURI" nillable="true" type="xs:anyURI" />
+ <xs:element name="base64Binary" nillable="true" type="xs:base64Binary" />
+ <xs:element name="boolean" nillable="true" type="xs:boolean" />
+ <xs:element name="byte" nillable="true" type="xs:byte" />
+ <xs:element name="dateTime" nillable="true" type="xs:dateTime" />
+ <xs:element name="decimal" nillable="true" type="xs:decimal" />
+ <xs:element name="double" nillable="true" type="xs:double" />
+ <xs:element name="float" nillable="true" type="xs:float" />
+ <xs:element name="int" nillable="true" type="xs:int" />
+ <xs:element name="long" nillable="true" type="xs:long" />
+ <xs:element name="QName" nillable="true" type="xs:QName" />
+ <xs:element name="short" nillable="true" type="xs:short" />
+ <xs:element name="string" nillable="true" type="xs:string" />
+ <xs:element name="unsignedByte" nillable="true" type="xs:unsignedByte" />
+ <xs:element name="unsignedInt" nillable="true" type="xs:unsignedInt" />
+ <xs:element name="unsignedLong" nillable="true" type="xs:unsignedLong" />
+ <xs:element name="unsignedShort" nillable="true" type="xs:unsignedShort" />
+ <xs:element name="char" nillable="true" type="tns:char" />
+ <xs:simpleType name="char">
+ <xs:restriction base="xs:int" />
+ </xs:simpleType>
+ <xs:element name="duration" nillable="true" type="tns:duration" />
+ <xs:simpleType name="duration">
+ <xs:restriction base="xs:duration">
+ <xs:pattern value="\-?P(\d*D)?(T(\d*H)?(\d*M)?(\d*(\.\d*)?S)?)?" />
+ <xs:minInclusive value="-P10675199DT2H48M5.4775808S" />
+ <xs:maxInclusive value="P10675199DT2H48M5.4775807S" />
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:element name="guid" nillable="true" type="tns:guid" />
+ <xs:simpleType name="guid">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}" />
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:attribute name="FactoryType" type="xs:QName" />
+ <xs:attribute name="Id" type="xs:ID" />
+ <xs:attribute name="Ref" type="xs:IDREF" />
+</xs:schema>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/item1.xsd b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/item1.xsd
new file mode 100644
index 0000000..8f9aadd
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/item1.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:tns="http://schemas.microsoft.com/2003/10/Serialization/Arrays" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:complexType name="ArrayOfKeyValueOfstringanyType">
+ <xs:annotation>
+ <xs:appinfo>
+ <IsDictionary xmlns="http://schemas.microsoft.com/2003/10/Serialization/">true</IsDictionary>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element minOccurs="0" maxOccurs="unbounded" name="KeyValueOfstringanyType">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Key" nillable="true" type="xs:string" />
+ <xs:element name="Value" nillable="true" type="xs:anyType" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="ArrayOfKeyValueOfstringanyType" nillable="true" type="tns:ArrayOfKeyValueOfstringanyType" />
+</xs:schema>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/Connected Services/PrintBaseService/item2.xsd b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/item2.xsd
new file mode 100644
index 0000000..35dfe27
--- /dev/null
+++ b/CC/iWareCC_ASRS/Connected Services/PrintBaseService/item2.xsd
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:tns="http://tempuri.org/" elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:import schemaLocation="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/?xsd=xsd2" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+ <xs:element name="Print">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element xmlns:q1="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="data" nillable="true" type="q1:ArrayOfKeyValueOfstringanyType" />
+ <xs:element minOccurs="0" name="copies" type="xs:int" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="PrintResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="PrintResult" type="xs:boolean" />
+ <xs:element minOccurs="0" name="msg" nillable="true" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Print2">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element xmlns:q2="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="data" nillable="true" type="q2:ArrayOfKeyValueOfstringanyType" />
+ <xs:element minOccurs="0" name="copies" type="xs:int" />
+ <xs:element minOccurs="0" name="tpl" nillable="true" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Print2Response">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="Print2Result" type="xs:boolean" />
+ <xs:element minOccurs="0" name="msg" nillable="true" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Print3">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element xmlns:q3="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="data" nillable="true" type="q3:ArrayOfKeyValueOfstringanyType" />
+ <xs:element minOccurs="0" name="copies" type="xs:int" />
+ <xs:element minOccurs="0" name="tpl" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="printerName" nillable="true" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Print3Response">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="Print3Result" type="xs:boolean" />
+ <xs:element minOccurs="0" name="msg" nillable="true" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="GetImage">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element xmlns:q4="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="data" nillable="true" type="q4:ArrayOfKeyValueOfstringanyType" />
+ <xs:element minOccurs="0" name="templateUrl" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="width" type="xs:int" />
+ <xs:element minOccurs="0" name="height" type="xs:int" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="GetImageResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="GetImageResult" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="msg" nillable="true" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="GetPrinterStatus">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="printerName" nillable="true" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="GetPrinterStatusResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="GetPrinterStatusResult" type="xs:int" />
+ <xs:element minOccurs="0" name="msg" nillable="true" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/CC/iWareCC_ASRS/FormCC.Designer.cs b/CC/iWareCC_ASRS/FormCC.Designer.cs
index 47ff185..20736dc 100644
--- a/CC/iWareCC_ASRS/FormCC.Designer.cs
+++ b/CC/iWareCC_ASRS/FormCC.Designer.cs
@@ -210,6 +210,8 @@
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tPModeChoice = new System.Windows.Forms.TabPage();
this.panel_Model = new System.Windows.Forms.Panel();
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask = new System.Windows.Forms.Label();
+ this.lbl_RobotMode = new System.Windows.Forms.Label();
this.rBOnlyIn = new System.Windows.Forms.RadioButton();
this.lbl_IsSimulationPLC = new System.Windows.Forms.Label();
this.lbl_WCFMsg = new System.Windows.Forms.Label();
@@ -242,8 +244,8 @@
this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound = new System.Windows.Forms.CheckBox();
this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = new System.Windows.Forms.Label();
this.ck_DataProcess_RobotBuffer_IssueOutboundTask = new System.Windows.Forms.CheckBox();
- this.lbl_Alert_EmptySalverTransfer = new System.Windows.Forms.Label();
- this.ckEmptySalverTransfer = new System.Windows.Forms.CheckBox();
+ this.lbl_Alert_PrintHandler = new System.Windows.Forms.Label();
+ this.ck_PrintHandler = new System.Windows.Forms.CheckBox();
this.lbl_MainTaskDecompose = new System.Windows.Forms.Label();
this.ckMainTaskDecompose = new System.Windows.Forms.CheckBox();
this.lbl_Alert_DeleteData = new System.Windows.Forms.Label();
@@ -436,6 +438,9 @@
this.Qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.InStoreTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.button24 = new System.Windows.Forms.Button();
+ this.tb_PackageCode = new System.Windows.Forms.TextBox();
+ this.label23 = new System.Windows.Forms.Label();
this.button23 = new System.Windows.Forms.Button();
this.tb_wlm = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
@@ -469,11 +474,6 @@
this.dataGridViewTextBoxColumn62 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn63 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.btn_Find_OutTaskRetryToMes = new System.Windows.Forms.Button();
- this.lbl_RobotMode = new System.Windows.Forms.Label();
- this.tb_PackageCode = new System.Windows.Forms.TextBox();
- this.label23 = new System.Windows.Forms.Label();
- this.button24 = new System.Windows.Forms.Button();
- this.lbl_currHandlerPackageCodeForIssueOutboundTask = new System.Windows.Forms.Label();
this.tPTransAsrs.SuspendLayout();
this.panel14.SuspendLayout();
this.panel15.SuspendLayout();
@@ -2824,6 +2824,26 @@
this.panel_Model.TabIndex = 0;
this.panel_Model.Paint += new System.Windows.Forms.PaintEventHandler(this.panel27_Paint);
//
+ // lbl_currHandlerPackageCodeForIssueOutboundTask
+ //
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.AutoSize = true;
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Location = new System.Drawing.Point(275, 693);
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Name = "lbl_currHandlerPackageCodeForIssueOutboundTask";
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Size = new System.Drawing.Size(172, 15);
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.TabIndex = 14;
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Text = "当前下发出库任务的包号";
+ //
+ // lbl_RobotMode
+ //
+ this.lbl_RobotMode.AutoSize = true;
+ this.lbl_RobotMode.Location = new System.Drawing.Point(275, 659);
+ this.lbl_RobotMode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbl_RobotMode.Name = "lbl_RobotMode";
+ this.lbl_RobotMode.Size = new System.Drawing.Size(127, 15);
+ this.lbl_RobotMode.TabIndex = 12;
+ this.lbl_RobotMode.Text = "缓存岛机器人模式";
+ //
// rBOnlyIn
//
this.rBOnlyIn.Appearance = System.Windows.Forms.Appearance.Button;
@@ -2996,8 +3016,8 @@
this.groupBox1.Controls.Add(this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound);
this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask);
this.groupBox1.Controls.Add(this.ck_DataProcess_RobotBuffer_IssueOutboundTask);
- this.groupBox1.Controls.Add(this.lbl_Alert_EmptySalverTransfer);
- this.groupBox1.Controls.Add(this.ckEmptySalverTransfer);
+ this.groupBox1.Controls.Add(this.lbl_Alert_PrintHandler);
+ this.groupBox1.Controls.Add(this.ck_PrintHandler);
this.groupBox1.Controls.Add(this.lbl_MainTaskDecompose);
this.groupBox1.Controls.Add(this.ckMainTaskDecompose);
this.groupBox1.Controls.Add(this.lbl_Alert_DeleteData);
@@ -3266,28 +3286,28 @@
this.ck_DataProcess_RobotBuffer_IssueOutboundTask.UseVisualStyleBackColor = true;
this.ck_DataProcess_RobotBuffer_IssueOutboundTask.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // lbl_Alert_EmptySalverTransfer
+ // lbl_Alert_PrintHandler
//
- this.lbl_Alert_EmptySalverTransfer.AutoSize = true;
- this.lbl_Alert_EmptySalverTransfer.BackColor = System.Drawing.Color.White;
- this.lbl_Alert_EmptySalverTransfer.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_EmptySalverTransfer.Location = new System.Drawing.Point(215, 492);
- this.lbl_Alert_EmptySalverTransfer.Name = "lbl_Alert_EmptySalverTransfer";
- this.lbl_Alert_EmptySalverTransfer.Size = new System.Drawing.Size(70, 15);
- this.lbl_Alert_EmptySalverTransfer.TabIndex = 37;
- this.lbl_Alert_EmptySalverTransfer.Text = "label11";
+ this.lbl_Alert_PrintHandler.AutoSize = true;
+ this.lbl_Alert_PrintHandler.BackColor = System.Drawing.Color.White;
+ this.lbl_Alert_PrintHandler.ForeColor = System.Drawing.Color.Red;
+ this.lbl_Alert_PrintHandler.Location = new System.Drawing.Point(215, 492);
+ this.lbl_Alert_PrintHandler.Name = "lbl_Alert_PrintHandler";
+ this.lbl_Alert_PrintHandler.Size = new System.Drawing.Size(70, 15);
+ this.lbl_Alert_PrintHandler.TabIndex = 37;
+ this.lbl_Alert_PrintHandler.Text = "label11";
//
- // ckEmptySalverTransfer
+ // ck_PrintHandler
//
- this.ckEmptySalverTransfer.AutoSize = true;
- this.ckEmptySalverTransfer.Location = new System.Drawing.Point(4, 492);
- this.ckEmptySalverTransfer.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.ckEmptySalverTransfer.Name = "ckEmptySalverTransfer";
- this.ckEmptySalverTransfer.Size = new System.Drawing.Size(125, 19);
- this.ckEmptySalverTransfer.TabIndex = 36;
- this.ckEmptySalverTransfer.Text = "空托转运线程";
- this.ckEmptySalverTransfer.UseVisualStyleBackColor = true;
- this.ckEmptySalverTransfer.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
+ this.ck_PrintHandler.AutoSize = true;
+ this.ck_PrintHandler.Location = new System.Drawing.Point(4, 492);
+ this.ck_PrintHandler.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.ck_PrintHandler.Name = "ck_PrintHandler";
+ this.ck_PrintHandler.Size = new System.Drawing.Size(125, 19);
+ this.ck_PrintHandler.TabIndex = 36;
+ this.ck_PrintHandler.Text = "打印服务线程";
+ this.ck_PrintHandler.UseVisualStyleBackColor = true;
+ this.ck_PrintHandler.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
// lbl_MainTaskDecompose
//
@@ -5503,6 +5523,34 @@
this.tabPage3.Text = "数据维护&统计";
this.tabPage3.UseVisualStyleBackColor = true;
//
+ // button24
+ //
+ this.button24.BackColor = System.Drawing.Color.Aqua;
+ this.button24.Location = new System.Drawing.Point(817, 489);
+ this.button24.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button24.Name = "button24";
+ this.button24.Size = new System.Drawing.Size(155, 48);
+ this.button24.TabIndex = 155;
+ this.button24.Text = "强制该包号出库";
+ this.button24.UseVisualStyleBackColor = false;
+ this.button24.Click += new System.EventHandler(this.button24_Click);
+ //
+ // tb_PackageCode
+ //
+ this.tb_PackageCode.Location = new System.Drawing.Point(856, 427);
+ this.tb_PackageCode.Name = "tb_PackageCode";
+ this.tb_PackageCode.Size = new System.Drawing.Size(339, 25);
+ this.tb_PackageCode.TabIndex = 154;
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.Location = new System.Drawing.Point(794, 437);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(45, 15);
+ this.label23.TabIndex = 153;
+ this.label23.Text = "包号:";
+ //
// button23
//
this.button23.BackColor = System.Drawing.Color.Aqua;
@@ -5832,54 +5880,6 @@
this.btn_Find_OutTaskRetryToMes.UseVisualStyleBackColor = true;
this.btn_Find_OutTaskRetryToMes.Click += new System.EventHandler(this.btn_Find_OutTaskRetryToMes_Click);
//
- // lbl_RobotMode
- //
- this.lbl_RobotMode.AutoSize = true;
- this.lbl_RobotMode.Location = new System.Drawing.Point(275, 659);
- this.lbl_RobotMode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.lbl_RobotMode.Name = "lbl_RobotMode";
- this.lbl_RobotMode.Size = new System.Drawing.Size(127, 15);
- this.lbl_RobotMode.TabIndex = 12;
- this.lbl_RobotMode.Text = "缓存岛机器人模式";
- //
- // tb_PackageCode
- //
- this.tb_PackageCode.Location = new System.Drawing.Point(856, 427);
- this.tb_PackageCode.Name = "tb_PackageCode";
- this.tb_PackageCode.Size = new System.Drawing.Size(339, 25);
- this.tb_PackageCode.TabIndex = 154;
- //
- // label23
- //
- this.label23.AutoSize = true;
- this.label23.Location = new System.Drawing.Point(794, 437);
- this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(45, 15);
- this.label23.TabIndex = 153;
- this.label23.Text = "包号:";
- //
- // button24
- //
- this.button24.BackColor = System.Drawing.Color.Aqua;
- this.button24.Location = new System.Drawing.Point(817, 489);
- this.button24.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.button24.Name = "button24";
- this.button24.Size = new System.Drawing.Size(155, 48);
- this.button24.TabIndex = 155;
- this.button24.Text = "强制该包号出库";
- this.button24.UseVisualStyleBackColor = false;
- this.button24.Click += new System.EventHandler(this.button24_Click);
- //
- // lbl_currHandlerPackageCodeForIssueOutboundTask
- //
- this.lbl_currHandlerPackageCodeForIssueOutboundTask.AutoSize = true;
- this.lbl_currHandlerPackageCodeForIssueOutboundTask.Location = new System.Drawing.Point(275, 693);
- this.lbl_currHandlerPackageCodeForIssueOutboundTask.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.lbl_currHandlerPackageCodeForIssueOutboundTask.Name = "lbl_currHandlerPackageCodeForIssueOutboundTask";
- this.lbl_currHandlerPackageCodeForIssueOutboundTask.Size = new System.Drawing.Size(172, 15);
- this.lbl_currHandlerPackageCodeForIssueOutboundTask.TabIndex = 14;
- this.lbl_currHandlerPackageCodeForIssueOutboundTask.Text = "当前下发出库任务的包号";
- //
// FormCC
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -6152,8 +6152,8 @@
private System.Windows.Forms.CheckBox ckDeleteData;
private System.Windows.Forms.Label lbl_MainTaskDecompose;
private System.Windows.Forms.CheckBox ckMainTaskDecompose;
- private System.Windows.Forms.Label lbl_Alert_EmptySalverTransfer;
- private System.Windows.Forms.CheckBox ckEmptySalverTransfer;
+ private System.Windows.Forms.Label lbl_Alert_PrintHandler;
+ private System.Windows.Forms.CheckBox ck_PrintHandler;
private System.Windows.Forms.Label lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask;
private System.Windows.Forms.CheckBox ck_DataProcess_RobotBuffer_IssueOutboundTask;
private System.Windows.Forms.Button btn_1007;
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index 7bfd72c..2eba145 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -238,13 +238,13 @@
new Thread(DataProcess_269.Handler).Start();
- new Thread(DataProcess_BZ39.Handler).Start();
+ new Thread(DataProcess_BZ39.Handler).Start();
new Thread(DataProcess_BZ12.Hander).Start();
new Thread(DataProcess_BZ12_FinishTask.Handler).Start();
new Thread(DeleteData).Start();
- //new Thread(LineInSacnResult.HandlerLineInSacnResult).Start();
+ new Thread(PrintHandler.Handler).Start();
@@ -1546,6 +1546,8 @@
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_ModeChange, ck_DataProcess_RobotBuffer_ModeChange);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_PrintHandler, ck_PrintHandler);
+
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTaskForOutbound, checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound);
diff --git a/CC/iWareCC_ASRS/WmsTask/AutoSalverMaterialBindTask.cs b/CC/iWareCC_ASRS/WmsTask/AutoSalverMaterialBindTask.cs
deleted file mode 100644
index a9e967c..0000000
--- a/CC/iWareCC_ASRS/WmsTask/AutoSalverMaterialBindTask.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-锘縰sing iWareCC.Common.Helper;
-using iWareCommon.Common.Globle;
-using iWareCommon.Utils;
-using iWareModel;
-using iWareModel.EnumType.XiGangPublicCommon;
-using iWareSql;
-using iWareSql.DataAccess;
-using iWareSql.DBModel;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using XiGang.Core.Model;
-using XiGang.Core.Model.PostParamModels.Task;
-using static WZ.Useful.Commons.NativeMethods;
-
-namespace iWareCC
-{
- /// <summary>
- /// 鑷姩缁勭洏 浠诲姟
- /// </summary>
- public static class AutoSalverMaterialBindTask
- {
- /// <summary>
- /// 鑷姩缁勭洏浠诲姟
- /// </summary>
- public static void Handler()
- {
- var alertMsg = "";
- while (true)
- {
- Thread.Sleep(2000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = string.Empty;
- try
- {
- if (SystemValue.isAllowRuning_DataProcess_BZ39 && SystemValue.isStartedModel)
- {
- EDevice rgvLocation = EDevice.鍏ュ簱鍙�1019;
- var stationCode = Convert.ToInt32(rgvLocation).ToString();
- V_AllStore store = null;
-
- using (DbModel context = new DbModel())
- {
- bool isGD_HasCatogryForRgvStattion = MyExtendHelper.IsGD_HasCatogryForRgvStattion(stationCode);
- bool isSys_HasCatogryForRgvStattion = MyExtendHelper.IsSys_HasCatogryForRgvStattion(context, stationCode, ref store);
- bool isExistOtherTaskDoing = PartTaskHandler.IsExistOtherTaskDoing(stationCode);
-
- if (isSys_HasCatogryForRgvStattion)
- {
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-绯荤粺鏈夊簱瀛�,姝ゆ寰幆缁撴潫";
- continue;
- }
- if (isExistOtherTaskDoing)
- {
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-鏈変换鍔″崰鐢ㄨ绔欑偣,姝ゆ寰幆缁撴潫";
- continue;
- }
- if (!isGD_HasCatogryForRgvStattion)
- {
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-鍏夌數鏄剧ず鏃犺揣,姝ゆ寰幆缁撴潫";
- continue;
- }
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-鍏夌數鏈夎揣";
- //闇�瑕佽鍙� 鍙戝姩鏈烘壂鎻忔灙鐨勪俊鎭�
- var _scan_CargoNo = FormCC.rgvView.R_1019_CargoNoScan;
- if (string.IsNullOrEmpty(_scan_CargoNo))
- {
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"璇诲彇鐨剓rgvLocation.ToString()}浣嶇疆锛屽彂鍔ㄦ満鐮佷负绌猴紝涓嶅厑璁歌嚜鍔ㄧ粍鐩�";
- continue;
- }
-
- _scan_CargoNo = _scan_CargoNo.Trim();//娉ㄦ剰锛氶渶瑕佸洖杞︽崲琛岋紝淇鏈夊洖杞︽崲琛岀鐨勯棶棰樸�怑ditby shaocx,2023-11-27銆�
-
- //楠岃瘉璇ュ彂鍔ㄦ満搴撳瓨宸插瓨鍦紝瑕佸湪WMS涓鐞�
- //var isSys_HasCatogryForCargoNo = StoreHandler.IsSys_HasCatogryForCargoNo(context, _scan_CargoNo, ref store);
- //if (isSys_HasCatogryForCargoNo)
- //{
- // SystemWarningMsg._lbl_alert_AutoSalverMaterialBindTask = $"璇诲彇鐨剓rgvLocation.ToString()}浣嶇疆锛屽彂鍔ㄦ満鐮佷负{_scan_CargoNo}锛岃鍙戝姩鏈哄簱瀛樺凡瀛樺湪锛屽湪绔嬪簱搴撲綅{store.SrmStationCode}锛屽湪RGV搴撲綅{store.RgvStationCode}锛屼笉鍏佽鑷姩缁勭洏";
- // continue;
- //}
- //闇�瑕佽鍙� 鎵樼洏鍙�
- var _scan_salverCode = FormCC.rgvView.R_1019_Scan;
- if (string.IsNullOrEmpty(_scan_salverCode))
- {
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"璇诲彇鐨剓rgvLocation.ToString()}浣嶇疆锛屾墭鐩樼爜涓虹┖锛屼笉鍏佽鑷姩缁勭洏";
- continue;
- }
- var isSys_HasCatogryForSalverCode = StoreHandler.IsSys_HasCatogryForSalverCode(context, _scan_salverCode, ref store);
- if (isSys_HasCatogryForSalverCode)
- {
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"璇诲彇鐨剓rgvLocation.ToString()}浣嶇疆锛屾墭鐩樼爜涓簕_scan_salverCode}锛岃鎵樼洏搴撳瓨宸插瓨鍦紝鍦ㄧ珛搴撳簱浣峽store.SrmStationCode}锛屽湪RGV搴撲綅{store.RgvStationCode}锛屼笉鍏佽鑷姩缁勭洏";
- continue;
- }
- var isExistOtherTaskDoingForSalverCode = PartTaskHandler.IsExistOtherTaskDoingForSalverCode(stationCode);
- if (isExistOtherTaskDoingForSalverCode)
- {
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"璇诲彇鐨剓rgvLocation.ToString()}浣嶇疆锛屾墭鐩樼爜涓簕_scan_salverCode}锛岃鎵樼洏宸茬粡鏈夋湭缁撴潫鐨勪换鍔¤鍗犵敤锛屼笉鍏佽鑷姩缁勭洏";
- continue;
- }
-
- //绗﹀悎鏉′欢锛屽嵆灏嗚繘琛岃嚜鍔ㄧ粍鐩�
- alertMsg = $"璇诲彇鐨剓rgvLocation.ToString()}浣嶇疆锛屽彂鍔ㄦ満鐮佷负{_scan_CargoNo}锛屾墭鐩樼爜涓簕_scan_salverCode}锛岀鍚堟潯浠讹紝鍗冲皢杩涜鑷姩缁勭洏";
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = alertMsg;
- Log4NetHelper.WriteInfoLog(LogType.DataProcess_BZ39, alertMsg);
-
- try
- {
- //棣栧厛璋冪敤鏈綋鏈烘帴鏀禔PI
- var btjResult = WmsRequestHelper.test_btjReceive(_scan_CargoNo);
- MessageModel<string> v_btjResult = JsonConvert.DeserializeObject<MessageModel<string>>(btjResult);
- if (v_btjResult.success == false)
- {
- alertMsg = $"璇诲彇鐨剓rgvLocation.ToString()}浣嶇疆锛屽彂鍔ㄦ満鐮佷负{_scan_CargoNo}锛屾墭鐩樼爜涓簕_scan_salverCode}锛屾湰浣撴満鎺ユ敹API 璇锋眰澶辫触:WMS杩斿洖娑堟伅涓�->{v_btjResult.msg}";
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = alertMsg;
- Log4NetHelper.WriteInfoLog(LogType.DataProcess_BZ39, alertMsg);
- Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ39, alertMsg, null);
- continue;
- }
- else
- {
- alertMsg = $"璇诲彇鐨剓rgvLocation.ToString()}浣嶇疆锛屽彂鍔ㄦ満鐮佷负{_scan_CargoNo}锛屾墭鐩樼爜涓簕_scan_salverCode}锛屾湰浣撴満鎺ユ敹API 璇锋眰鎴愬姛:WMS杩斿洖娑堟伅涓�->{v_btjResult.msg}";
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = alertMsg;
- Log4NetHelper.WriteInfoLog(LogType.DataProcess_BZ39, alertMsg);
- }
-
- //璋冪敤API
- AddMainTaskPostParam param = new AddMainTaskPostParam()
- {
- InStoreNo = ((int)rgvLocation).ToString(),
- CargoNo = _scan_CargoNo,
- SalverCode = _scan_salverCode,
- };
- MessageModel<string> ret = WmsRequestHelper.SalverMaterialBind(param);
- if (ret.success)
- {
- alertMsg = $"璇诲彇鐨剓rgvLocation.ToString()}浣嶇疆锛屽彂鍔ㄦ満鐮佷负{_scan_CargoNo}锛屾墭鐩樼爜涓簕_scan_salverCode}锛岃嚜鍔ㄧ粍鐩樿姹俉MSAPI鎴愬姛锛�";
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = alertMsg;
- Log4NetHelper.WriteInfoLog(LogType.DataProcess_BZ39, alertMsg);
-
- }
- else
- {
- alertMsg = $"璇诲彇鐨剓rgvLocation.ToString()}浣嶇疆锛屽彂鍔ㄦ満鐮佷负{_scan_CargoNo}锛屾墭鐩樼爜涓簕_scan_salverCode}锛岃嚜鍔ㄧ粍鐩樿姹俉MSAPI澶辫触:WMS杩斿洖娑堟伅涓�->{ret.msg}";
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = alertMsg;
- Log4NetHelper.WriteInfoLog(LogType.DataProcess_BZ39, alertMsg);
- Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ39, alertMsg, null);
- }
- }
- catch (Exception ex)
- {
- alertMsg = $"璇诲彇鐨剓rgvLocation.ToString()}浣嶇疆锛屽彂鍔ㄦ満鐮佷负{_scan_CargoNo}锛屾墭鐩樼爜涓簕_scan_salverCode}锛岃嚜鍔ㄧ粍鐩樿姹俉MSAPI澶辫触:鍑虹幇寮傚父->{ex.Message}";
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = alertMsg;
- Log4NetHelper.WriteInfoLog(LogType.DataProcess_BZ39, alertMsg);
- Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ39, alertMsg, ex);
- }
-
- }
- }
- }
- catch (Exception ex)
- {
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 += "鑷姩缁勭洏 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
- Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ39, "AutoSalverMaterialBindTask 鍑虹幇寮傚父锛�" + ex.Message, ex);
- }
-
- }
- }
-
- }
-}
diff --git a/CC/iWareCC_ASRS/WmsTask/OutPlanTaskDecompose.cs b/CC/iWareCC_ASRS/WmsTask/OutPlanTaskDecompose.cs
deleted file mode 100644
index a39a6e9..0000000
--- a/CC/iWareCC_ASRS/WmsTask/OutPlanTaskDecompose.cs
+++ /dev/null
@@ -1,435 +0,0 @@
-锘縰sing iWareSql;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using iWareSql.DBModel;
-using XiGang.Core.Model;
-using iWareSql.DataAccess;
-using iWareCommon.Common.Globle;
-using System.Threading;
-using iWareCommon.Utils;
-using iWareModel;
-using iWareCC.Common.Helper;
-
-namespace iWareCC
-{
- /// <summary>
- /// 鍑哄簱璁″垝浠诲姟鍒嗚В绾跨▼
- /// </summary>
- public class OutPlanTaskDecompose
- {
- /// <summary>
- /// 澶勭悊銆愪笅鍙戜腑銆戠殑鍑哄簱璁″垝浠诲姟
- /// </summary>
- public static void HandlerIssuingTask()
- {
- var errMsg = "";
- bool result;
- while (true)
- {
- Thread.Sleep(2000);//浼戠湢2绉�
- try
- {
- if (SystemValue.isAllowRuning_HandlerIssuingTask && SystemValue.isStartedModel)
- {
- //鏌ヨ鐘舵��=涓嬪彂涓殑鍑哄簱璁″垝
- var queryState1 = (int)OutPlanStateEnum.涓嬪彂涓�;
- var queryState2 = (int)OutPlanStateEnum.閮ㄥ垎涓嬪彂;
- List<Plan_OutTask> planList = null;
- var isAllowDecomposePlanTask = false;
- using (DbModel context = new DbModel())
- {
- planList = context.Plan_OutTask.Where(x => x.PlanState == queryState1 || x.PlanState == queryState2).ToList();
- if (planList != null && planList.Count > 0)
- {
- //灞忚斀锛岃繖鏍锋瘡娆″彧澶勭悊3涓紝浼氬鑷磋档閫氫粬浠澘閾剧嚎ecu鍒锋暟鎹� 銆怑ditBy shaocx,2022-08-12銆�
- /*
- //棣栧厛楠岃瘉涓嬫槸鍚﹀厑璁镐笅鍙�
- isAllowDecomposePlanTask = IsAllowDecomposePlanTask(context, ref errMsg);
- if (isAllowDecomposePlanTask == false)
- {
- SystemWarningMsg._lbl_Alert_HandlerIssuingTask = errMsg;
- continue;//缁х画涓嬩竴涓惊鐜�
- }
- //*/
- }
- }
- if (planList != null && planList.Count > 0)
- {
- foreach (var item in planList)
- {
- errMsg = "";//閲嶇疆
- using (DbModel mycontext = new DbModel())
- {
- //寤鸿锛氫竴娆″彧鎵ц涓�涓嚭搴撹鍒�,鍙鏈変竴涓鍒掓垚鍔熷垱寤轰簡浠诲姟锛岃寰幆灏辫烦鍑猴紝鐩殑鏄В鍐冲嚭搴撹鍒掓椂鑻ヤ笅鍙�5涓换鍔′腑锛岃嫢鍏朵腑4鍙蜂换鍔′笉榻愬锛屽湪5鍙峰強浠ュ悗鍑哄簱鏃�4鍙蜂换鍔″垰濂介綈濂楋紝鍒欏皢4鍙蜂换鍔′綔涓烘渶楂樹紭鍏堢骇鎻掗槦杩涜鍑哄簱 銆怑ditBy shaocx,2022-08-10銆�
- result = SingleOutPlanTaskHandler(mycontext, item, ref errMsg);
-
- Log4NetHelper.WriteInfoLog(LogType.OutPlanTask, "澶勭悊銆愪笅鍙戜腑銆戠殑鍑哄簱璁″垝浠诲姟=>" + errMsg);
- SystemWarningMsg._lbl_Alert_HandlerIssuingTask = errMsg + "[澶勭悊浠诲姟" + item.PlanNo + "]";
- if (result == true)
- {
- break;//璺冲嚭寰幆锛岀洿鎺ユ墽琛屽惊鐜殑涓嬩竴涓繃绋� 銆怑ditBy shaocx,2022-08-10銆�
- }
- }
- }
- }
- }
- }
- catch (Exception ex)
- {
- SystemWarningMsg._lbl_Alert_HandlerIssuingTask = "鍑虹幇寮傚父:" + ex.Message;
- Log4NetHelper.WriteErrorLog(LogType.CCWCFService, "HandlerIssuingTask鍑虹幇寮傚父锛�" + ex.Message, ex);
- }
- }
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="context"></param>
- /// <param name="outTask"></param>
- /// <param name="errMsg"></param>
- /// <returns>true:琛ㄧず宸茬粡鎵惧埌搴撳瓨锛屽苟鍒涘缓濂戒簡浠诲姟锛宖alse锛氳〃绀烘病鏈夋壘鍒板簱瀛�</returns>
- private static bool SingleOutPlanTaskHandler(DbModel context, Plan_OutTask outTask, ref string errMsg)
- {
- bool fun_Result = false;
- //娉ㄦ剰锛氳繖閲屽繀椤婚噸鏂拌幏鍙栦笅瀵硅薄锛屽洜涓哄墠闈㈢殑鏂规硶涓璂bModel鏄笉涓�鏍风殑,涓嶆槸涓�涓笂涓嬫枃锛屼慨鏀逛笉浜嗘暟鎹� 銆怑ditBy shaocx,2022-07-28銆�
- Plan_OutTask new_outTask = context.Plan_OutTask.Where(x => x.Id == outTask.Id).First();
- errMsg = "";
- var queryState1 = (int)OutTaskDetailStateEnum.绛夊緟涓�;
- var queryState2 = (int)OutTaskDetailStateEnum.缂烘枡;
- var detaiList = context.Plan_OutTaskDetail.Where(x =>
- (x.OutTaskDetailState == queryState1 || x.OutTaskDetailState == queryState2)
- && x.M_PlanId == new_outTask.Id)
- .OrderBy(x => x.CreateTime)//鎸夌収鍒涘缓鏃堕棿鍗囧簭 銆怑ditBy shaocx,2022-08-10銆�
- .ThenBy(x => x.PlanSequence)//鍏舵鎸夌収椤哄簭鍗囧簭锛屼富瑕佹槸缁� 鎸夌収鎸夎璐у彿鍑哄簱鐨勫嚭搴撻『搴忔潵鐨� 銆怑ditBy shaocx,2024-01-31銆�
- .ToList();
- if (detaiList != null && detaiList.Count > 0)
- {
- //寤鸿锛氫竴娆″彧鎵ц涓�娆″嚭搴撲换鍔�
- foreach (var item in detaiList)
- {
- var result = SingleOutPlanDetailTaskHandlerForVirtual(context, new_outTask, item, ref errMsg);
- //var result = false;//鏆傛椂鍏堝睆钄借鍙栬櫄鎷熷簱瀛樼殑鏁版嵁
- if (result == false)
- {//琛ㄧず娌℃湁鎵惧埌铏氭嫙搴撳瓨锛屽氨鍐嶅幓鏌� 鐪熷疄搴撳瓨
- result = SingleOutPlanDetailTaskHandler(context, new_outTask, item, ref errMsg);
- if (result == false)
- {//琛ㄧず娌℃湁鎵惧埌瀹為檯搴撳瓨
-
- }
- else
- {//琛ㄧず鎵惧埌浜嗗疄闄呭簱瀛橈紝骞舵垚鍔熷垱寤轰簡浠诲姟
- fun_Result = true;
- break;//鎴愬姛鍚庡氨璺冲嚭寰幆
- }
- }
- else
- {//琛ㄧず鎵惧埌浜嗚櫄鎷熷嚭搴擄紝骞舵垚鍔熷垱寤轰簡浠诲姟
- fun_Result = true;
- break;//鎴愬姛鍚庡氨璺冲嚭寰幆
- }
- }
- }
- else
- {
- //涓嶄簣澶勭悊
- }
- return fun_Result;
- }
-
- /// <summary>
- /// 鍗曚釜澶勭悊鍑哄簱璁″垝鏄庣粏-鐪熷疄搴撳瓨涓鐞�
- /// </summary>
- /// <param name="context"></param>
- /// <param name="outTask"></param>
- /// <param name="outDetailTask"></param>
- /// <param name="errMsg"></param>
- /// <returns>true:琛ㄧず宸茬粡鎵惧埌搴撳瓨锛屽苟鍒涘缓濂戒簡浠诲姟锛宖alse锛氳〃绀烘病鏈夋壘鍒板簱瀛�</returns>
- private static bool SingleOutPlanDetailTaskHandler(DbModel context, Plan_OutTask outTask, Plan_OutTaskDetail outDetailTask, ref string errMsg)
- {
- errMsg = "";
- var remark = "娑堣垂涓嬪彂涓殑浠诲姟";
- //1銆佹悳绱㈠簱瀛樻槸鍚﹀瓨鍦�
- var queliaoReason = "";
- var findStore = StoreHandler.FindStoreForOutPlan(context, outDetailTask, ref errMsg, ref queliaoReason);
- if (findStore == null)
- {//琛ㄧず鏌ユ壘搴撳瓨澶辫触
- //鏇存柊Plan_OutTaskDetail琛ㄧ殑OperationRemark鍊�
- var changeOutTaskDetailState = OutTaskDetailStateEnum.缂烘枡;
- outDetailTask.OutTaskDetailState = (int)changeOutTaskDetailState;
- outDetailTask.OutTaskDetailStateName = changeOutTaskDetailState.ToString();//鏇存柊 鐘舵�佷负缂烘枡 [EditBy shaocx,2022-08-24]
- outDetailTask.OperationRemark = SysGloble.QUELIAO_STR;
-
- //璧嬪�肩己鏂欏師鍥� 銆怑ditby shaocx,2022-10-24銆�
- outDetailTask.Remark = MyExtendHelper.GetQueliaoReason(outDetailTask.Remark, queliaoReason);
-
- outDetailTask.ModifyTime = DateTime.Now;
- outDetailTask.ModifyBy = SysGloble.WCSSystem;
- //閲嶈锛氾紒鎻愬墠鐢熸垚椤哄簭鍙� [EditBy shaocx,2022-08-24]
- string taskSequenceGuid = "";
- outDetailTask.MainTaskSequence = MainTaskHandler.GenerateTaskSequence(context, ref taskSequenceGuid);
- outDetailTask.TaskSequenceGuid = taskSequenceGuid;
-
- context.SaveChanges();
-
- Log4NetHelper.WriteInfoLog(LogType.OutPlanTask, errMsg);
- return false;
- }
- else
- {//鏌ユ壘鍒板簱瀛�
-
- #region 浜嬪姟澶勭悊
- string taskSequenceGuid = "";
- int myTaskSequence = GetLastOutTaskDetailTaskSequenceForQueLiao(context, outDetailTask, ref taskSequenceGuid);
- using (var trans = context.Database.BeginTransaction())
- {
- try
- {
- var sourcePlace = StationHandler.GetPlaceByPlaceId(findStore.StationId, context);
- //2銆侀攣瀹氬簱瀛�
- StationHandler.SetPlaceLockStatus(true, SysGloble.WCSSystem, ref sourcePlace, remark);
- StationHandler.SetPlaceTaskDoingStatus(true, SysGloble.WCSSystem, ref sourcePlace, remark);
-
- //3銆佸垱寤哄嚭搴撲换鍔�
- FunRetEntity addOutStoreTaskResult = MainTaskHandler.AddOutStoreTask(outDetailTask, findStore, context, MainTaskTypeEnum.鑷姩鍑哄簱, new SysUser()
- {
- ID = 0,
- Name = SysGloble.WCSSystem
- }, sourcePlace, myTaskSequence, taskSequenceGuid);
- if (addOutStoreTaskResult.result == false)
- {
- errMsg = addOutStoreTaskResult.resMsg;
- throw new Exception(errMsg);
- }
-
- //4銆佹洿鏂板嚭搴撴槑缁嗚〃
- var mainTask = addOutStoreTaskResult.resData as Task_Main;
- if (mainTask == null)
- {
- errMsg = "鏂板缓鐨勪富浠诲姟瀵硅薄涓篘ULL";
- throw new Exception(errMsg);
- }
-
- outDetailTask.TaskSequenceGuid = mainTask.TaskSequenceGuid;//閲嶈锛佷繚瀛楾askSequenceGuid鍊� 銆怑ditBy shaocx,2022-08-25銆�
-
- outDetailTask.OperationRemark = "璁惧浠诲姟宸插垱寤�";//娉ㄦ剰锛氳繖閲岀殑OperationRemark涓�瀹氳鏇存柊锛屽洜涓虹己鏂欑殑鏃跺�欐垜鏇存柊浜嗭紝缂烘枡鐨勬煡璇篃鐢ㄥ埌浜� 銆怑ditBy shaocx,2022-04-29銆�
- outDetailTask.MainTaskId = mainTask.Id;
- outDetailTask.MainTaskNo = mainTask.TaskNo;
- outDetailTask.SerialNumber = findStore.SerialNumber;//淇濆瓨搴忓垪鍙�
- outDetailTask.OrderNo = findStore.OrderNo;
- outDetailTask.MaterialId = findStore.MaterialId;//淇濆瓨鐗╂枡淇℃伅
- var changeOutTaskDetailState = OutTaskDetailStateEnum.璁惧浠诲姟寰呮墽琛�;
- PlanOutTaskHandler.UpdateStateForOutTaskDetail(outDetailTask, changeOutTaskDetailState, remark);
- //5銆佹洿鏂板嚭搴撲富琛�
- SetPlanStateForPlan_OutTask(context, outTask, changeOutTaskDetailState, remark);
-
- //娓呯悊涔嬪墠娈嬬暀鐨勭己鏂欑殑淇℃伅 銆怑ditby shaocx,2022-10-24銆�
- outDetailTask.Remark = MyExtendHelper.CleareQueliaoReason(outDetailTask.Remark);
-
- ////鏇存敼浠诲姟涓昏〃涓轰换鍔″凡鍒嗚В
- ////鏇存柊涓昏〃鐨勪换鍔＄姸鎬�
- //var _changeTaskState = MainTaskStatusEnum.鍑哄簱浠诲姟宸插垎瑙�;
- //mainTask.TaskState = (int)_changeTaskState;
- //mainTask.TaskStateName = _changeTaskState.ToString();
-
- //淇濆瓨鏁版嵁搴�
- context.SaveChanges();
-
- trans.Commit();
- return true;//鎵惧埌浜嗗簱瀛橈紝骞跺鐞嗘垚鍔熶簡
- }
- catch (Exception ex)
- {
- trans.Rollback();
- SystemWarningMsg._lbl_Alert_HandlerIssuingTask = "SingleOutPlanDetailTaskHandler鍑虹幇寮傚父:" + ex.Message;
- Log4NetHelper.WriteErrorLog(LogType.CCWCFService, "SingleOutPlanDetailTaskHandler 鍑虹幇寮傚父锛�" + ex.Message, ex);
- throw ex;
- }
- }
- #endregion
- }
- }
-
-
- /// <summary>
- /// 鍗曚釜澶勭悊鍑哄簱璁″垝鏄庣粏-铏氭嫙搴撳瓨涓鐞� [Editby shaocx,2022-07-28]
- /// </summary>
- /// <param name="context"></param>
- /// <param name="outTask"></param>
- /// <param name="outDetailTask"></param>
- /// <param name="errMsg"></param>
- /// <returns>true:琛ㄧず鎵惧埌铏氭嫙搴撳瓨锛屽苟澶勭悊鎴愬姛浜嗭紝false琛ㄧず娌℃湁鎵惧埌铏氭嫙搴撳瓨</returns>
- private static bool SingleOutPlanDetailTaskHandlerForVirtual(DbModel context, Plan_OutTask outTask, Plan_OutTaskDetail outDetailTask, ref string errMsg)
- {
- errMsg = "";
- var remark = "娑堣垂涓嬪彂涓殑浠诲姟";
- //1銆佹悳绱㈠簱瀛樻槸鍚﹀瓨鍦�
- var findVirtualStore = StoreHandler.FindStoreForOutPlanByVirtual(context, outDetailTask, ref errMsg);
- if (findVirtualStore == null)
- {//琛ㄧず鏌ユ壘搴撳瓨澶辫触
- return false;//琛ㄧず鍦ㄨ櫄鎷熷簱瀛樹腑娌℃湁鎵惧埌搴撳瓨
- }
- else
- {//鏌ユ壘鍒板簱瀛�
-
- #region 浜嬪姟澶勭悊
- using (var trans = context.Database.BeginTransaction())
- {
- try
- {
- //1銆佸簱瀛樼Щ闄�
- context.Wms_VirtualStore.Remove(findVirtualStore);
- //findVirtualStore.IsDeleted = true;
- //findVirtualStore.ModifyBy = "";
- //findVirtualStore.OperationRemark = remark + "[閿佸畾搴撳瓨]";
- //findVirtualStore.ModifyTime = DateTime.Now;
-
- //2銆佸垱寤鸿櫄鎷熷嚭搴撲换鍔★紝娉ㄦ剰锛氫换鍔＄姸鎬佸繀椤绘槸宸插畬鎴愶紝鍥犱负鏄櫄鎷熷嚭搴�
- FunRetEntity addOutStoreTaskResult = MainTaskHandler.AddOutStoreTaskForVirtual(outDetailTask, findVirtualStore, context, MainTaskTypeEnum.鑷姩鍑哄簱, new SysUser()
- {
- ID = 0,
- Name = SysGloble.WCSSystem
- });
- if (addOutStoreTaskResult.result == false)
- {
- errMsg = addOutStoreTaskResult.resMsg;
- throw new Exception(errMsg);
- }
-
- //4銆佹洿鏂板嚭搴撴槑缁嗚〃
- var mainTask = addOutStoreTaskResult.resData as Task_Main;
- if (mainTask == null)
- {
- errMsg = "鏂板缓鐨勪富浠诲姟瀵硅薄涓篘ULL";
- throw new Exception(errMsg);
- }
-
- outDetailTask.OperationRemark = "璁惧浠诲姟宸插垱寤�,骞跺畬鎴�";//娉ㄦ剰锛氳繖閲岀殑OperationRemark涓�瀹氳鏇存柊锛屽洜涓虹己鏂欑殑鏃跺�欐垜鏇存柊浜嗭紝缂烘枡鐨勬煡璇篃鐢ㄥ埌浜� 銆怑ditBy shaocx,2022-04-29銆�
- outDetailTask.MainTaskId = mainTask.Id;
- outDetailTask.MainTaskNo = mainTask.TaskNo;
- outDetailTask.SerialNumber = findVirtualStore.SerialNumber;//淇濆瓨搴忓垪鍙�
- outDetailTask.OrderNo = findVirtualStore.OrderNo;
- outDetailTask.MaterialId = findVirtualStore.MaterialId;//淇濆瓨鐗╂枡淇℃伅
- var changeOutTaskDetailState = OutTaskDetailStateEnum.瀹屾垚;//娉ㄦ剰锛氳鍙樻垚 宸插畬鎴�
- PlanOutTaskHandler.UpdateStateForOutTaskDetail(outDetailTask, changeOutTaskDetailState, remark);
- //5銆佹洿鏂板嚭搴撲富琛�
- SetPlanStateForPlan_OutTask(context, outTask, changeOutTaskDetailState, remark);
-
-
- //淇濆瓨鏁版嵁搴�
- context.SaveChanges();
-
- trans.Commit();
-
- return true;
- }
- catch (Exception ex)
- {
- trans.Rollback();
- SystemWarningMsg._lbl_Alert_HandlerIssuingTask = "SingleOutPlanDetailTaskHandler鍑虹幇寮傚父:" + ex.Message;
- Log4NetHelper.WriteErrorLog(LogType.CCWCFService, "SingleOutPlanDetailTaskHandler 鍑虹幇寮傚父锛�" + ex.Message, ex);
- throw ex;
- }
- }
-
- #endregion
- }
- }
-
- private static void SetPlanStateForPlan_OutTask(DbModel context, Plan_OutTask outTask, OutTaskDetailStateEnum currnetChange, string remark)
- {
- //璁＄畻鏁伴噺
- var queryState1 = (int)OutTaskDetailStateEnum.瀹屾垚;
- var queryState2 = (int)OutTaskDetailStateEnum.鎵ц涓�;
- var allPlanList = context.Plan_OutTaskDetail.Where(x => x.M_PlanId == outTask.Id).ToList();
- outTask.Qty = allPlanList.Count;//閲嶆柊璧嬪�兼�绘暟閲�
-
- var issued_planList = allPlanList.Where(x => x.OutTaskDetailState == queryState1 || x.OutTaskDetailState == queryState2).ToList();
- int issued_planListCount = issued_planList.Count();
-
- if (currnetChange == OutTaskDetailStateEnum.瀹屾垚 || currnetChange == OutTaskDetailStateEnum.鎵ц涓�)
- {
- //璁″叆鏈瑕佷慨鏀圭殑鏉℃暟
- //鏄惁杩欓噷涓嶉渶瑕�+1,寰呮祴璇� 銆愰噸瑕侊紒锛侊紒锛侊紒銆�
- //issued_planListCount += 1;
- }
- OutPlanStateEnum changeOutTaskDetailState;
- if (outTask.Qty <= issued_planListCount)
- {//鏇存柊涓昏〃鐘舵�佷负 鍏ㄩ儴涓嬪彂
-
- changeOutTaskDetailState = OutPlanStateEnum.鍏ㄩ儴涓嬪彂;
- PlanOutTaskHandler.UpdateStateForOutTask(outTask, changeOutTaskDetailState, remark);
- //淇敼榻愬鎬т负宸查綈濂� [EditBy shaocx,2022-05-16]
- outTask.IsPickFinished = true;
- //鏇存柊璁″垝杩涘害
- outTask.PlanRate = 100;
- outTask.Qty_Finish = outTask.Qty;
- outTask.Qty_NoFinish = 0;
- }
- else if (issued_planListCount > 0)
- {
- changeOutTaskDetailState = OutPlanStateEnum.閮ㄥ垎涓嬪彂;
- PlanOutTaskHandler.UpdateStateForOutTask(outTask, changeOutTaskDetailState, remark);
- //鏇存柊璁″垝杩涘害
- //outTask.PlanRate = (issued_planListCount / allPlanList.Count()) * 100;
- outTask.PlanRate = CSharpHelper.ExecPercentRetInt(issued_planListCount, outTask.Qty);
-
- outTask.Qty_Finish = issued_planListCount;
- outTask.Qty_NoFinish = outTask.Qty - issued_planListCount;
- }
- }
-
-
- /// <summary>
- /// 鏄惁鍏佽缁х画鍒嗚В浠诲姟璁″垝 [EditBy shaocx,2022-08-11]
- /// </summary>
- /// <param name="context"></param>
- /// <returns></returns>
- private static bool IsAllowDecomposePlanTask(DbModel context, ref string errMsg)
- {
- var queryState1 = (int)MainTaskStatusEnum.寰呭嚭搴�;
- var queryState2 = (int)MainTaskStatusEnum.鍑哄簱浠诲姟宸插垎瑙�;
- var queryState3 = (int)MainTaskStatusEnum.鍑哄簱涓�;
-
- var queryMaterialType = (int)MaterialTypeEnum.涓�鑸墿鏂�;
-
- var queryInOutFlag = (int)MainInOutFlagEnum.鍑哄簱;
-
-
- var mainList = context.Task_Main.Where(x => (x.TaskState == queryState1 || x.TaskState == queryState2 || x.TaskState == queryState3) && x.MaterialType == queryMaterialType
- && x.InOutFlag == queryInOutFlag).ToList();
-
- if (mainList != null && mainList.Count >= 3)
- {//涓轰粈涔堟槸3锛岃�冭檻鍒� 1012+2涓嚭搴撳彛閮芥湁鍙戝姩鏈虹殑鎯呭喌
- errMsg = "鐩墠宸叉湁" + mainList.Count + "鏉″嚭搴撲换鍔℃湭缁撴潫锛屼笉鍏佽缁х画鍒嗚В浠诲姟璁″垝";
- return false;
- }
- return true;
- }
-
- /// <summary>
- /// 缂烘枡鐨勬暟鎹紝鎻掗槦澶勭悊
- /// </summary>
- /// <param name="context"></param>
- /// <param name="planDetail"></param>
- /// <returns></returns>
- private static int GetLastOutTaskDetailTaskSequenceForQueLiao(DbModel context, Plan_OutTaskDetail planDetail, ref string taskSequenceGuid)
- {
- if (planDetail.OutTaskDetailState == (int)OutTaskDetailStateEnum.缂烘枡)
- {//濡傛灉鏄己鏂欑殑璇濓紝灏遍渶瑕� 鎻掗槦澶勭悊 銆怑ditBy shaocx,2022-08-24銆�
- //棣栧厛瑕佸垽鏂綋鍓嶅悓涓�涓猅askSequenceGuid鏄惁閮藉仛瀹屼簡锛屽鏋滈兘鍋氬畬浜嗭紝閭ｄ箞浠栧氨瑕佹帓鍒扮涓�浣嶄紭鍏堟墽琛岋紝濡傛灉杩樻病鍋氬畬锛屽氨鎸夌収鍘熷厛鐨勯『搴忔潵銆�
- taskSequenceGuid = planDetail.TaskSequenceGuid;
- bool isNeedChaDui = PlanOutTaskHandler.IsNeedChaDuiCommonTaskSequenceGuid(context, taskSequenceGuid);
- if (isNeedChaDui)
- {
- return 1;//鎻掗槦澶勭悊
- }
- return Convert.ToInt32(planDetail.MainTaskSequence);//鎸夌収鍘熷厛鐨勮妭濂忛『搴忚蛋
- }
- return 0;//姝ｅ父鎺掑簭
- }
- }
-}
diff --git a/CC/iWareCC_ASRS/WmsTask/Place1014To1020Task.cs b/CC/iWareCC_ASRS/WmsTask/Place1014To1020Task.cs
deleted file mode 100644
index 04f1bd3..0000000
--- a/CC/iWareCC_ASRS/WmsTask/Place1014To1020Task.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-锘縰sing iWareCC.Common.Helper;
-using iWareCommon.Common.Globle;
-using iWareCommon.Utils;
-using iWareModel;
-using iWareSql;
-using iWareSql.DataAccess;
-using iWareSql.DBModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using XiGang.Core.Model;
-
-namespace iWareCC
-{
- /// <summary>
- /// 1014搴撲綅杞繍鍒�1020绾跨▼
- /// </summary>
- public static class Place1014To1020Task
- {
- public static void Handler()
- {
- while (true)
- {
- // SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask = "";
- Thread.Sleep(2000);//浼戠湢2绉�
- try
- {
- if (SystemValue.isAllowRuning_Place1014To1020Task && SystemValue.isStartedModel)
- {
- if (FormCC.RGV_1020_NoHasCategory_COUNT <= 25)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1020绔欑偣锛�25绉掑唴鍏夌數鏄剧ず鏈夎揣锛屾棤椤诲鐞嗚浆杩愬埌1020浠诲姟";
- continue;
- }
-
- using (DbModel context = new DbModel())
- {
- EDevice rgvLocation = EDevice.鎷嗙洏鏈哄叆鍙�1014;
-
- var stationCode = Convert.ToInt32(rgvLocation).ToString();
- var isGD_HasCatogryForRgvStattion = MyExtendHelper.IsGD_HasCatogryForRgvStattionFor2(stationCode);
- V_AllStore store = null;
- var isSys_HasCatogryForRgvStattion = MyExtendHelper.IsSys_HasCatogryForRgvStattion(context, stationCode, ref store);
- var isExistOtherTaskDoing = PartTaskHandler.IsExistOtherTaskDoing(stationCode);
- var isExistOtherTaskDoingForDeviceTaskTypeEnum_绔嬪簱绌烘墭鍒版媶鐩樻満鍏ュ彛 = PartTaskHandler.IsExistOtherTaskDoingForDeviceTaskTypeEnum(DeviceTaskTypeEnum.绔嬪簱绌烘墭鍒版媶鐩樻満鍏ュ彛);
- var isExistOtherTaskDoingForDeviceTaskTypeEnum_绌烘墭杞繍鍒版媶鐩樻満鍏ュ彛 = PartTaskHandler.IsExistOtherTaskDoingForDeviceTaskTypeEnum(DeviceTaskTypeEnum.绌烘墭杞繍鍒版媶鐩樻満鍏ュ彛);
-
- if (isGD_HasCatogryForRgvStattion == false)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1014绔欑偣锛屽厜鐢垫樉绀烘棤璐э紝鏃犻』澶勭悊杞繍鍒�1020浠诲姟";
- continue;
- }
- else if (isSys_HasCatogryForRgvStattion == false)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1014绔欑偣锛岀郴缁熸樉绀烘棤璐э紝鏃犻』澶勭悊杞繍鍒�1020浠诲姟";
- continue;
- }
- else if (isExistOtherTaskDoing == true)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1014绔欑偣锛岀郴缁熸樉绀烘湁鍏朵粬浠诲姟鍗犵敤锛屾棤椤诲鐞嗚浆杩愬埌1020浠诲姟";
- continue;
- }
- else if (isExistOtherTaskDoingForDeviceTaskTypeEnum_绔嬪簱绌烘墭鍒版媶鐩樻満鍏ュ彛 == true)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1014绔欑偣锛岀郴缁熸樉绀烘湁绔嬪簱绌烘墭鍒版媶鐩樻満鍏ュ彛浠诲姟鍗犵敤锛屾棤椤诲鐞嗚浆杩愬埌1020浠诲姟";
- continue;
- }
- else if (isExistOtherTaskDoingForDeviceTaskTypeEnum_绌烘墭杞繍鍒版媶鐩樻満鍏ュ彛 == true)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1014绔欑偣锛岀郴缁熸樉绀烘湁绌烘墭杞繍鍒版媶鐩樻満鍏ュ彛浠诲姟鍗犵敤锛屾棤椤诲鐞嗚浆杩愬埌1020浠诲姟";
- continue;
- }
-
- //鍒ゆ柇1020
- EDevice rgvLocation_1020 = EDevice.鎷嗙洏鏈�1020;
- isGD_HasCatogryForRgvStattion = MyExtendHelper.IsGD_HasCatogryForRgvStattion(((int)rgvLocation_1020).ToString());
- if (isGD_HasCatogryForRgvStattion == true)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1020绔欑偣锛屽厜鐢垫樉绀烘湁璐э紝鏃犻』澶勭悊杞繍鍒�1020浠诲姟";
- continue;
- }
-
- ////绛夊緟30绉掞紝纭畾鎷嗙洏鏈烘棤璐ф墠鍙互鍒涘缓浠诲姟,鍥犱负鎷嗙洏鏈哄湪鎷嗙洏鐨勬椂鍊欙紝鍏夌數鍙兘鏈変竴鐬棿鏄� 鏃犺揣鐨勭姸鎬� [EditBy shaocx,2022-04-29]
- //Thread.Sleep(30 * 1000);
- //rgvLocation_1020 = EDevice.鎷嗙洏鏈�1020;
- //isGD_HasCatogryForRgvStattion = MyExtendHelper.IsGD_HasCatogryForRgvStattion(((int)rgvLocation_1020).ToString());
- //if (isGD_HasCatogryForRgvStattion == true)
- //{
- // SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask = "1020绔欑偣锛屽厜鐢垫樉绀烘湁璐э紝鏃犻』澶勭悊杞繍鍒�1020浠诲姟";
- // continue;
- //}
-
-
- #region 澶勭悊
- var fr = MyExtendHelper.DoHandler(context, store, EDevice.鎷嗙洏鏈�1020);
- if (fr.result == false)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "閿欒锛氭媶鐩樻満鍏ュ彛1014澶勬柊寤轰粠 1014搴撲綅杞繍鍒�1020绾跨▼ 浠诲姟澶辫触:" + fr.resMsg;
- }
- else
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "鎴愬姛鍒涘缓鎷嗙洏鏈哄叆鍙�1014澶勬柊寤� 1014搴撲綅杞繍鍒�1020 浠诲姟";
- }
- #endregion
-
- continue;
-
- }
- }
- }
- catch (Exception ex)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1014搴撲綅杞繍鍒�1020绾跨▼鍑虹幇寮傚父:" + ex.Message;
- Log4NetHelper.WriteErrorLog(LogType.CCWCFService, "Place1014To1020Task 鍑虹幇寮傚父锛�" + ex.Message, ex);
- }
- }
- }
- }
-}
diff --git a/CC/iWareCC_ASRS/WmsTask/PrintHandler.cs b/CC/iWareCC_ASRS/WmsTask/PrintHandler.cs
new file mode 100644
index 0000000..22381c2
--- /dev/null
+++ b/CC/iWareCC_ASRS/WmsTask/PrintHandler.cs
@@ -0,0 +1,152 @@
+锘縰sing Admin.NET.Application;
+using iWareCommon.Utils;
+using iWareSql.WmsDBModel;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading;
+
+namespace iWareCC
+{
+ /// <summary>
+ /// 鎵撳嵃澶勭悊鐨勭嚎绋�
+ /// </summary>
+ public class PrintHandler
+ {
+ public static void Handler()
+ {
+ var errMsg = "";
+ while (true)
+ {
+ try
+ {
+ SystemWarningMsg._lbl_Alert_PrintHandler = "寰幆寮�濮�...";
+ if (SystemValue.isAllowRuning_PrintHandler && SystemValue.isStartedModel)
+ {
+ errMsg = "";//閲嶇疆
+ try
+ {
+ Do(ref errMsg);
+ if (!string.IsNullOrEmpty(errMsg))
+ {
+ SystemWarningMsg._lbl_Alert_PrintHandler = errMsg;
+ }
+ }
+ catch (Exception ex)
+ {
+ Log4NetHelper.WriteErrorLog(LogType.PrintHandler, "鎵撳嵃澶勭悊鐨勭嚎绋�=>" + errMsg + ",寮傚父:" + ex.Message, ex);
+ SystemWarningMsg._lbl_Alert_PrintHandler = "鎵撳嵃澶勭悊鐨勭嚎绋�=>" + errMsg + ",寮傚父:" + ex.Message;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ SystemWarningMsg._lbl_Alert_PrintHandler = "鍑虹幇寮傚父:" + ex.Message;
+ Log4NetHelper.WriteErrorLog(LogType.PrintHandler, "PrintHandler 鍑虹幇寮傚父锛�" + ex.Message, ex);
+ }
+ Thread.Sleep(2 * 1000);//浼戠湢2绉�
+ }
+ }
+
+
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
+ /// <param name="model"></param>
+ /// <param name="Lane"></param>
+ /// <param name="flag"></param>
+ /// <param name="errMsg"></param>
+ private static void Do(ref string errMsg)
+ {
+ using (WmsDBModel mycontext = new WmsDBModel())
+ {
+ var query_PrintStatuEnum = (int)PrintStatuEnum.鏈墦鍗�;
+ var list = mycontext.wms_record_print.Where(x => (x.IsDelete == false) && x.PrintStatus == query_PrintStatuEnum)
+ .OrderBy(x => x.Id).ToList();
+
+
+ wms_config_print printConfig = null;
+ string _PrinterName = "";
+ if (list.Count > 0)
+ {
+
+ }
+ else
+ {
+ errMsg = $"娌℃湁鍙墦鍗扮殑鍐呭锛�";
+ return;
+ }
+
+ foreach (var item in list)
+ {
+
+
+ PrintClassifyEnum printClassifyEnum = PrintClassifyEnum.鍖呰鏉＄爜;
+
+
+ printConfig = mycontext.wms_config_print.Where(x => x.PrintClassify == (int)printClassifyEnum).FirstOrDefault();
+ if (printConfig == null)
+ {
+ errMsg = $"娌℃湁鎵惧埌{printClassifyEnum.ToString()}鐨勬墦鍗伴厤缃紒";
+ return;
+ }
+ //璁剧疆鎵撳嵃鏈猴紝娉ㄦ剰锛氳繖閲屽彧鑾峰彇绗竴涓紝浠ュ悗鍙兘瑕佹敼锛�
+ _PrinterName = printConfig.PrinterList.Split(',')[0];
+ //鏍规嵁閰嶇疆鍚嶅瓧鏌ヨ 鎵撳嵃鏈哄悕瀛�
+ var printConfigData = mycontext.SysDictData.Where(x => x.Name == _PrinterName).FirstOrDefault();
+ if (printConfigData == null)
+ {
+ errMsg = $"娌℃湁鎵惧埌{_PrinterName.ToString()}鐨勬墦鍗版満鍚嶅瓧锛�";
+ return;
+ }
+ _PrinterName = printConfigData.Value;
+
+ Dictionary<string, object> data = new Dictionary<string, object>();
+ if (printClassifyEnum == PrintClassifyEnum.鍖呰鏉＄爜)
+ {
+ data.Add("bar", item.SNCode);
+ data.Add("material", item.MaterialCode ?? "" + "/" + item.MaterialName ?? "");
+ data.Add("supplier", item.SupplierName ?? "");
+ data.Add("unit", item.MaterialUnit ?? "");
+ data.Add("qty", item.Quantity);
+ data.Add("date", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ }
+ else
+ {
+
+ }
+
+
+ //璋冪敤鎵撳嵃鎺ュ彛
+ bool isSuccess = false;
+ using (PrintBaseService.PrintWcfServiceClient client = new PrintBaseService.PrintWcfServiceClient())
+ {
+ //isSuccess = client.Print3(data, 1, @"D:\鎵撳嵃绋嬪簭\璺熻釜鐮佹墦鍗版ā鏉縗璺熻釜鐮佹墦鍗版ā鏉縚涓�缁寸爜.btw", "ZDesigner ZD888-203dpi ZPL", out errMsg);
+ //isSuccess = client.Print3(data, 1, @"D:\鎵撳嵃绋嬪簭\璺熻釜鐮佹墦鍗版ā鏉縗璺熻釜鐮佹墦鍗版ā鏉縚浜岀淮鐮�.btw", "ZDesigner ZD888-203dpi ZPL", out errMsg);
+ isSuccess = client.Print3(data, item.PrintSheetNum, printConfig.PrintTemplateAddr, _PrinterName, out errMsg);
+ }
+ if (isSuccess)
+ {
+ item.PrintStatus = 1;//鎵撳嵃鐘舵��(0锛氭湭鎵撳嵃 1锛氬凡鎵撳嵃)
+ item.PrintNum = (item.PrintNum) + 1;
+
+ mycontext.SaveChanges();
+ }
+ else
+ {
+ errMsg = $"鎵撳嵃閿欒,璺熻釜鐮亄item.SNCode}锛屾墦鍗版満鍚嶇О{_PrinterName},閿欒淇℃伅锛�(鎵撳嵃鏈嶅姟杩斿洖)" + errMsg;
+ Log4NetHelper.WriteErrorLog(LogType.PrintHandler, errMsg, null);
+ return;
+ }
+
+ Thread.Sleep(2000);
+ }
+
+ }
+ }
+
+
+
+ }
+}
diff --git a/CC/iWareCC_ASRS/WmsTask/VirtualTaskNoOutPlanTaskHandler.cs b/CC/iWareCC_ASRS/WmsTask/VirtualTaskNoOutPlanTaskHandler.cs
deleted file mode 100644
index e9cffb0..0000000
--- a/CC/iWareCC_ASRS/WmsTask/VirtualTaskNoOutPlanTaskHandler.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-锘縰sing iWareSql;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using iWareSql.DBModel;
-using XiGang.Core.Model;
-using iWareSql.DataAccess;
-using iWareCommon.Common.Globle;
-using System.Threading;
-using iWareCommon.Utils;
-using iWareModel;
-
-namespace iWareCC
-{
- /// <summary>
- /// 铏氭嫙鍑哄簱澶勭悊锛屽苟涓斾笉鍦ㄥ嚭搴撹鍒掍换鍔′腑鐨勭嚎绋�
- /// </summary>
- public class VirtualTaskNoOutPlanTaskHandler
- {
- /// <summary>
- /// 澶勭悊銆愯櫄鎷熷嚭搴撳鐞嗐�戠殑鍑哄簱璁″垝浠诲姟
- /// </summary>
- public static void Handler()
- {
- var errMsg = "";
- while (true)
- {
- try
- {
- if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTask && SystemValue.isStartedModel)
- {
- errMsg = "";//閲嶇疆
- using (DbModel mycontext = new DbModel())
- {
- try
- {
- SingleOutPlanTaskHandler(mycontext, ref errMsg);
- if (string.IsNullOrEmpty(errMsg))
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = "鎴愬姛澶勭悊";
- }
- else
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = errMsg;
- }
- }
- catch (Exception ex)
- {
- Log4NetHelper.WriteErrorLog(LogType.OutPlanTask, "澶勭悊銆愯櫄鎷熷嚭搴撳鐞嗐�戠殑鍑哄簱璁″垝浠诲姟=>" + errMsg + ",寮傚父:" + ex.Message, ex);
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = "澶勭悊銆愯櫄鎷熷嚭搴撳鐞嗐�戠殑鍑哄簱璁″垝浠诲姟=>" + errMsg + ",寮傚父:" + ex.Message;
- }
- }
- }
- }
- catch (Exception ex)
- {
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = "鍑虹幇寮傚父:" + ex.Message;
- Log4NetHelper.WriteErrorLog(LogType.DataProcess_RobotBuffer_FinishTask, "VirtualTaskNoOutPlanTaskHandler鍑虹幇寮傚父锛�" + ex.Message, ex);
- }
- Thread.Sleep(10 * 1000);//浼戠湢10绉�
- }
- }
-
- private static void SingleOutPlanTaskHandler(DbModel context, ref string errMsg)
- {
- errMsg = "";
- List<Wms_VirtualStore> noPlanTaskList = new List<Wms_VirtualStore>();
- //褰撳墠铏氭嫙搴撳瓨
- var virtualStroeList = context.Wms_VirtualStore.ToList();
- if (virtualStroeList != null && virtualStroeList.Count > 0)
- {
- var queryState1 = (int)OutTaskDetailStateEnum.绛夊緟涓�;
- var queryState2 = (int)OutTaskDetailStateEnum.缂烘枡;
- var detaiList = context.Plan_OutTaskDetail.Where(x => x.OutTaskDetailState == queryState1 || x.OutTaskDetailState == queryState2).ToList();
- if (detaiList != null && detaiList.Count > 0)
- {
- foreach (var virtualStroe in virtualStroeList)
- {
- var isExist = false;
- //鍒ゆ柇杩欎簺璁″垝鏄惁鏈夌鍚� 铏氭嫙搴撳瓨涓殑
- foreach (var planDetail in detaiList)
- {
- var queliaoReason = "";
- var findStore = StoreHandler.FindStoreForOutPlan(context, planDetail, ref errMsg, ref queliaoReason);
- if (findStore != null)
- {
- isExist = true;
- break;
- }
- }
- if (isExist == false)
- {
- noPlanTaskList.Add(virtualStroe);
- }
- }
-
- //澶勭悊 涓嶅啀鍑哄簱璁″垝涓殑铏氭嫙搴撳瓨,灏嗕粬浠粺缁熻瀹氫负浜哄伐鍑哄簱
- foreach (var item in noPlanTaskList)
- {
- SingleTaskHandlerForVirtual(context, item, ref errMsg);
- }
- }
- else
- {
- //涓嶄簣澶勭悊
- }
- }
- }
-
- /// <summary>
- /// 鍗曚釜澶勭悊鍑哄簱-铏氭嫙搴撳瓨涓鐞� [Editby shaocx,2022-07-28]
- /// </summary>
- /// <param name="context"></param>
- /// <param name="outTask"></param>
- /// <param name="outDetailTask"></param>
- /// <param name="errMsg"></param>
- /// <returns></returns>
- private static bool SingleTaskHandlerForVirtual(DbModel context, Wms_VirtualStore findVirtualStore, ref string errMsg)
- {
- errMsg = "";
- var remark = "娑堣垂铏氭嫙搴撳瓨锛岃浠栦汉宸ュ嚭搴�";
-
- #region 浜嬪姟澶勭悊
-
- using (var trans = context.Database.BeginTransaction())
- {
- try
- {
- //1銆佸簱瀛樼Щ闄�
- context.Wms_VirtualStore.Remove(findVirtualStore);
- //findVirtualStore.IsDeleted = true;
- //findVirtualStore.ModifyBy = "";
- //findVirtualStore.OperationRemark = remark + "[閿佸畾搴撳瓨]";
- //findVirtualStore.ModifyTime = DateTime.Now;
-
- //2銆佸垱寤鸿櫄鎷熷嚭搴撲换鍔★紝娉ㄦ剰锛氫换鍔＄姸鎬佸繀椤绘槸宸插畬鎴愶紝鍥犱负鏄櫄鎷熷嚭搴�
- FunRetEntity addOutStoreTaskResult = MainTaskHandler.AddOutStoreTaskForVirtual(null, findVirtualStore, context, MainTaskTypeEnum.鎵嬪姩鍑哄簱, new SysUser()
- {
- ID = 0,
- Name = SysGloble.WCSSystem
- });
- if (addOutStoreTaskResult.result == false)
- {
- errMsg = addOutStoreTaskResult.resMsg;
- throw new Exception(errMsg);
- }
-
- //4銆佹洿鏂板嚭搴撴槑缁嗚〃
- var mainTask = addOutStoreTaskResult.resData as Task_Main;
- if (mainTask == null)
- {
- errMsg = "鏂板缓鐨勪富浠诲姟瀵硅薄涓篘ULL";
- throw new Exception(errMsg);
- }
-
- //淇濆瓨鏁版嵁搴�
- context.SaveChanges();
-
- trans.Commit();
-
- return true;
- }
- catch (Exception ex)
- {
- trans.Rollback();
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = "SingleTaskHandlerForVirtual鍑虹幇寮傚父:" + ex.Message;
- Log4NetHelper.WriteErrorLog(LogType.DataProcess_RobotBuffer_FinishTask, "SingleTaskHandlerForVirtual 鍑虹幇寮傚父锛�" + ex.Message, ex);
- throw ex;
- }
- }
-
- #endregion
- }
-
- }
-}
diff --git a/CC/iWareCC_ASRS/iWareCC.csproj b/CC/iWareCC_ASRS/iWareCC.csproj
index 9ec1815..4b0289e 100644
--- a/CC/iWareCC_ASRS/iWareCC.csproj
+++ b/CC/iWareCC_ASRS/iWareCC.csproj
@@ -108,6 +108,11 @@
<Compile Include="Common\Helper\FormHelper.cs" />
<Compile Include="Common\Helper\MyExtendHelper.cs" />
<Compile Include="Common\MyMesService.cs" />
+ <Compile Include="Connected Services\PrintBaseService\Reference.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </Compile>
<Compile Include="Connected Services\StationService\Reference.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -168,14 +173,11 @@
<Compile Include="WCF\CCWcfService.cs" />
<Compile Include="WCF\ICCWcfService.cs" />
<Compile Include="WmsTask\AutoUpdateEngineInfoTask.cs" />
- <Compile Include="WmsTask\AutoSalverMaterialBindTask.cs" />
<Compile Include="WmsTask\LineInSacnResult.cs" />
<Compile Include="WmsTask\MainTaskDecompose_ZPRK.cs" />
- <Compile Include="WmsTask\VirtualTaskNoOutPlanTaskHandler.cs" />
+ <Compile Include="WmsTask\PrintHandler.cs" />
<Compile Include="WmsTask\OutTaskRetryToMes.cs" />
- <Compile Include="WmsTask\Place1014To1020Task.cs" />
<Compile Include="WmsTask\EmptySalverTransferTask.cs" />
- <Compile Include="WmsTask\OutPlanTaskDecompose.cs" />
<Compile Include="WmsTask\MainTaskDecompose.cs" />
<EmbeddedResource Include="FormCC.resx">
<DependentUpon>FormCC.cs</DependentUpon>
@@ -202,6 +204,31 @@
<None Include="App - 姝ｅ紡.config">
<SubType>Designer</SubType>
</None>
+ <None Include="Connected Services\PrintBaseService\item.xsd">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="Connected Services\PrintBaseService\item1.xsd">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="Connected Services\PrintBaseService\item2.xsd">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="Connected Services\PrintBaseService\iWareCC.PrintBaseService.GetImageResponse.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </None>
+ <None Include="Connected Services\PrintBaseService\iWareCC.PrintBaseService.GetPrinterStatusResponse.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </None>
+ <None Include="Connected Services\PrintBaseService\iWareCC.PrintBaseService.Print2Response.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </None>
+ <None Include="Connected Services\PrintBaseService\iWareCC.PrintBaseService.Print3Response.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </None>
+ <None Include="Connected Services\PrintBaseService\iWareCC.PrintBaseService.PrintResponse.datasource">
+ <DependentUpon>Reference.svcmap</DependentUpon>
+ </None>
+ <None Include="Connected Services\PrintBaseService\PrintWcfService.wsdl" />
<None Include="Connected Services\RgvService\iWareCC.RgvService.RgvView.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
@@ -284,6 +311,7 @@
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<ItemGroup>
+ <WCFMetadataStorage Include="Connected Services\PrintBaseService\" />
<WCFMetadataStorage Include="Connected Services\RgvService\" />
<WCFMetadataStorage Include="Connected Services\SrmService\" />
<WCFMetadataStorage Include="Connected Services\StationService\" />
@@ -351,6 +379,13 @@
<Generator>WCF Proxy Generator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
</None>
+ <None Include="Connected Services\PrintBaseService\item.disco" />
+ <None Include="Connected Services\PrintBaseService\configuration91.svcinfo" />
+ <None Include="Connected Services\PrintBaseService\configuration.svcinfo" />
+ <None Include="Connected Services\PrintBaseService\Reference.svcmap">
+ <Generator>WCF Proxy Generator</Generator>
+ <LastGenOutput>Reference.cs</LastGenOutput>
+ </None>
<Content Include="IwareICO.ico" />
<Content Include="Logo.ico" />
<None Include="Resources\绌挎姣嶈溅1.jpg" />
diff --git a/CC/iWareCommon/Utils/Log4Net/LogType.cs b/CC/iWareCommon/Utils/Log4Net/LogType.cs
index 10be19d..5d9dd1b 100644
--- a/CC/iWareCommon/Utils/Log4Net/LogType.cs
+++ b/CC/iWareCommon/Utils/Log4Net/LogType.cs
@@ -62,7 +62,7 @@
/// <summary>
/// 鍑哄簱璁″垝
/// </summary>
- OutPlanTask = 300,
+ PrintHandler = 300,
/// <summary>
/// MES鏈嶅姟
diff --git a/CC/iWareCommon/log4net_iWare.config b/CC/iWareCommon/log4net_iWare.config
index a3215cb..8ccb8a7 100644
--- a/CC/iWareCommon/log4net_iWare.config
+++ b/CC/iWareCommon/log4net_iWare.config
@@ -262,8 +262,8 @@
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!--鍑哄簱璁″垝銆愪俊鎭�戞棩蹇�-->
- <appender name="OutPlanTask_Info" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWareCC\\OutPlanTask_Info\\" />
+ <appender name="PrintHandler_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWareCC\\PrintHandler_Info\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -273,13 +273,13 @@
<param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="OutPlanTask_Info" />
+ <loggerToMatch value="PrintHandler_Info" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!--鍑哄簱璁″垝銆愰敊璇�戞棩蹇�-->
- <appender name="OutPlanTask_Error" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWareCC\\OutPlanTask_Error\\" />
+ <appender name="PrintHandler_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWareCC\\PrintHandler_Error\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -289,7 +289,7 @@
<param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="OutPlanTask_Error" />
+ <loggerToMatch value="PrintHandler_Error" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
@@ -640,8 +640,8 @@
<appender-ref ref="DataProcess_RobotBuffer_AutoQiTaoOutbound_Error"/>
<appender-ref ref="DataProcess_RobotBuffer_ModeChange_Info"/>
<appender-ref ref="DataProcess_RobotBuffer_ModeChange_Error"/>
- <appender-ref ref="OutPlanTask_Info"/>
- <appender-ref ref="OutPlanTask_Error"/>
+ <appender-ref ref="PrintHandler_Info"/>
+ <appender-ref ref="PrintHandler_Error"/>
<!--鍫嗗灈鏈轰换鍔＄嚎绋嬫棩蹇�-->
<appender-ref ref="SrmTheadService_Info"/>
<appender-ref ref="SrmTheadService_Error"/>
diff --git a/CC/iWareModel/EnumType/WMS/PrintClassifyEnum.cs b/CC/iWareModel/EnumType/WMS/PrintClassifyEnum.cs
new file mode 100644
index 0000000..02638af
--- /dev/null
+++ b/CC/iWareModel/EnumType/WMS/PrintClassifyEnum.cs
@@ -0,0 +1,22 @@
+锘�
+
+using System.ComponentModel;
+
+namespace Admin.NET.Application
+{
+
+ /// <summary>
+ /// 鎵撳嵃鍒嗙被鏋氫妇
+ /// </summary>
+ [Description("鎵撳嵃鍒嗙被鏋氫妇")]
+ public enum PrintClassifyEnum
+ {
+ /// <summary>
+ /// 鍖呰鏉＄爜
+ /// </summary>
+ [Description("鍖呰鏉＄爜")]
+ 鍖呰鏉＄爜 = 1,
+
+ }
+
+}
diff --git a/CC/iWareModel/EnumType/WMS/PrintTypeEnum.cs b/CC/iWareModel/EnumType/WMS/PrintTypeEnum.cs
new file mode 100644
index 0000000..9837b0f
--- /dev/null
+++ b/CC/iWareModel/EnumType/WMS/PrintTypeEnum.cs
@@ -0,0 +1,57 @@
+锘�
+
+using System.ComponentModel;
+
+namespace Admin.NET.Application
+{
+
+ /// <summary>
+ /// 鎵撳嵃绫诲瀷
+ /// </summary>
+ [Description("鎵撳嵃绫诲瀷")]
+ public enum PrintTypeEnum
+ {
+ /// <summary>
+ /// 鍖呰鏉＄爜
+ /// </summary>
+ [Description("鍖呰鏉＄爜")]
+ 鍖呰鏉＄爜 = 1,
+ }
+
+
+ /// <summary>
+ /// 鎵撳嵃鏉ユ簮
+ /// </summary>
+ [Description("鎵撳嵃鏉ユ簮")]
+ public enum PrintSourceEnum
+ {
+ /// <summary>
+ /// 鍖呰鏉＄爜鎵撳嵃
+ /// </summary>
+ [Description("鍖呰鏉＄爜鎵撳嵃")]
+ 鍖呰鏉＄爜鎵撳嵃 = 1,
+
+ }
+
+ /// <summary>
+ /// 鎵撳嵃鐘舵��
+ /// </summary>
+ [Description("鎵撳嵃鐘舵��")]
+ public enum PrintStatuEnum
+ {
+ /// <summary>
+ /// 鏈墦鍗�
+ /// </summary>
+ [Description("鏈墦鍗�")]
+ 鏈墦鍗� = 0,
+
+ /// <summary>
+ /// 宸叉墦鍗�
+ /// </summary>
+ [Description("宸叉墦鍗�")]
+ 宸叉墦鍗� = 1,
+
+ }
+}
+
+
diff --git a/CC/iWareModel/iWareModel.csproj b/CC/iWareModel/iWareModel.csproj
index d2e2f0e..feeb416 100644
--- a/CC/iWareModel/iWareModel.csproj
+++ b/CC/iWareModel/iWareModel.csproj
@@ -112,6 +112,8 @@
<Compile Include="EnumType\TaskExcuteTypeEnum.cs" />
<Compile Include="EnumType\ThreadDirectionEnum.cs" />
<Compile Include="EnumType\WMS\AreaCodeEnum.cs" />
+ <Compile Include="EnumType\WMS\PrintClassifyEnum.cs" />
+ <Compile Include="EnumType\WMS\PrintTypeEnum.cs" />
<Compile Include="EnumType\WMS\RbRunModeEnum.cs" />
<Compile Include="EnumType\WMS\RbTaskTypeEnum.cs" />
<Compile Include="EnumType\WMS\StockStatusEnum.cs" />
diff --git "a/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.exe" "b/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.exe"
new file mode 100644
index 0000000..7c42e27
--- /dev/null
+++ "b/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.exe"
Binary files differ
diff --git "a/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.exe.config" "b/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.exe.config"
new file mode 100644
index 0000000..27b3143
--- /dev/null
+++ "b/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.exe.config"
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+
+ <startup>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+ </startup>
+
+ <appSettings>
+ <add key="printerName" value="HP DeskJet 2700 series" />
+ <add key="templatePath" value="C:\templates\yoke.btw" />
+ </appSettings>
+
+
+
+ <system.serviceModel>
+ <behaviors>
+ <serviceBehaviors>
+ <behavior name="">
+ <serviceMetadata httpGetEnabled="true" httpsGetEnabled="true" />
+ <serviceDebug includeExceptionDetailInFaults="false" />
+ </behavior>
+ </serviceBehaviors>
+ </behaviors>
+ <services>
+ <service name="Express_printer.wcf.PrintWcfService">
+ <endpoint address="" binding="basicHttpBinding" contract="Express_printer.wcf.IPrintWcfService">
+ <identity>
+ <dns value="localhost" />
+ </identity>
+ </endpoint>
+ <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
+ <host>
+ <baseAddresses>
+ <add baseAddress="http://localhost:8735/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/" />
+ </baseAddresses>
+ </host>
+ </service>
+ </services>
+ </system.serviceModel>
+</configuration>
\ No newline at end of file
diff --git "a/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.vshost.exe" "b/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.vshost.exe"
new file mode 100644
index 0000000..c0dfecc
--- /dev/null
+++ "b/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.vshost.exe"
Binary files differ
diff --git "a/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.vshost.exe.config" "b/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.vshost.exe.config"
new file mode 100644
index 0000000..aecce4a
--- /dev/null
+++ "b/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.vshost.exe.config"
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+
+ <startup>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+ </startup>
+
+ <appSettings>
+ <add key="printerName" value="HP DeskJet 2700 series" />
+ <add key="templatePath" value="C:\templates\yoke.btw" />
+ </appSettings>
+
+
+
+ <system.serviceModel>
+ <behaviors>
+ <serviceBehaviors>
+ <behavior name="">
+ <serviceMetadata httpGetEnabled="true" httpsGetEnabled="true" />
+ <serviceDebug includeExceptionDetailInFaults="false" />
+ </behavior>
+ </serviceBehaviors>
+ </behaviors>
+ <services>
+ <service name="Express_printer.wcf.PrintWcfService">
+ <endpoint address="" binding="basicHttpBinding" contract="Express_printer.wcf.IPrintWcfService">
+ <identity>
+ <dns value="localhost" />
+ </identity>
+ </endpoint>
+ <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
+ <host>
+ <baseAddresses>
+ <add baseAddress="http://localhost:8733/Design_Time_Addresses/Express_printer.wcf/PrintWcfService/" />
+ </baseAddresses>
+ </host>
+ </service>
+ </services>
+ </system.serviceModel>
+</configuration>
\ No newline at end of file
diff --git "a/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.vshost.exe.manifest" "b/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.vshost.exe.manifest"
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ "b/LA24030_LuLiPackageLine_Print/printer\345\237\272\347\241\200\346\234\215\345\212\241/Express_printer.vshost.exe.manifest"
@@ -0,0 +1,11 @@
+锘�<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+ <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+</assembly>
diff --git "a/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw" "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
new file mode 100644
index 0000000..e8023e8
--- /dev/null
+++ "b/LA24030_LuLiPackageLine_Print/\346\211\223\345\215\260\346\250\241\346\235\277\346\226\207\344\273\266/\345\214\205\350\243\205\346\235\241\347\240\201\346\250\241\346\235\277_\344\272\214\347\273\264\347\240\201.btw"
Binary files differ
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs
index c09f970..51c0d9f 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPrint.cs
@@ -32,169 +32,91 @@
public PrintSourceEnum PrintSource { get; set; }
-
+ #region 鎵撳嵃鍐呭
+
+ [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "鍖呰鍙�", Length = 50)]
+ public string PackageCode { get; set; }
/// <summary>
- /// 璺熻釜鐮�
+ /// 閿�鍞悎鍚屽崟鍙�
/// </summary>
- [SugarColumn(ColumnName = "SNCode", ColumnDescription = "璺熻釜鐮�", Length = 255)]
-
- public string SNCode { get; set; }
-
+ [SugarColumn(ColumnName = "Info4", ColumnDescription = "閿�鍞悎鍚屽崟鍙�", Length = 60)]
+ public string? Info4 { get; set; }
/// <summary>
- /// 鐗╂枡缂栧彿
+ /// 鐢熶骇鍗曞彿
/// </summary>
- [Required]
- [SugarColumn(ColumnName = "MaterialCode", ColumnDescription = "鐗╂枡缂栧彿", Length = 50)]
-
- public string MaterialCode { get; set; }
-
+ [SugarColumn(ColumnName = "Info5", ColumnDescription = "鐢熶骇鍗曞彿", Length = 60)]
+ public string? Info5 { get; set; }
/// <summary>
- /// 鐗╂枡鍚嶇О
+ /// 绗嚑鍖�
/// </summary>
- [Required]
- [SugarColumn(ColumnName = "MaterialName", ColumnDescription = "鐗╂枡鍚嶇О", Length = 50)]
-
- public string MaterialName { get; set; }
-
+ [SugarColumn(ColumnName = "Info6", ColumnDescription = "绗嚑鍖�", Length = 60)]
+ public string? Info6 { get; set; }
/// <summary>
- /// 渚涘簲鍟嗙紪鍙�
+ /// 缁忛攢搴楀悕绉�
/// </summary>
- [SugarColumn(ColumnName = "SupplierCode", ColumnDescription = "渚涘簲鍟嗙紪鍙�", Length = 50)]
-
- public string? SupplierCode { get; set; }
-
+ [SugarColumn(ColumnName = "Info7", ColumnDescription = "缁忛攢搴楀悕绉�", Length = 60)]
+ public string? Info7 { get; set; }
/// <summary>
- /// 渚涘簲鍟嗗悕绉�
+ /// 浜у搧鍚嶇О
/// </summary>
- [SugarColumn(ColumnName = "SupplierName", ColumnDescription = "渚涘簲鍟嗗悕绉�", Length = 50)]
-
- public string? SupplierName { get; set; }
-
+ [SugarColumn(ColumnName = "Info8", ColumnDescription = "浜у搧鍚嶇О", Length = 60)]
+ public string? Info8 { get; set; }
/// <summary>
- /// 搴撳瓨鍗曚綅
+ /// 瀹㈡埛鍚嶇О
/// </summary>
- [Required]
- [SugarColumn(ColumnName = "MaterialUnit", ColumnDescription = "搴撳瓨鍗曚綅", Length = 50)]
-
- public string MaterialUnit { get; set; }
-
+ [SugarColumn(ColumnName = "Info10", ColumnDescription = "瀹㈡埛鍚嶇О", Length = 60)]
+ public string? Info10 { get; set; }
/// <summary>
- /// 閲囪喘鍗曚綅
+ /// 鍖呰缂栫爜
/// </summary>
- [SugarColumn(ColumnName = "POUnit", ColumnDescription = "閲囪喘鍗曚綅", Length = 50)]
-
- public string? POUnit { get; set; }
-
+ [SugarColumn(ColumnName = "Info9", ColumnDescription = "鍖呰缂栫爜", Length = 60)]
+ public string? Info9 { get; set; }
/// <summary>
- /// 鏁伴噺
+ /// 鑷彁or鍙戣揣
/// </summary>
- [Required]
- [SugarColumn(ColumnName = "Quantity", ColumnDescription = "鏁伴噺", Length = 10, DecimalDigits = 3)]
- public decimal Quantity { get; set; }
-
+ [SugarColumn(ColumnName = "Info11", ColumnDescription = "鑷彁or鍙戣揣", Length = 60)]
+ public string? Info11 { get; set; }
/// <summary>
- /// 鍗曟嵁鍙�
+ /// 鍖呰閮ㄤ欢鎬绘暟閲�
/// </summary>
- [SugarColumn(ColumnName = "OrderNo", ColumnDescription = "鍗曟嵁鍙�", Length = 50)]
-
- public string? OrderNo { get; set; }
-
+ [SugarColumn(ColumnName = "Info12", ColumnDescription = "鍖呰閮ㄤ欢鎬绘暟閲�", Length = 60)]
+ public string? Info12 { get; set; }
/// <summary>
- /// 鍏宠仈鍗曞彿
+ /// 鍖呰闈㈢Н
/// </summary>
- [SugarColumn(ColumnName = "RelationNo", ColumnDescription = "鍏宠仈鍗曞彿", Length = 50)]
-
- public string? RelationNo { get; set; }
-
+ [SugarColumn(ColumnName = "Info13", ColumnDescription = "鍖呰闈㈢Н", Length = 60)]
+ public string? Info13 { get; set; }
/// <summary>
- /// 鍗曟嵁琛屽彿
+ /// 閮ㄤ欢鍚嶇О
/// </summary>
- [SugarColumn(ColumnName = "OrderNoLineNumber", ColumnDescription = "鍗曟嵁琛屽彿", Length = 50)]
-
- public string? OrderNoLineNumber { get; set; }
-
+ [SugarColumn(ColumnName = "Info14", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 60)]
+ public string? Info14 { get; set; }
/// <summary>
- /// 鍏宠仈鍗曡鍙�
+ /// 閮ㄤ欢鏁伴噺
/// </summary>
- [SugarColumn(ColumnName = "RelationNoLineNumber", ColumnDescription = "鍏宠仈鍗曡鍙�", Length = 50)]
-
- public string? RelationNoLineNumber { get; set; }
-
+ [SugarColumn(ColumnName = "Info15", ColumnDescription = "閮ㄤ欢鏁伴噺")]
+ public int? Info15 { get; set; }
/// <summary>
- /// 搴撲綅缂栧彿
+ /// 閮ㄤ欢灏哄
/// </summary>
- [SugarColumn(ColumnName = "PlaceCode", ColumnDescription = "搴撲綅缂栧彿", Length = 50)]
+ [SugarColumn(ColumnName = "Info16", ColumnDescription = "閮ㄤ欢灏哄", Length = 60)]
+ public string? Info16 { get; set; }
- public string? PlaceCode { get; set; }
+ #endregion
-
- /// <summary>
- /// 搴撲綅鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "PlaceName", ColumnDescription = "搴撲綅鍚嶇О", Length = 50)]
-
- public string? PlaceName { get; set; }
-
-
- /// <summary>
- /// 鐩爣搴撳尯缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "ToAreaCode", ColumnDescription = "鐩爣搴撳尯缂栧彿", Length = 50)]
-
- public string? ToAreaCode { get; set; }
-
-
- /// <summary>
- /// 鐩爣搴撳尯鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "ToAreaName", ColumnDescription = "鐩爣搴撳尯鍚嶇О", Length = 50)]
-
- public string? ToAreaName { get; set; }
-
-
- /// <summary>
- /// 鐩爣搴撲綅缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ToPlaceCode", ColumnDescription = "鐩爣搴撲綅缂栫爜", Length = 50)]
-
- public string? ToPlaceCode { get; set; }
-
-
- /// <summary>
- /// 鐩爣搴撲綅鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "ToPlaceName", ColumnDescription = "鐩爣搴撲綅鍚嶇О", Length = 50)]
-
- public string? ToPlaceName { get; set; }
-
-
- /// <summary>
- /// 婧愬簱鍖虹紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "SourceAreaCode", ColumnDescription = "婧愬簱鍖虹紪鐮�", Length = 50)]
-
- public string? SourceAreaCode { get; set; }
-
-
- /// <summary>
- /// 婧愬簱鍖哄悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "SourceAreaName", ColumnDescription = "婧愬簱鍖哄悕绉�", Length = 50)]
-
- public string? SourceAreaName { get; set; }
/// <summary>
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/ReportCenter/PrintTypeEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/ReportCenter/PrintTypeEnum.cs
index 9e168bd..3a7b144 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/ReportCenter/PrintTypeEnum.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/ReportCenter/PrintTypeEnum.cs
@@ -9,18 +9,10 @@
public enum PrintTypeEnum
{
/// <summary>
- /// 鐗╂枡璺熻釜鐮�
+ /// 鍖呰鏉＄爜
/// </summary>
- [Description("鐗╂枡璺熻釜鐮�")]
- 鐗╂枡璺熻釜鐮� = 1,
-
- /// <summary>
- /// 鐪嬫澘鍗�
- /// </summary>
- [Description("鐪嬫澘鍗�")]
- 鐪嬫澘鍗� = 2
-
-
+ [Description("鍖呰鏉＄爜")]
+ 鍖呰鏉＄爜 = 1,
}
@@ -31,41 +23,10 @@
public enum PrintSourceEnum
{
/// <summary>
- /// 搴撳瓨璺熻釜鐮佹墦鍗�
+ /// 鍖呰鏉＄爜鎵撳嵃
/// </summary>
- [Description("搴撳瓨璺熻釜鐮佹墦鍗�")]
- 搴撳瓨璺熻釜鐮佹墦鍗� = 1,
-
- /// <summary>
- /// ASN鍗曡窡韪爜鎵撳嵃
- /// </summary>
- [Description("ASN鍗曡窡韪爜鎵撳嵃")]
- ASN鍗曡窡韪爜鎵撳嵃 = 2,
-
- /// <summary>
- /// 鐗╂枡鎷嗗垎鎵撳嵃
- /// </summary>
- [Description("鐗╂枡鎷嗗垎鎵撳嵃")]
- 鐗╂枡鎷嗗垎鎵撳嵃 = 3,
-
- /// <summary>
- /// 鐗╂枡鍚堝苟鎵撳嵃
- /// </summary>
- [Description("鐗╂枡鍚堝苟鎵撳嵃")]
- 鐗╂枡鍚堝苟鎵撳嵃 = 4,
-
- /// <summary>
- /// 鐗╂枡鍒嗘嫞鎵撳嵃
- /// </summary>
- [Description("鐗╂枡鍒嗘嫞鎵撳嵃")]
- 鐗╂枡鍒嗘嫞鎵撳嵃 = 5,
-
- /// <summary>
- /// 鐪嬫澘鍗℃墦鍗�
- /// </summary>
- [Description("鐪嬫澘鍗℃墦鍗�")]
- 鐪嬫澘鍗℃墦鍗� = 6
-
+ [Description("鍖呰鏉＄爜鎵撳嵃")]
+ 鍖呰鏉＄爜鎵撳嵃 = 1,
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsConfig/PrintClassifyEnum.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsConfig/PrintClassifyEnum.cs
index ab99c06..ef08c6c 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsConfig/PrintClassifyEnum.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsConfig/PrintClassifyEnum.cs
@@ -9,21 +9,11 @@
public enum PrintClassifyEnum
{
/// <summary>
- /// 涓�缁磋窡韪爜
+ /// 鍖呰鏉＄爜
/// </summary>
- [Description("涓�缁磋窡韪爜")]
- 涓�缁磋窡韪爜 = 1,
+ [Description("鍖呰鏉＄爜")]
+ 鍖呰鏉＄爜 = 1,
- /// <summary>
- /// 浜岀淮璺熻釜鐮�
- /// </summary>
- [Description("浜岀淮璺熻釜鐮�")]
- 浜岀淮璺熻釜鐮� = 2,
-
- /// <summary>
- /// 鐪嬫澘鍗�
- /// </summary>
- [Description("鐪嬫澘鍗�")]
- 鐪嬫澘鍗� = 3
+
}
--
Gitblit v1.9.3