优化

schangxiang@126.com

2024-12-02 7e469b73ac4f022cb78689c6d2b0c4ddee26d18c

优化

 CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs

@@ -614,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;
@@ -662,10 +662,10 @@
        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;
@@ -698,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 {
@@ -733,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");
                }
@@ -746,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");
                }
@@ -941,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");
                }
@@ -954,12 +954,12 @@
        }
        
        [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");
                }
@@ -1097,7 +1097,7 @@
        }
        
        [System.Runtime.Serialization.DataMemberAttribute()]
        public int W_SurroundTaskNo {
        public short W_SurroundTaskNo {
            get {
                return this.W_SurroundTaskNoField;
            }
@@ -1123,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");
                }
@@ -1136,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");
                }
@@ -1842,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);
@@ -1878,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);
@@ -2029,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) {
@@ -2077,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);
        }
        

 CC/iWareCC_ASRS/Connected Services/StationService/item2.xsd

@@ -177,6 +177,7 @@
        <xs:element minOccurs="0" name="deviceId" type="xs:int" />
        <xs:element minOccurs="0" name="value" type="xs:boolean" />
        <xs:element minOccurs="0" name="stationCode" nillable="true" type="xs:string" />
        <xs:element minOccurs="0" name="isClearData" type="xs:boolean" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -286,7 +287,7 @@
      <xs:sequence>
        <xs:element minOccurs="0" name="deviceId" type="xs:int" />
        <xs:element minOccurs="0" name="stationCode" nillable="true" type="xs:string" />
        <xs:element minOccurs="0" name="taskID" type="xs:int" />
        <xs:element minOccurs="0" name="taskID" type="xs:short" />
        <xs:element minOccurs="0" name="length" type="xs:short" />
        <xs:element minOccurs="0" name="width" type="xs:short" />
        <xs:element minOccurs="0" name="cartonhigh" type="xs:short" />

 CC/iWareCC_ASRS/Connected Services/StationService/item3.xsd

@@ -45,8 +45,8 @@
  <xs:complexType name="StationDB2ObjForWriteComm">
    <xs:sequence>
      <xs:element minOccurs="0" name="StationCode" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="W_CartonHeight" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="W_CartonWidth" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="W_CartonHeight" type="xs:short" />
      <xs:element minOccurs="0" name="W_CartonWidth" type="xs:short" />
      <xs:element minOccurs="0" name="W_DataFinish" type="xs:boolean" />
      <xs:element minOccurs="0" name="W_Destination_In" type="xs:int" />
      <xs:element minOccurs="0" name="W_Destination_Out" type="xs:int" />
@@ -61,8 +61,8 @@
      <xs:element minOccurs="0" name="W_Mode" type="xs:short" />
      <xs:element minOccurs="0" name="W_OutboundFinishConfirm" type="xs:boolean" />
      <xs:element minOccurs="0" name="W_Outbound_TaskID" type="xs:short" />
      <xs:element minOccurs="0" name="W_PackageLength" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="W_PackageWidth" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="W_PackageLength" type="xs:short" />
      <xs:element minOccurs="0" name="W_PackageWidth" type="xs:short" />
      <xs:element minOccurs="0" name="W_PalletizingBucketType" type="xs:short" />
      <xs:element minOccurs="0" name="W_PalletizingPlaceX" type="xs:short" />
      <xs:element minOccurs="0" name="W_PalletizingPlaceY" type="xs:short" />
@@ -73,10 +73,10 @@
      <xs:element minOccurs="0" name="W_ReqOut" type="xs:boolean" />
      <xs:element minOccurs="0" name="W_Rotate" type="xs:short" />
      <xs:element minOccurs="0" name="W_SurroundTaskFinish" type="xs:boolean" />
      <xs:element minOccurs="0" name="W_SurroundTaskNo" type="xs:int" />
      <xs:element minOccurs="0" name="W_SurroundTaskNo" type="xs:short" />
      <xs:element minOccurs="0" name="W_Width" type="xs:short" />
      <xs:element minOccurs="0" name="W_X_Offset" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="W_Y_Offset" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="W_X_Offset" type="xs:short" />
      <xs:element minOccurs="0" name="W_Y_Offset" type="xs:short" />
    </xs:sequence>
  </xs:complexType>
  <xs:element name="StationDB2ObjForWriteComm" nillable="true" type="tns:StationDB2ObjForWriteComm" />

 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Outbound/1¡¢DataProcess_RobotBuffer_AutoQiTaoOutbound.cs

