From adf622258d11cff158aa62a0db40346a792b8d8a Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周日, 01 12月 2024 13:57:05 +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 | 182 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 176 insertions(+), 6 deletions(-)
diff --git a/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs b/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
index 15f96cd..6e4ecf8 100644
--- a/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
+++ b/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
@@ -218,6 +218,9 @@
private short R_Outbound_TaskIDField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
+ private bool R_PalletizingAckField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
private bool R_PalletizingFinishField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -240,6 +243,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;
@@ -414,6 +423,19 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
+ public bool R_PalletizingAck {
+ get {
+ return this.R_PalletizingAckField;
+ }
+ set {
+ if ((this.R_PalletizingAckField.Equals(value) != true)) {
+ this.R_PalletizingAckField = value;
+ this.RaisePropertyChanged("R_PalletizingAck");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
public bool R_PalletizingFinish {
get {
return this.R_PalletizingFinishField;
@@ -518,6 +540,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;
@@ -584,6 +632,9 @@
private bool W_EndMarkField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
+ private bool W_FirstMarkField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_HeightField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -617,10 +668,16 @@
private string W_PackageWidthField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
+ private short W_PalletizingBucketTypeField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_PalletizingPlaceXField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_PalletizingPlaceYField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
+ private short W_PalletizingPlaceZField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_PalletizingStationField;
@@ -636,6 +693,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;
@@ -743,6 +806,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");
}
}
}
@@ -891,6 +967,19 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
+ public short W_PalletizingBucketType {
+ get {
+ return this.W_PalletizingBucketTypeField;
+ }
+ set {
+ if ((this.W_PalletizingBucketTypeField.Equals(value) != true)) {
+ this.W_PalletizingBucketTypeField = value;
+ this.RaisePropertyChanged("W_PalletizingBucketType");
+ }
+ }
+ }
+
+ [System.Runtime.Serialization.DataMemberAttribute()]
public short W_PalletizingPlaceX {
get {
return this.W_PalletizingPlaceXField;
@@ -912,6 +1001,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");
}
}
}
@@ -977,6 +1079,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");
}
}
}
@@ -1738,10 +1866,10 @@
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, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ, short lastnum);
[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, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ, short lastnum);
[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);
@@ -1749,11 +1877,29 @@
[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);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WriteStation_FinishACK", ReplyAction="http://tempuri.org/IStationService/WriteStation_FinishACKResponse")]
System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WriteStation_FinishACKAsync(int deviceId, bool value, int plcTaskId);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WriteStation_ACK", ReplyAction="http://tempuri.org/IStationService/WriteStation_ACKResponse")]
+ iWareCC.StationService.SdaResEntity WriteStation_ACK(int deviceId, bool value, string stationCode);
+
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WriteStation_ACK", ReplyAction="http://tempuri.org/IStationService/WriteStation_ACKResponse")]
+ System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WriteStation_ACKAsync(int deviceId, bool value, string stationCode);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/WriteScanValidateACK", ReplyAction="http://tempuri.org/IStationService/WriteScanValidateACKResponse")]
iWareCC.StationService.SdaResEntity WriteScanValidateACK(bool isReset, int deviceId, string stationCode, bool value, int plcTaskId);
@@ -1915,12 +2061,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, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ, short lastnum) {
+ return base.Channel.WritePalletizingTaskInfo(deviceId, stationCode, taskID, length, width, height, rotate, toplace, placeX, placeY, placeZ, lastnum);
}
- 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, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ, short lastnum) {
+ return base.Channel.WritePalletizingTaskInfoAsync(deviceId, stationCode, taskID, length, width, height, rotate, toplace, placeX, placeY, placeZ, lastnum);
}
public iWareCC.StationService.SdaResEntity SetPalletizingTaskFinishAck(int deviceId, bool value, string stationCode) {
@@ -1931,6 +2077,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);
}
@@ -1939,6 +2101,14 @@
return base.Channel.WriteStation_FinishACKAsync(deviceId, value, plcTaskId);
}
+ public iWareCC.StationService.SdaResEntity WriteStation_ACK(int deviceId, bool value, string stationCode) {
+ return base.Channel.WriteStation_ACK(deviceId, value, stationCode);
+ }
+
+ public System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> WriteStation_ACKAsync(int deviceId, bool value, string stationCode) {
+ return base.Channel.WriteStation_ACKAsync(deviceId, value, stationCode);
+ }
+
public iWareCC.StationService.SdaResEntity WriteScanValidateACK(bool isReset, int deviceId, string stationCode, bool value, int plcTaskId) {
return base.Channel.WriteScanValidateACK(isReset, deviceId, stationCode, value, plcTaskId);
}
--
Gitblit v1.9.3