From cd47097cb1e589da8fc712d1f5daa1b5744c8695 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 25 11月 2024 17:51:51 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs b/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
index 4c79d93..15f96cd 100644
--- a/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
+++ b/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
@@ -194,6 +194,9 @@
private short R_DestinationField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
+ private bool R_ForceOutboundModeField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
private bool R_InboundFinishField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -302,6 +305,19 @@
if ((this.R_DestinationField.Equals(value) != true)) {
this.R_DestinationField = value;
this.RaisePropertyChanged("R_Destination");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
+ public bool R_ForceOutboundMode {
+ get {
+ return this.R_ForceOutboundModeField;
+ }
+ set {
+ if ((this.R_ForceOutboundModeField.Equals(value) != true)) {
+ this.R_ForceOutboundModeField = value;
+ this.RaisePropertyChanged("R_ForceOutboundMode");
}
}
}
@@ -562,7 +578,7 @@
private int W_Destination_InField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
- private string W_Destination_OutField;
+ private int W_Destination_OutField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private bool W_EndMarkField;
@@ -574,7 +590,7 @@
private bool W_InboundFinishConfirmField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
- private int W_Inbound_TaskIDField;
+ private short W_Inbound_TaskIDField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private bool W_IsRotateField;
@@ -586,10 +602,13 @@
private short W_LengthField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
+ private short W_ModeField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
private bool W_OutboundFinishConfirmField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
- private int W_Outbound_TaskIDField;
+ private short W_Outbound_TaskIDField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private string W_PackageLengthField;
@@ -703,12 +722,12 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public string W_Destination_Out {
+ public int W_Destination_Out {
get {
return this.W_Destination_OutField;
}
set {
- if ((object.ReferenceEquals(this.W_Destination_OutField, value) != true)) {
+ if ((this.W_Destination_OutField.Equals(value) != true)) {
this.W_Destination_OutField = value;
this.RaisePropertyChanged("W_Destination_Out");
}
@@ -755,7 +774,7 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public int W_Inbound_TaskID {
+ public short W_Inbound_TaskID {
get {
return this.W_Inbound_TaskIDField;
}
@@ -807,6 +826,19 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
+ public short W_Mode {
+ get {
+ return this.W_ModeField;
+ }
+ set {
+ if ((this.W_ModeField.Equals(value) != true)) {
+ this.W_ModeField = value;
+ this.RaisePropertyChanged("W_Mode");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
public bool W_OutboundFinishConfirm {
get {
return this.W_OutboundFinishConfirmField;
@@ -820,7 +852,7 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public int W_Outbound_TaskID {
+ public short W_Outbound_TaskID {
get {
return this.W_Outbound_TaskIDField;
}
@@ -1687,6 +1719,12 @@
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/OutboundFinishConfirm", ReplyAction="http://tempuri.org/IStationService/OutboundFinishConfirmResponse")]
System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> OutboundFinishConfirmAsync(int deviceId, bool value, string stationCode);
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/ChangeMode", ReplyAction="http://tempuri.org/IStationService/ChangeModeResponse")]
+ iWareCC.StationService.SdaResEntity ChangeMode(int deviceId, int value, string stationCode);
+
+ [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/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);
@@ -1853,6 +1891,14 @@
return base.Channel.OutboundFinishConfirmAsync(deviceId, value, stationCode);
}
+ public iWareCC.StationService.SdaResEntity ChangeMode(int deviceId, int value, string stationCode) {
+ return base.Channel.ChangeMode(deviceId, value, stationCode);
+ }
+
+ public System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> ChangeModeAsync(int deviceId, int value, string stationCode) {
+ return base.Channel.ChangeModeAsync(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);
}
--
Gitblit v1.9.3