@@ -47,6 +47,9 @@
                                    var doList = upiList.Where(x => x.PackageCode == packageCode).OrderBy(x => x.Shelf).ToList();
                                    foreach (var item in doList)
                                    {
                                        item.UpiStatus = (int)UpiStatusEnum.已齐包;
                                        item.UpdateTime = DateTime.Now;

                                        var x = group.ToList().Find(b => b.Upi == item.UPI);
                                        x.StockStatus = (int)StockStatusEnum.齐包待出库;

@@ -63,7 +66,7 @@
                                            Length = x.Length,
                                            Width = x.Width,
                                            Thk = x.Thk,
                                            IssueTime = DateTime.Now,
                                            
                                            PlanNo = x.PlanNo,
                                            OrderId = x.OrderId,
                                            PackageCode = x.PackageCode,

 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Outbound/3¡¢DataProcess_RobotBuffer_FinishTaskForOutbound.cs

@@ -63,10 +63,10 @@
                                {
                                    if (task.TaskStatus == (int)TaskStatusEnum.已完成)
                                    {
                                        //using (StationServiceClient client = new StationServiceClient())
                                        //{
                                        //    var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
                                        //}
                                        using (StationServiceClient client = new StationServiceClient())
                                        {
                                            var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation, false);
                                        }
                                        continue;
                                    }

@@ -93,7 +93,7 @@
                                //给PLC推送任务完成确认信号
                                using (StationServiceClient client = new StationServiceClient())
                                {
                                    var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
                                    var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation, true);
                                    if (!res.result)
                                    {
                                        SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-下发出库任务 å¤±è´¥,OutboundFinishConfirmAsync è¿”回:{res.resMsg}";
@@ -110,7 +110,10 @@
                        }
                        else
                        {
                
                            using (StationServiceClient client = new StationServiceClient())
                            {
                                var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation, false);
                            }
                        }
                    }
                }

 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Outbound/4¡¢DataProcess_RobotBuffer_ForceOutbound.cs

@@ -55,7 +55,7 @@
                            Length = x.Length,
                            Width = x.Width,
                            Thk = x.Thk,
                            IssueTime = DateTime.Now,
                           
                            PlanNo = x.PlanNo,
                            OrderId = x.OrderId,
                            PackageCode = x.PackageCode,

 CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/DataProcess_BZ21.cs

@@ -84,47 +84,63 @@
                                    continue;
                                }
                                //string upi = "LS070700101B0001GS";
                                ////调用出纸机接口
                                //var res =new HTTPService("http://172.17.1.22:44374/api/LuLi/").getContent<Respone>("cartons-machine?PackageCode="+upi, Guid.NewGuid(),10000);
                                //if (res.iState == 0)
                                //{
                                //    var papertable = wmsDB.mes_push_papercut.Where(x => x.PackageCode == upiObj.PackageCode).OrderByDescending(x => x.Id).FirstOrDefault();
                                //    if (papertable != null)
                                //    {
                                //        papertable.PushStatus = (int)PushStatusEnum.PushSuccess;
                                //        papertable.ApiMessage = res.message;
                                //        papertable.PushNum++;
                                //    }
                                //    else
                                //    {
                                //        var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
                                //        papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                                //        papercut.ApiMessage = res.message;
                                //        papercut.PushNum = 0;
                                //        papercut.PushStatus = (int)PushStatusEnum.PushSuccess;
                                //        wmsDB.mes_push_papercut.Add(papercut);
                                //    }
                                //}
                                //else
                                //{
                                //    var papertable = wmsDB.mes_push_papercut.Where(x => x.PackageCode == upiObj.PackageCode).OrderByDescending(x => x.Id).FirstOrDefault();
                                //    if (papertable != null)
                                //    {
                                //        papertable.PushStatus = (int)PushStatusEnum.PushFail;
                                //        papertable.ApiMessage = res.message;
                                //        papertable.PushNum++;
                                //    }
                                //    else
                                //    {
                                //        var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
                                //        papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                                //        papercut.ApiMessage = res.message;
                                //        papercut.PushNum = 0;
                                //        papercut.PushStatus = (int)PushStatusEnum.PushFail;
                                //        wmsDB.mes_push_papercut.Add(papercut);
                                //    }
                                //    continue;
                                //}
                                //调用出纸机接口
                                var res = new HTTPService("http://172.17.1.22:44374/api/LuLi/").getContent<Respone>("cartons-machine?PackageCode=" + upiObj.PackageCode, Guid.NewGuid(), 10000);
                                if (res.iState == 0)
                                {
                                    /*
                                    var papertable = wmsDB.mes_push_papercut.Where(x => x.PackageCode == upiObj.PackageCode).OrderByDescending(x => x.Id).FirstOrDefault();
                                    if (papertable != null)
                                    {
                                        papertable.PushStatus = (int)PushStatusEnum.PushSuccess;
                                        papertable.ApiMessage = res.message;
                                        papertable.PushNum++;
                                    }
                                    else
                                    {
                                        var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
                                        papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                                        papercut.ApiMessage = res.message;
                                        papercut.PushNum = 1;
                                        papercut.PushStatus = (int)PushStatusEnum.PushSuccess;
                                        wmsDB.mes_push_papercut.Add(papercut);
                                    }
                                    //*/
                                    var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
                                    papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                                    papercut.ApiMessage = res.message;
                                    papercut.PushNum = 1;
                                    papercut.PushStatus = (int)PushStatusEnum.PushSuccess;
                                    wmsDB.mes_push_papercut.Add(papercut);
                                }
                                else
                                {
                                    /*
                                    var papertable = wmsDB.mes_push_papercut.Where(x => x.PackageCode == upiObj.PackageCode).OrderByDescending(x => x.Id).FirstOrDefault();
                                    if (papertable != null)
                                    {
                                        papertable.PushStatus = (int)PushStatusEnum.PushFail;
                                        papertable.ApiMessage = res.message;
                                        papertable.PushNum++;
                                    }
                                    else
                                    {
                                        var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
                                        papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                                        papercut.ApiMessage = res.message;
                                        papercut.PushNum = 1;
                                        papercut.PushStatus = (int)PushStatusEnum.PushFail;
                                        wmsDB.mes_push_papercut.Add(papercut);
                                    }
                                    //*/
                                    var papercut = ClassHelper.RotationMapping<mes_push_papercut, mes_batchOrderUPI_new>(upiObj);
                                    papercut.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                                    papercut.ApiMessage = res.message;
                                    papercut.PushNum = 1;
                                    papercut.PushStatus = (int)PushStatusEnum.PushFail;
                                    wmsDB.mes_push_papercut.Add(papercut);
                                    continue;
                                }
                                //更新表
                                var mesgather = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
                                if (mesgather != null)

 CC/iWareModel/EnumType/WMS/UpiStatusEnum.cs

