From 4b2e89faeb6383335db4fc4a56d3cb71565abe08 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 26 11月 2024 17:42:24 +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 | 196 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 183 insertions(+), 13 deletions(-)
diff --git a/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs b/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
index 4c79d93..ba6bf67 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()]
@@ -237,6 +240,12 @@
[System.Runtime.Serialization.OptionalFieldAttribute()]
private short R_StateField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
+ private bool R_SurrouondTaskFinishField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
+ private short R_SurrouondTaskNoField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private int R_TaskIDField;
@@ -302,6 +311,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");
}
}
}
@@ -502,6 +524,32 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
+ public bool R_SurrouondTaskFinish {
+ get {
+ return this.R_SurrouondTaskFinishField;
+ }
+ set {
+ if ((this.R_SurrouondTaskFinishField.Equals(value) != true)) {
+ this.R_SurrouondTaskFinishField = value;
+ this.RaisePropertyChanged("R_SurrouondTaskFinish");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
+ public short R_SurrouondTaskNo {
+ get {
+ return this.R_SurrouondTaskNoField;
+ }
+ set {
+ if ((this.R_SurrouondTaskNoField.Equals(value) != true)) {
+ this.R_SurrouondTaskNoField = value;
+ this.RaisePropertyChanged("R_SurrouondTaskNo");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
public int R_TaskID {
get {
return this.R_TaskIDField;
@@ -562,10 +610,13 @@
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;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
+ private bool W_FirstMarkField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_HeightField;
@@ -574,7 +625,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 +637,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;
@@ -602,6 +656,9 @@
[System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_PalletizingPlaceYField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
+ private short W_PalletizingPlaceZField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_PalletizingStationField;
@@ -617,6 +674,12 @@
[System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_RotateField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
+ private bool W_SurroundTaskFinishField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
+ private int W_SurroundTaskNoField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_WidthField;
@@ -703,12 +766,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");
}
@@ -724,6 +787,19 @@
if ((this.W_EndMarkField.Equals(value) != true)) {
this.W_EndMarkField = value;
this.RaisePropertyChanged("W_EndMark");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
+ public bool W_FirstMark {
+ get {
+ return this.W_FirstMarkField;
+ }
+ set {
+ if ((this.W_FirstMarkField.Equals(value) != true)) {
+ this.W_FirstMarkField = value;
+ this.RaisePropertyChanged("W_FirstMark");
}
}
}
@@ -755,7 +831,7 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public int W_Inbound_TaskID {
+ public short W_Inbound_TaskID {
get {
return this.W_Inbound_TaskIDField;
}
@@ -807,6 +883,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 +909,7 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public int W_Outbound_TaskID {
+ public short W_Outbound_TaskID {
get {
return this.W_Outbound_TaskIDField;
}
@@ -880,6 +969,19 @@
if ((this.W_PalletizingPlaceYField.Equals(value) != true)) {
this.W_PalletizingPlaceYField = value;
this.RaisePropertyChanged("W_PalletizingPlaceY");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
+ public short W_PalletizingPlaceZ {
+ get {
+ return this.W_PalletizingPlaceZField;
+ }
+ set {
+ if ((this.W_PalletizingPlaceZField.Equals(value) != true)) {
+ this.W_PalletizingPlaceZField = value;
+ this.RaisePropertyChanged("W_PalletizingPlaceZ");
}
}
}
@@ -945,6 +1047,32 @@
if ((this.W_RotateField.Equals(value) != true)) {
this.W_RotateField = value;
this.RaisePropertyChanged("W_Rotate");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
+ public bool W_SurroundTaskFinish {
+ get {
+ return this.W_SurroundTaskFinishField;
+ }
+ set {
+ if ((this.W_SurroundTaskFinishField.Equals(value) != true)) {
+ this.W_SurroundTaskFinishField = value;
+ this.RaisePropertyChanged("W_SurroundTaskFinish");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
+ public int W_SurroundTaskNo {
+ get {
+ return this.W_SurroundTaskNoField;
+ }
+ set {
+ if ((this.W_SurroundTaskNoField.Equals(value) != true)) {
+ this.W_SurroundTaskNoField = value;
+ this.RaisePropertyChanged("W_SurroundTaskNo");
}
}
}
@@ -1687,6 +1815,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);
@@ -1700,16 +1834,28 @@
System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WriteOutStoreTaskInfoAsync(int deviceId, string stationCode, string sourcePlaceNo, int outbound_TaskID);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WritePalletizingTaskInfo", ReplyAction="http://tempuri.org/IStationService/WritePalletizingTaskInfoResponse")]
- iWareCC.StationService.SdaResEntity WritePalletizingTaskInfo(int deviceId, string stationCode, int taskID, bool isLast, short length, short width, short height, short rotate, short toplace, short placeX, short placeY);
+ iWareCC.StationService.SdaResEntity WritePalletizingTaskInfo(int deviceId, string stationCode, int taskID, bool isLast, bool isFirst, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WritePalletizingTaskInfo", ReplyAction="http://tempuri.org/IStationService/WritePalletizingTaskInfoResponse")]
- System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WritePalletizingTaskInfoAsync(int deviceId, string stationCode, int taskID, bool isLast, short length, short width, short height, short rotate, short toplace, short placeX, short placeY);
+ System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WritePalletizingTaskInfoAsync(int deviceId, string stationCode, int taskID, bool isLast, bool isFirst, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/SetPalletizingTaskFinishAck", ReplyAction="http://tempuri.org/IStationService/SetPalletizingTaskFinishAckResponse")]
iWareCC.StationService.SdaResEntity SetPalletizingTaskFinishAck(int deviceId, bool value, string stationCode);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/SetPalletizingTaskFinishAck", ReplyAction="http://tempuri.org/IStationService/SetPalletizingTaskFinishAckResponse")]
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, int taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey);
+
+ [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, int taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey);
+
+ [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);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/SetSurroundTaskFinishAck", ReplyAction="http://tempuri.org/IStationService/SetSurroundTaskFinishAckResponse")]
+ System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> SetSurroundTaskFinishAckAsync(int deviceId, bool value, string stationCode);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WriteStation_FinishACK", ReplyAction="http://tempuri.org/IStationService/WriteStation_FinishACKResponse")]
iWareCC.StationService.SdaResEntity WriteStation_FinishACK(int deviceId, bool value, int plcTaskId);
@@ -1853,6 +1999,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);
}
@@ -1869,12 +2023,12 @@
return base.Channel.WriteOutStoreTaskInfoAsync(deviceId, stationCode, sourcePlaceNo, outbound_TaskID);
}
- public iWareCC.StationService.SdaResEntity WritePalletizingTaskInfo(int deviceId, string stationCode, int taskID, bool isLast, short length, short width, short height, short rotate, short toplace, short placeX, short placeY) {
- return base.Channel.WritePalletizingTaskInfo(deviceId, stationCode, taskID, isLast, length, width, height, rotate, toplace, placeX, placeY);
+ public iWareCC.StationService.SdaResEntity WritePalletizingTaskInfo(int deviceId, string stationCode, int taskID, bool isLast, bool isFirst, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ) {
+ return base.Channel.WritePalletizingTaskInfo(deviceId, stationCode, taskID, isLast, isFirst, length, width, height, rotate, toplace, placeX, placeY, placeZ);
}
- public System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WritePalletizingTaskInfoAsync(int deviceId, string stationCode, int taskID, bool isLast, short length, short width, short height, short rotate, short toplace, short placeX, short placeY) {
- return base.Channel.WritePalletizingTaskInfoAsync(deviceId, stationCode, taskID, isLast, length, width, height, rotate, toplace, placeX, placeY);
+ public System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WritePalletizingTaskInfoAsync(int deviceId, string stationCode, int taskID, bool isLast, bool isFirst, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ) {
+ return base.Channel.WritePalletizingTaskInfoAsync(deviceId, stationCode, taskID, isLast, isFirst, length, width, height, rotate, toplace, placeX, placeY, placeZ);
}
public iWareCC.StationService.SdaResEntity SetPalletizingTaskFinishAck(int deviceId, bool value, string stationCode) {
@@ -1885,6 +2039,22 @@
return base.Channel.SetPalletizingTaskFinishAckAsync(deviceId, value, stationCode);
}
+ public iWareCC.StationService.SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, int 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 System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WriteSurroundTaskInfoAsync(int deviceId, string stationCode, int 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 iWareCC.StationService.SdaResEntity SetSurroundTaskFinishAck(int deviceId, bool value, string stationCode) {
+ return base.Channel.SetSurroundTaskFinishAck(deviceId, value, stationCode);
+ }
+
+ public System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> SetSurroundTaskFinishAckAsync(int deviceId, bool value, string stationCode) {
+ return base.Channel.SetSurroundTaskFinishAckAsync(deviceId, value, stationCode);
+ }
+
public iWareCC.StationService.SdaResEntity WriteStation_FinishACK(int deviceId, bool value, int plcTaskId) {
return base.Channel.WriteStation_FinishACK(deviceId, value, plcTaskId);
}
--
Gitblit v1.9.3