From 7e469b73ac4f022cb78689c6d2b0c4ddee26d18c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 12月 2024 15:37:34 +0800
Subject: [PATCH] 优化
---
CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs | 118 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 82 insertions(+), 36 deletions(-)
diff --git a/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs b/CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
index ba6bf67..16710eb 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()]
@@ -420,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;
@@ -598,10 +614,10 @@
private string StationCodeField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
- private string W_CartonHeightField;
+ private short W_CartonHeightField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
- private string W_CartonWidthField;
+ private short W_CartonWidthField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private bool W_DataFinishField;
@@ -646,10 +662,13 @@
private short W_Outbound_TaskIDField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
- private string W_PackageLengthField;
+ private short W_PackageLengthField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
- private string W_PackageWidthField;
+ private short W_PackageWidthField;
+
+ [System.Runtime.Serialization.OptionalFieldAttribute()]
+ private short W_PalletizingBucketTypeField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_PalletizingPlaceXField;
@@ -679,16 +698,16 @@
private bool W_SurroundTaskFinishField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
- private int W_SurroundTaskNoField;
+ private short W_SurroundTaskNoField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private short W_WidthField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
- private string W_X_OffsetField;
+ private short W_X_OffsetField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
- private string W_Y_OffsetField;
+ private short W_Y_OffsetField;
[global::System.ComponentModel.BrowsableAttribute(false)]
public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
@@ -714,12 +733,12 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public string W_CartonHeight {
+ public short W_CartonHeight {
get {
return this.W_CartonHeightField;
}
set {
- if ((object.ReferenceEquals(this.W_CartonHeightField, value) != true)) {
+ if ((this.W_CartonHeightField.Equals(value) != true)) {
this.W_CartonHeightField = value;
this.RaisePropertyChanged("W_CartonHeight");
}
@@ -727,12 +746,12 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public string W_CartonWidth {
+ public short W_CartonWidth {
get {
return this.W_CartonWidthField;
}
set {
- if ((object.ReferenceEquals(this.W_CartonWidthField, value) != true)) {
+ if ((this.W_CartonWidthField.Equals(value) != true)) {
this.W_CartonWidthField = value;
this.RaisePropertyChanged("W_CartonWidth");
}
@@ -922,12 +941,12 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public string W_PackageLength {
+ public short W_PackageLength {
get {
return this.W_PackageLengthField;
}
set {
- if ((object.ReferenceEquals(this.W_PackageLengthField, value) != true)) {
+ if ((this.W_PackageLengthField.Equals(value) != true)) {
this.W_PackageLengthField = value;
this.RaisePropertyChanged("W_PackageLength");
}
@@ -935,14 +954,27 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public string W_PackageWidth {
+ public short W_PackageWidth {
get {
return this.W_PackageWidthField;
}
set {
- if ((object.ReferenceEquals(this.W_PackageWidthField, value) != true)) {
+ if ((this.W_PackageWidthField.Equals(value) != true)) {
this.W_PackageWidthField = value;
this.RaisePropertyChanged("W_PackageWidth");
+ }
+ }
+ }
+
+ [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");
}
}
}
@@ -1065,7 +1097,7 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public int W_SurroundTaskNo {
+ public short W_SurroundTaskNo {
get {
return this.W_SurroundTaskNoField;
}
@@ -1091,12 +1123,12 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public string W_X_Offset {
+ public short W_X_Offset {
get {
return this.W_X_OffsetField;
}
set {
- if ((object.ReferenceEquals(this.W_X_OffsetField, value) != true)) {
+ if ((this.W_X_OffsetField.Equals(value) != true)) {
this.W_X_OffsetField = value;
this.RaisePropertyChanged("W_X_Offset");
}
@@ -1104,12 +1136,12 @@
}
[System.Runtime.Serialization.DataMemberAttribute()]
- public string W_Y_Offset {
+ public short W_Y_Offset {
get {
return this.W_Y_OffsetField;
}
set {
- if ((object.ReferenceEquals(this.W_Y_OffsetField, value) != true)) {
+ if ((this.W_Y_OffsetField.Equals(value) != true)) {
this.W_Y_OffsetField = value;
this.RaisePropertyChanged("W_Y_Offset");
}
@@ -1810,10 +1842,10 @@
System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> InboundFinishConfirmAsync(int deviceId, bool value, string stationCode);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/OutboundFinishConfirm", ReplyAction="http://tempuri.org/IStationService/OutboundFinishConfirmResponse")]
- iWareCC.StationService.SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode);
+ iWareCC.StationService.SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode, bool isClearData);
[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.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> OutboundFinishConfirmAsync(int deviceId, bool value, string stationCode, bool isClearData);
[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);
@@ -1834,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, bool isFirst, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ);
+ 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, bool isFirst, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ);
+ 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);
@@ -1846,10 +1878,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, int 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);
[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.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.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStationService/SetSurroundTaskFinishAck", ReplyAction="http://tempuri.org/IStationService/SetSurroundTaskFinishAckResponse")]
iWareCC.StationService.SdaResEntity SetSurroundTaskFinishAck(int deviceId, bool value, string stationCode);
@@ -1862,6 +1894,12 @@
[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);
@@ -1991,12 +2029,12 @@
return base.Channel.InboundFinishConfirmAsync(deviceId, value, stationCode);
}
- public iWareCC.StationService.SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode) {
- return base.Channel.OutboundFinishConfirm(deviceId, value, stationCode);
+ public iWareCC.StationService.SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode, bool isClearData) {
+ return base.Channel.OutboundFinishConfirm(deviceId, value, stationCode, isClearData);
}
- public System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> OutboundFinishConfirmAsync(int deviceId, bool value, string stationCode) {
- return base.Channel.OutboundFinishConfirmAsync(deviceId, value, stationCode);
+ public System.Threading.Tasks.Task<iWareCC.StationService.SdaResEntity> OutboundFinishConfirmAsync(int deviceId, bool value, string stationCode, bool isClearData) {
+ return base.Channel.OutboundFinishConfirmAsync(deviceId, value, stationCode, isClearData);
}
public iWareCC.StationService.SdaResEntity ChangeMode(int deviceId, int value, string stationCode) {
@@ -2023,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, 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 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, 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 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) {
@@ -2039,11 +2077,11 @@
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) {
+ 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 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) {
+ 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);
}
@@ -2063,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