@@ -2,7 +2,8 @@

using System.ComponentModel;

namespace Admin.NET.Application { 
namespace Admin.NET.Application
{

/// <summary>
/// æ¿æ–™çŠ¶æ€æžšä¸¾
@@ -48,9 +49,15 @@
        å·²åˆåŒ… = 5,

        /// <summary>
        /// å·²æ ¸éªŒ
        /// </summary>
        [Description("已核验")]
        å·²æ ¸éªŒ = 6,

        /// <summary>
        /// å·²ä¸‹çº¿
        /// </summary>
        [Description("已下线")]
        å·²ä¸‹çº¿ = 6
        å·²ä¸‹çº¿ = 7
    }
}

 LA24030_LuLiPackageLine_Web/public/config.js

@@ -4,6 +4,6 @@
  "VITE_OPEN_CDN": "false",
  "VITE_PUBLIC_PATH": "",
  "VITE_SM_PUBLIC_KEY": "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312",
  "VITE_API_URL": "http://localhost:5005"
  //"VITE_API_URL": "http://172.17.1.111:5005"  //正式地址
  //"VITE_API_URL": "http://localhost:5005"
  "VITE_API_URL": "http://172.17.1.111:5005"  //正式地址
} 

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordPackageProcess.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
using Admin.NET.Core;

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/5/29上午10:26:39
 * @desc : è°ƒåº¦ä»»åŠ¡
 */
namespace Admin.NET.Application.Entity
{
    /// <summary>
    /// åŒ…过程履历数据
    /// </summary>
    [SugarTable("wms_record_package_process", "包过程履历数据")]
    public class WmsRecordPackageProcess : EntityBaseForRecord
    {

        [Required]
        [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "包装号", Length = 50)]
        public string PackageCode { get; set; }

        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info5", ColumnDescription = "生产单号", Length = 60)]
        public string? Info5 { get; set; }


        [Required]
        [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "批次号", Length = 50)]
        public string PlanNo { get; set; }

        [Required]
        [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订单号", Length = 50)]
        public string OrderId { get; set; }

   

        /// <summary>
        /// åŒ…状态
        /// </summary>
        [Required]
        [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "包状态")]
        public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.初始;

        /// <summary>
        /// æ ‡è®°
        /// </summary>
        [SugarColumn(ColumnName = "UpiFlag", ColumnDescription = "标记")]
        public UpiFlagEnum? UpiFlag { get; set; } = UpiFlagEnum.正常;

        /// <summary>
        /// ä½ç½®
        /// </summary>
        [SugarColumn(ColumnName = "Location", ColumnDescription = "位置")]
        public string? Location { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [SugarColumn(ColumnName = "OperRemark", ColumnDescription = "备注", Length = 100)]
        public string? OperRemark { get; set; }
    }
}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsStockQuan/WmsRecordUpiProcess.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,76 @@
using Admin.NET.Core;

