schangxiang@126.com
2024-11-22 badd5a9d76e2ae4821ea819fcb639b69a2f00f69
优化
已修改7个文件
98 ■■■■ 文件已修改
CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/Connected Services/StationService/item3.xsd 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/02_BZ39工位(补板后工位)/Inbound/2、DataProcess_RobotBuffer_FinishTask.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/WmsBasePlaceService.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/Connected Services/StationService/Reference.cs
@@ -200,6 +200,9 @@
        private string R_InboundNumberField;
        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private short R_Inbound_TaskIDField;
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private short R_ModelField;
        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -207,6 +210,9 @@
        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private string R_OutboundNumberField;
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private short R_Outbound_TaskIDField;
        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private string R_ReadCodeResultField;
@@ -315,6 +321,19 @@
        }
        
        [System.Runtime.Serialization.DataMemberAttribute()]
        public short R_Inbound_TaskID {
            get {
                return this.R_Inbound_TaskIDField;
            }
            set {
                if ((this.R_Inbound_TaskIDField.Equals(value) != true)) {
                    this.R_Inbound_TaskIDField = value;
                    this.RaisePropertyChanged("R_Inbound_TaskID");
                }
            }
        }
        [System.Runtime.Serialization.DataMemberAttribute()]
        public short R_Model {
            get {
                return this.R_ModelField;
@@ -349,6 +368,19 @@
                if ((object.ReferenceEquals(this.R_OutboundNumberField, value) != true)) {
                    this.R_OutboundNumberField = value;
                    this.RaisePropertyChanged("R_OutboundNumber");
                }
            }
        }
        [System.Runtime.Serialization.DataMemberAttribute()]
        public short R_Outbound_TaskID {
            get {
                return this.R_Outbound_TaskIDField;
            }
            set {
                if ((this.R_Outbound_TaskIDField.Equals(value) != true)) {
                    this.R_Outbound_TaskIDField = value;
                    this.RaisePropertyChanged("R_Outbound_TaskID");
                }
            }
        }
@@ -481,7 +513,7 @@
        private bool W_IsRotateField;
        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private string W_KittingInfoField;
        private short W_KittingInfoField;
        
        [System.Runtime.Serialization.OptionalFieldAttribute()]
        private short W_LengthField;
