From f0088fd96c74f68ba912593710dd9271bcee581d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 10:12:32 +0800
Subject: [PATCH] NG处理，pda上增加一键 清理 板件队列（从 269 到bz01的队列数据）
---
CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs | 179 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 143 insertions(+), 36 deletions(-)
diff --git a/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs b/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
index 16c436f..1e3de35 100644
--- a/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
+++ b/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
@@ -25,6 +25,8 @@
[System.Runtime.Serialization.KnownTypeAttribute(typeof(iWareCC.StationService.StationDB2ObjForReadComm))]
[System.Runtime.Serialization.KnownTypeAttribute(typeof(iWareCC.StationService.StationDB2ObjForWriteComm[]))]
[System.Runtime.Serialization.KnownTypeAttribute(typeof(iWareCC.StationService.StationDB2ObjForWriteComm))]
+ [System.Runtime.Serialization.KnownTypeAttribute(typeof(iWareCC.StationService.WmsConfigDeviceWarning[]))]
+ [System.Runtime.Serialization.KnownTypeAttribute(typeof(iWareCC.StationService.WmsConfigDeviceWarning))]
public partial class SdaResEntity : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
[System.NonSerializedAttribute()]
@@ -107,11 +109,7 @@
[System.NonSerializedAttribute()]
private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
- private string Addressk__BackingFieldField;
-
private string Codek__BackingFieldField;
-
- private string Contextk__BackingFieldField;
[global::System.ComponentModel.BrowsableAttribute(false)]
public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
@@ -120,19 +118,6 @@
}
set {
this.extensionDataField = value;
- }
- }
-
- [System.Runtime.Serialization.DataMemberAttribute(Name="<Address>k__BackingField", IsRequired=true)]
- public string Addressk__BackingField {
- get {
- return this.Addressk__BackingFieldField;
- }
- set {
- if ((object.ReferenceEquals(this.Addressk__BackingFieldField, value) != true)) {
- this.Addressk__BackingFieldField = value;
- this.RaisePropertyChanged("Addressk__BackingField");
- }
}
}
@@ -145,19 +130,6 @@
if ((object.ReferenceEquals(this.Codek__BackingFieldField, value) != true)) {
this.Codek__BackingFieldField = value;
this.RaisePropertyChanged("Codek__BackingField");
- }
- }
- }
-
- [System.Runtime.Serialization.DataMemberAttribute(Name="<Context>k__BackingField", IsRequired=true)]
- public string Contextk__BackingField {
- get {
- return this.Contextk__BackingFieldField;
- }
- set {
- if ((object.ReferenceEquals(this.Contextk__BackingFieldField, value) != true)) {
- this.Contextk__BackingFieldField = value;
- this.RaisePropertyChanged("Contextk__BackingField");
}
}
}
@@ -1004,6 +976,9 @@
private bool R_OutboundFinishField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
+ private bool R_OutboundModeField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
private string R_OutboundNumberField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -1197,6 +1172,19 @@
if ((this.R_OutboundFinishField.Equals(value) != true)) {
this.R_OutboundFinishField = value;
this.RaisePropertyChanged("R_OutboundFinish");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
+ public bool R_OutboundMode {
+ get {
+ return this.R_OutboundModeField;
+ }
+ set {
+ if ((this.R_OutboundModeField.Equals(value) != true)) {
+ this.R_OutboundModeField = value;
+ this.RaisePropertyChanged("R_OutboundMode");
}
}
}
@@ -1464,6 +1452,9 @@
private short W_ModeField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
+ private bool W_NgFlagField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
private bool W_OutboundFinishConfirmField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -1495,6 +1486,9 @@
[System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_PalletizingTaskIDField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
+ private bool W_PartClearField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private bool W_ReqOutField;
@@ -1736,6 +1730,19 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
+ public bool W_NgFlag {
+ get {
+ return this.W_NgFlagField;
+ }
+ set {
+ if ((this.W_NgFlagField.Equals(value) != true)) {
+ this.W_NgFlagField = value;
+ this.RaisePropertyChanged("W_NgFlag");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
public bool W_OutboundFinishConfirm {
get {
return this.W_OutboundFinishConfirmField;
@@ -1879,6 +1886,19 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
+ public bool W_PartClear {
+ get {
+ return this.W_PartClearField;
+ }
+ set {
+ if ((this.W_PartClearField.Equals(value) != true)) {
+ this.W_PartClearField = value;
+ this.RaisePropertyChanged("W_PartClear");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
public bool W_ReqOut {
get {
return this.W_ReqOutField;
@@ -1979,6 +1999,51 @@
}
}
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
+ [System.Runtime.Serialization.DataContractAttribute(Name="WmsConfigDeviceWarning", Namespace="http://schemas.datacontract.org/2004/07/iWareSda")]
+ [System.SerializableAttribute()]
+ public partial class WmsConfigDeviceWarning : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
+
+ [System.NonSerializedAttribute()]
+ private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
+ private string WarningCodeField;
+
+ [global::System.ComponentModel.BrowsableAttribute(false)]
+ public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
+ get {
+ return this.extensionDataField;
+ }
+ set {
+ this.extensionDataField = value;
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
+ public string WarningCode {
+ get {
+ return this.WarningCodeField;
+ }
+ set {
+ if ((object.ReferenceEquals(this.WarningCodeField, value) != true)) {
+ this.WarningCodeField = value;
+ this.RaisePropertyChanged("WarningCode");
+ }
+ }
+ }
+
+ public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+
+ protected void RaisePropertyChanged(string propertyName) {
+ System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
+ if ((propertyChanged != null)) {
+ propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
+ }
+ }
+ }
+
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ServiceModel.ServiceContractAttribute(ConfigurationName="StationService.IStationService")]
public interface IStationService {
@@ -2006,6 +2071,12 @@
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/GetStationInfo", ReplyAction="http://tempuri.org/IStationService/GetStationInfoResponse")]
System.Threading.Tasks.Task<iWareCC.StationService.StationView> GetStationInfoAsync(int deviceId);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/GetWaringInfoList", ReplyAction="http://tempuri.org/IStationService/GetWaringInfoListResponse")]
+ iWareCC.StationService.DeviceWarningInfo[] GetWaringInfoList(int deviceId, iWareCC.StationService.WmsConfigDeviceWarning[] configDeviceWarningList);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/GetWaringInfoList", ReplyAction="http://tempuri.org/IStationService/GetWaringInfoListResponse")]
+ System.Threading.Tasks.Task<iWareCC.StationService.DeviceWarningInfo[]> GetWaringInfoListAsync(int deviceId, iWareCC.StationService.WmsConfigDeviceWarning[] configDeviceWarningList);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/IsTaskFinish", ReplyAction="http://tempuri.org/IStationService/IsTaskFinishResponse")]
iWareCC.StationService.SdaResEntity IsTaskFinish(int deviceId, int taskId);
@@ -2067,6 +2138,12 @@
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/ChangeMode", ReplyAction="http://tempuri.org/IStationService/ChangeModeResponse")]
System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> ChangeModeAsync(int deviceId, int value, string stationCode);
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/PartClear", ReplyAction="http://tempuri.org/IStationService/PartClearResponse")]
+ iWareCC.StationService.SdaResEntity PartClear(int deviceId, bool value, string stationCode);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/PartClear", ReplyAction="http://tempuri.org/IStationService/PartClearResponse")]
+ System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> PartClearAsync(int deviceId, bool value, string stationCode);
+
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WriteInStoreTaskInfo", ReplyAction="http://tempuri.org/IStationService/WriteInStoreTaskInfoResponse")]
iWareCC.StationService.SdaResEntity WriteInStoreTaskInfo(int deviceId, string stationCode, string toPlaceNo, short length, short width, short height, int inbound_TaskID);
@@ -2092,10 +2169,10 @@
System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> SetPalletizingTaskFinishAckAsync(int deviceId, bool value, string stationCode);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WriteSurroundTaskInfo", ReplyAction="http://tempuri.org/IStationService/WriteSurroundTaskInfoResponse")]
- iWareCC.StationService.SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey);
+ iWareCC.StationService.SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey, bool isNgFlag);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WriteSurroundTaskInfo", ReplyAction="http://tempuri.org/IStationService/WriteSurroundTaskInfoResponse")]
- System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WriteSurroundTaskInfoAsync(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey);
+ System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WriteSurroundTaskInfoAsync(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey, bool isNgFlag);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/SetSurroundTaskFinishAck", ReplyAction="http://tempuri.org/IStationService/SetSurroundTaskFinishAckResponse")]
iWareCC.StationService.SdaResEntity SetSurroundTaskFinishAck(int deviceId, bool value, string stationCode);
@@ -2132,6 +2209,12 @@
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WriteStation_AllowIn", ReplyAction="http://tempuri.org/IStationService/WriteStation_AllowInResponse")]
System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WriteStation_AllowInAsync(int deviceId, bool value, string stationCode);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WriteStation_NgFlag", ReplyAction="http://tempuri.org/IStationService/WriteStation_NgFlagResponse")]
+ iWareCC.StationService.SdaResEntity WriteStation_NgFlag(int deviceId, bool value, string stationCode);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WriteStation_NgFlag", ReplyAction="http://tempuri.org/IStationService/WriteStation_NgFlagResponse")]
+ System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WriteStation_NgFlagAsync(int deviceId, bool value, string stationCode);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WriteStation_PersonAllow", ReplyAction="http://tempuri.org/IStationService/WriteStation_PersonAllowResponse")]
iWareCC.StationService.SdaResEntity WriteStation_PersonAllow(int deviceId, bool value, string stationCode);
@@ -2197,6 +2280,14 @@
public System.Threading.Tasks.Task<iWareCC.StationService.StationView> GetStationInfoAsync(int deviceId) {
return base.Channel.GetStationInfoAsync(deviceId);
+ }
+
+ public iWareCC.StationService.DeviceWarningInfo[] GetWaringInfoList(int deviceId, iWareCC.StationService.WmsConfigDeviceWarning[] configDeviceWarningList) {
+ return base.Channel.GetWaringInfoList(deviceId, configDeviceWarningList);
+ }
+
+ public System.Threading.Tasks.Task<iWareCC.StationService.DeviceWarningInfo[]> GetWaringInfoListAsync(int deviceId, iWareCC.StationService.WmsConfigDeviceWarning[] configDeviceWarningList) {
+ return base.Channel.GetWaringInfoListAsync(deviceId, configDeviceWarningList);
}
public iWareCC.StationService.SdaResEntity IsTaskFinish(int deviceId, int taskId) {
@@ -2279,6 +2370,14 @@
return base.Channel.ChangeModeAsync(deviceId, value, stationCode);
}
+ public iWareCC.StationService.SdaResEntity PartClear(int deviceId, bool value, string stationCode) {
+ return base.Channel.PartClear(deviceId, value, stationCode);
+ }
+
+ public System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> PartClearAsync(int deviceId, bool value, string stationCode) {
+ return base.Channel.PartClearAsync(deviceId, value, stationCode);
+ }
+
public iWareCC.StationService.SdaResEntity WriteInStoreTaskInfo(int deviceId, string stationCode, string toPlaceNo, short length, short width, short height, int inbound_TaskID) {
return base.Channel.WriteInStoreTaskInfo(deviceId, stationCode, toPlaceNo, length, width, height, inbound_TaskID);
}
@@ -2311,12 +2410,12 @@
return base.Channel.SetPalletizingTaskFinishAckAsync(deviceId, value, stationCode);
}
- public iWareCC.StationService.SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey) {
- return base.Channel.WriteSurroundTaskInfo(deviceId, stationCode, taskID, length, width, cartonhigh, cartonwidth, placex, placey);
+ public iWareCC.StationService.SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey, bool isNgFlag) {
+ return base.Channel.WriteSurroundTaskInfo(deviceId, stationCode, taskID, length, width, cartonhigh, cartonwidth, placex, placey, isNgFlag);
}
- public System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WriteSurroundTaskInfoAsync(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey) {
- return base.Channel.WriteSurroundTaskInfoAsync(deviceId, stationCode, taskID, length, width, cartonhigh, cartonwidth, placex, placey);
+ public System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WriteSurroundTaskInfoAsync(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey, bool isNgFlag) {
+ return base.Channel.WriteSurroundTaskInfoAsync(deviceId, stationCode, taskID, length, width, cartonhigh, cartonwidth, placex, placey, isNgFlag);
}
public iWareCC.StationService.SdaResEntity SetSurroundTaskFinishAck(int deviceId, bool value, string stationCode) {
@@ -2367,6 +2466,14 @@
return base.Channel.WriteStation_AllowInAsync(deviceId, value, stationCode);
}
+ public iWareCC.StationService.SdaResEntity WriteStation_NgFlag(int deviceId, bool value, string stationCode) {
+ return base.Channel.WriteStation_NgFlag(deviceId, value, stationCode);
+ }
+
+ public System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WriteStation_NgFlagAsync(int deviceId, bool value, string stationCode) {
+ return base.Channel.WriteStation_NgFlagAsync(deviceId, value, stationCode);
+ }
+
public iWareCC.StationService.SdaResEntity WriteStation_PersonAllow(int deviceId, bool value, string stationCode) {
return base.Channel.WriteStation_PersonAllow(deviceId, value, stationCode);
}
--
Gitblit v1.9.3