/*
 * @author : åˆ˜æ–‡å¥‡
 * @date : 2024/5/29上午10:26:39
 * @desc : è°ƒåº¦ä»»åŠ¡
 */
namespace Admin.NET.Application.Entity
{
    /// <summary>
    /// æ¿ä»¶è¿‡ç¨‹å±¥åŽ†æ•°æ®
    /// </summary>
    [SugarTable("wms_record_upi_process", "板件过程履历数据")]
    public class WmsRecordUpiProcess : EntityBaseForRecord
    {

        [Required]
        [SugarColumn(ColumnName = "Upi", ColumnDescription = "部件条码", Length = 50)]
        public string Upi { get; set; }

        [Required]
        [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "包装号", Length = 50)]
        public string PackageCode { get; set; }

        /// <summary>
        /// ç”Ÿäº§å•å·
        /// </summary>
        [SugarColumn(ColumnName = "Info5", ColumnDescription = "生产单号", Length = 60)]
        public string? Info5 { get; set; }

        [Required]
        [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "批次号", Length = 50)]
        public string PlanNo { get; set; }

        [Required]
        [SugarColumn(ColumnName = "OrderId", ColumnDescription = "订单号", Length = 50)]
        public string OrderId { get; set; }
     

        /// <summary>
        /// æ¿æ–™çŠ¶æ€
        /// </summary>
        [Required]
        [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "板料状态")]
        public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.初始;

        /// <summary>
        /// æ ‡è®°
        /// </summary>
        [SugarColumn(ColumnName = "UpiFlag", ColumnDescription = "标记")]
        public UpiFlagEnum? UpiFlag { get; set; } = UpiFlagEnum.正常;

        /// <summary>
        /// ä½ç½®
        /// </summary>
        [SugarColumn(ColumnName = "Location", ColumnDescription = "位置")]
        public string? Location { get; set; }

        [Required]
        [SugarColumn(ColumnName = "DetailName", ColumnDescription = "部件名称", Length = 50)]
        public string DetailName { get; set; }

        /// <summary>
        /// ææ–™
        /// </summary>
        [SugarColumn(ColumnName = "Info18", ColumnDescription = "材料", Length = 60)]
        public string? Info18 { get; set; }


        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [SugarColumn(ColumnName = "OperRemark", ColumnDescription = "备注", Length = 100)]
        public string? OperRemark { get; set; }
    }
}

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/UpiStatusEnum.cs

@@ -48,9 +48,15 @@
    å·²åˆåŒ… = 5,

    /// <summary>
    /// å·²æ ¸éªŒ
    /// </summary>
    [Description("已核验")]
    å·²æ ¸éªŒ = 6,

    /// <summary>
    /// å·²ä¸‹çº¿
    /// </summary>
    [Description("已下线")]
    å·²ä¸‹çº¿ = 6
    å·²ä¸‹çº¿ = 7

}

 SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs

@@ -262,7 +262,15 @@
            }
        }

        public bool OutboundFinishConfirm(string stationCode, bool value, out string msg)
        /// <summary>
        /// 
        /// </summary>
        /// <param name="stationCode"></param>
        /// <param name="value"></param>
        /// <param name="msg"></param>
        /// <param name="isClearData">是否需要清理数据</param>
        /// <returns></returns>
        public bool OutboundFinishConfirm(string stationCode, bool value, out string msg, bool isClearData)
        {
            try
            {
@@ -278,7 +286,7 @@
                    return false;
                }

                if (value)
                if (value && isClearData)
                {
                    b2 = this.plcService.WriteValuePoint(stationObj.W_ReqOut, false, view_stationObj.W_ReqOut);
                    if (!b2.result)

 SDA/iWareSda/Devices/4-Station/StationService/IStationService.cs

@@ -108,7 +108,7 @@
        /// <param name="value"></param>
        /// <returns></returns>
        [OperationContract]
        SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode);
        SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode, bool isClearData);


        /// <summary>

 SDA/iWareSda/Devices/4-Station/StationService/StationService.cs

@@ -476,7 +476,7 @@
        /// <param name="deviceId"></param>
        /// <param name="value"></param>
        /// <returns></returns>
        public SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode)
        public SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode, bool isClearData)
        {
            SdaResEntity _SdaResEntity = new SdaResEntity();
            try
@@ -489,7 +489,7 @@
                var Station = StationResult.resData as StationEntity;

                string msg = "";
                var result = Station.OutboundFinishConfirm(stationCode, value, out msg);
                var result = Station.OutboundFinishConfirm(stationCode, value, out msg,isClearData);
                _SdaResEntity.result = result;
                _SdaResEntity.resMsg = msg;
                return _SdaResEntity;