@@ -651,12 +683,12 @@
        }
        
        [System.Runtime.Serialization.DataMemberAttribute()]
        public string W_KittingInfo {
        public short W_KittingInfo {
            get {
                return this.W_KittingInfoField;
            }
            set {
                if ((object.ReferenceEquals(this.W_KittingInfoField, value) != true)) {
                if ((this.W_KittingInfoField.Equals(value) != true)) {
                    this.W_KittingInfoField = value;
                    this.RaisePropertyChanged("W_KittingInfo");
                }
CC/iWareCC_ASRS/Connected Services/StationService/item3.xsd
@@ -14,9 +14,11 @@
      <xs:element minOccurs="0" name="R_Destination" type="xs:short" />
      <xs:element minOccurs="0" name="R_InboundFinish" type="xs:boolean" />
      <xs:element minOccurs="0" name="R_InboundNumber" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="R_Inbound_TaskID" type="xs:short" />
      <xs:element minOccurs="0" name="R_Model" type="xs:short" />
      <xs:element minOccurs="0" name="R_OutboundFinish" type="xs:boolean" />
      <xs:element minOccurs="0" name="R_OutboundNumber" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="R_Outbound_TaskID" type="xs:short" />
      <xs:element minOccurs="0" name="R_ReadCodeResult" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="R_ReqParseData" type="xs:boolean" />
      <xs:element minOccurs="0" name="R_Shape" type="xs:short" />
@@ -44,7 +46,7 @@
      <xs:element minOccurs="0" name="W_InboundFinishConfirm" type="xs:boolean" />
      <xs:element minOccurs="0" name="W_Inbound_TaskID" type="xs:int" />
      <xs:element minOccurs="0" name="W_IsRotate" type="xs:boolean" />
      <xs:element minOccurs="0" name="W_KittingInfo" nillable="true" type="xs:string" />
      <xs:element minOccurs="0" name="W_KittingInfo" type="xs:short" />
      <xs:element minOccurs="0" name="W_Length" type="xs:short" />
      <xs:element minOccurs="0" name="W_OutboundFinishConfirm" type="xs:boolean" />
      <xs:element minOccurs="0" name="W_Outbound_TaskID" type="xs:int" />
CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Inbound/2¡¢DataProcess_RobotBuffer_FinishTask.cs
@@ -46,12 +46,19 @@
                                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}- å…¥åº“库位号是空的,此次循环结束";
                                continue;
                            }
                           var  result2 = obj.R_Inbound_TaskID;
                            if (result2==0)
                            {
                                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}- å…¥åº“任务号是空的,此次循环结束";
                                continue;
                            }
                            var qitaoReault = false;
                            using (WmsDBModel wmsDB = new WmsDBModel())
                            {
                                var task = wmsDB.wms_rbline_task.Where(x => x.PlaceCode == obj.R_InboundNumber
                                && x.TaskNo == obj.R_Inbound_TaskID.ToString()
                                && x.RbTaskType == (int)RbTaskTypeEnum.入库任务
                                && x.TaskStatus == (int)TaskStatusEnum.已下发).FirstOrDefault();
                                if (task == null)
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/WmsBasePlaceService.cs
@@ -230,8 +230,8 @@
                    WmsBasePlace place = new WmsBasePlace();
                    place.PlaceType = placeTypeEnum;
                    place.PlaceTypeName = placeTypeEnum.ToString();
                    place.PlaceCode = aisle.ToString("00") + column.ToString("00") + layer.ToString("00");
                    place.PlaceName = aisle.ToString("00") + column.ToString("00") + layer.ToString("00");
                    place.PlaceCode = aisle.ToString("00") + layer.ToString("00") + column.ToString("00");
                    place.PlaceName = aisle.ToString("00") + layer.ToString("00") + column.ToString("00");
                    place.AreaCode = "";
                    place.PlaceStatus = PlaceStatusEnum.正常;
                    place.AreaName = "机器人岛缓存区";
SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
@@ -388,6 +388,19 @@
        /// </summary>
        [Description("机器人出库库位号")]
        public string R_OutboundNumber { get; set; }
        /// <summary>
        /// å…¥åº“任务号
        /// </summary>
        [Description("入库任务号")]
        public short R_Inbound_TaskID { get; set; }
        /// <summary>
        /// å‡ºåº“任务号
        /// </summary>
        [Description("出库任务号")]
        public short R_Outbound_TaskID { get; set; }
    }
    public class StationDBForReadComm
SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
@@ -298,16 +298,8 @@
                var stationObj = this.DBBlockForWrite.W_StationForWriteCommList.Where(x => x.StationCode == stationCode).FirstOrDefault();
                var view_stationObj = this.View.W_StationForWriteCommList.Where(x => x.StationCode == stationCode).FirstOrDefault();
                MessageModel b2 = this.plcService.WriteValuePoint(stationObj.W_DataFinish, true, view_stationObj.W_DataFinish);
                if (!b2.result)
                {
                    msg = string.Format("向Station地址{0} å†™ è¯»ç è§£æžå®Œæˆ " + true + "失败,返回结果:" + b2.resMsg,
                       stationObj.W_DataFinish);
                    return false;
                }
                b2 = this.plcService.WriteValuePoint(stationObj.W_Inbound_TaskID, inbound_TaskID, view_stationObj.W_Inbound_TaskID);
                MessageModel b2 = this.plcService.WriteValuePoint(stationObj.W_Inbound_TaskID, inbound_TaskID, view_stationObj.W_Inbound_TaskID);
                if (!b2.result)
                {
                    msg = string.Format("向Station地址{0} å†™ å…¥åº“任务号 " + inbound_TaskID + "失败,返回结果:" + b2.resMsg,
@@ -345,6 +337,16 @@
                    return false;
                }
                b2 = this.plcService.WriteValuePoint(stationObj.W_DataFinish, true, view_stationObj.W_DataFinish);
                if (!b2.result)
                {
                    msg = string.Format("向Station地址{0} å†™ è¯»ç è§£æžå®Œæˆ " + true + "失败,返回结果:" + b2.resMsg,
                       stationObj.W_DataFinish);
                    return false;
                }
                return true;
            }
            catch (Exception ex)
SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -165,8 +165,8 @@
                W_InboundFinishConfirm = W_DBHeaderWithSeparate_BZ39 + "0.1",
                W_Destination_In = W_DBHeaderWithSeparate_BZ39 + "2.0",
                W_Inbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "",//TODO:?还没有配置呢
                W_Outbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "",//TODO:?还没有配置呢
                W_Inbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "20.0",
                W_Outbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "22.0",
                W_Length = W_DBHeaderWithSeparate_BZ39 + "6.0",
                W_Width = W_DBHeaderWithSeparate_BZ39 + "8.0",
@@ -176,7 +176,7 @@
                W_ReqOut = W_DBHeaderWithSeparate_BZ39 + "12.0",
                W_Destination_Out = W_DBHeaderWithSeparate_BZ39 + "14.0",
                W_Mode = W_DBHeaderWithSeparate_BZ39 + "18.0",
                W_OutboundFinishConfirm = W_DBHeaderWithSeparate_BZ39 + "" //TODO:?还没有配置呢
                W_OutboundFinishConfirm = W_DBHeaderWithSeparate_BZ39 + "0.2"
            });
@@ -213,15 +213,15 @@
            {
                StationCode = StationLocationEnum.BZ39.ToString(),
                R_ReqParseData = W_DBHeaderWithSeparate_BZ39 + "0.0",
                R_ReqParseData = W_DBHeaderWithSeparate_BZ39 + "50.0",
                R_InboundFinish = W_DBHeaderWithSeparate_BZ39 + "50.1",
                R_OutboundFinish = W_DBHeaderWithSeparate_BZ39 + "50.2",
                R_ReadCodeResult = W_DBHeaderWithSeparate_BZ39 + "52.0",
                R_InboundNumber = W_DBHeaderWithSeparate_BZ39 + "104.0",
                R_OutboundNumber = W_DBHeaderWithSeparate_BZ39 + "108.0",
                R_Inbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "",//TODO:?还没有配置呢
                R_Outbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "",//TODO:?还没有配置呢
                R_Inbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "112.0",
                R_Outbound_TaskID = W_DBHeaderWithSeparate_BZ39 + "114.0",
            });