add

zongzhibin

2024-11-30 752fd1d6f70afc3f58eca4ab2e6b9359ba2a5578

add

 CC/iWareCC_ASRS/App.config

@@ -35,7 +35,7 @@
    <add key="IsEnableNewInStorePlace" value="false"/>
  </appSettings>
  <connectionStrings>
    <add name="WmsDBModel" connectionString="data source=localhost;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=123abc.com;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
    <add name="WmsDBModel" connectionString="data source=172.17.1.111;initial catalog=LA24030_LuLiPackageLine;persist security info=True;user id=sa;password=admin@123;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient"/>
 </connectionStrings>
  <startup>
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>

 CC/iWareCC_ASRS/ThreadService/01_BZ01¹¤Î»£¨Çå»Ò£¬Ï´°åºó¹¤Î»£©/DataProcess_BZ01.cs

@@ -37,7 +37,7 @@
                SystemWarningMsg._lbl_alert_DataProcess_BZ01 = string.Empty;
                try
                {
                    if (SystemValue.isAllowRuning_DataProcess_BZ01 && SystemValue.isStartedModel)
                    if ( SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ01 &&
                    {
                        if (FormCC.IsAllowRunOutMode == true)
                        {

 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/DataProcess_RobotBuffer_ModeChange.cs

@@ -33,8 +33,8 @@
                Thread.Sleep(2000);//休眠2秒，将休眠写到前面，是为了下面的continue方法执行后不显示错误信息的提示！！！【EditBy shaocx,2022-05-24】
                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange = string.Empty;
                try
                {
                    if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_ModeChange && SystemValue.isStartedModel)
                {//SystemValue.isAllowRuning_DataProcess_RobotBuffer_ModeChange &&
                    if ( SystemValue.isStartedModel)
                    {
                        var rgvLocation = StationLocationEnum.BZ39.ToString();
                        if (FormCC.IsAllowRunOutMode)

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

@@ -34,7 +34,7 @@
                SystemWarningMsg._lbl_alert_DataProcess_BZ39 = string.Empty;
                try
                {
                    if (SystemValue.isAllowRuning_DataProcess_BZ39 && SystemValue.isStartedModel)
                    if ( SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_BZ39 &&
                    {
                        var rgvLocation = StationLocationEnum.BZ39.ToString();
                        /*
@@ -55,15 +55,15 @@
                            using (WmsDBModel wmsDB = new WmsDBModel())
                            {
                                //不再拦截 
                                /*

                                //要是有已下发的任务，就不要执行
                                var isValidate = TaskHandler.ValidateIssueTaskForRobotBuffer(wmsDB);
                                var isValidate = TaskHandler.ValidateIssueTaskForRobotBuffer(wmsDB,upiCode);
                                if (!isValidate)
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-有‘已下发’的任务，不能处理,此次循环结束";
                                    continue;
                                }
                                //*/
                                //
                                var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
                                if (upiObj == null)
                                {
@@ -112,20 +112,6 @@

                                using (StationServiceClient client = new StationServiceClient())
                                {
                                    //不再拦截 
                                    /*
                                    //首先先清理
                                    var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation);
                                    if (!res.result)
                                    {
                                        SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-下发入库任务 å¤±è´¥,InboundFinishConfirmAsync è¿”回:{res.resMsg}";
                                        continue;
                                    }
                                    else
                                    {
                                        Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-下发入库任务 æˆåŠŸ,InboundFinishConfirmAsync，参数: ç«™ç‚¹{rgvLocation}");
                                    }
                                    //*/

                                    var res = await client.WriteInStoreTaskInfoAsync((int)EDevice.Station, rgvLocation, place.PlaceCode,
                                       (short)upiObj.Length,

 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Inbound/2¡¢DataProcess_RobotBuffer_FinishTask.cs

@@ -34,7 +34,7 @@
                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = string.Empty;
                try
                {
                    if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTask && SystemValue.isStartedModel)
                    if ( SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTask &&
                    {
                        var rgvLocation = StationLocationEnum.BZ39.ToString();
                        var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
@@ -62,11 +62,23 @@
                                var task = wmsDB.wms_rbline_task.Where(x =>
                                 x.TaskNo == obj.R_Inbound_TaskID.ToString()
                                && x.RbTaskType == (int)RbTaskTypeEnum.入库任务
                                && x.TaskStatus == (int)TaskStatusEnum.已下发).FirstOrDefault();
                                ).OrderByDescending(x=>x.Id).FirstOrDefault();
                                if (task == null)
                                {
                                    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()},根据 R_InboundNumber:{obj.R_InboundNumber}没有找到已下发的任务 ";
                                    continue;
                                }
                                else 
                                {
                                    if (task.TaskStatus == (int)TaskStatusEnum.已完成)
                                    {
                                        using (StationServiceClient client = new StationServiceClient())
                                        {
                                            var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
                             
                                        }
                                        continue;
                                    }
                                }

                                var upiCode = task.UPI;
@@ -125,6 +137,18 @@
                                wmsDB.SaveChanges();
                            }
                        }
                        else
                        {
                            //不再拦截 

                            //首先先清理
                            using (StationServiceClient client = new StationServiceClient())
                            {
                                var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation);

                            }

                        }
                    }
                }
                catch (Exception ex)

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

@@ -26,8 +26,8 @@
                Thread.Sleep(2000);//休眠2秒，将休眠写到前面，是为了下面的continue方法执行后不显示错误信息的提示！！！【EditBy shaocx,2022-05-24】
                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound = string.Empty;
                try
                {
                    if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_AutoQiTaoOutbound && SystemValue.isStartedModel)
                {//SystemValue.isAllowRuning_DataProcess_RobotBuffer_AutoQiTaoOutbound && 
                    if (SystemValue.isStartedModel)
                    {

                        using (WmsDBModel wmsDB = new WmsDBModel())

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

@@ -34,8 +34,8 @@
                Thread.Sleep(1000);//休眠2秒，将休眠写到前面，是为了下面的continue方法执行后不显示错误信息的提示！！！【EditBy shaocx,2022-05-24】
                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = string.Empty;
                try
                {
                    if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_IssueOutboundTask && SystemValue.isStartedModel)
                {//SystemValue.isAllowRuning_DataProcess_RobotBuffer_IssueOutboundTask &&
                    if ( SystemValue.isStartedModel)
                    {
                        var rgvLocation = StationLocationEnum.BZ39.ToString();
                        /*
@@ -46,7 +46,7 @@
                        using (WmsDBModel wmsDB = new WmsDBModel())
                        {
                            //要是有已下发的任务，就不要执行
                            var isValidate = TaskHandler.ValidateIssueTaskForRobotBuffer(wmsDB);
                            var isValidate = TaskHandler.ValidateIssueOutTaskForRobotBuffer(wmsDB);
                            if (!isValidate)
                            {
                                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = $"{rgvLocation.ToString()}-有‘已下发’的任务，不能处理,此次循环结束";
@@ -98,18 +98,18 @@
                            using (StationServiceClient client = new StationServiceClient())
                            {
                                //首先要清理
                                var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation);
                                if (!res.result)
                                {
                                    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-下发出库任务 å¤±è´¥,OutboundFinishConfirmAsync è¿”回:{res.resMsg}";
                                    continue;
                                }
                                else
                                {
                                    Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-下发出库任务 æˆåŠŸ,OutboundFinishConfirmAsync，参数: ç«™ç‚¹{rgvLocation}");
                                }
                                //var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation);
                                //if (!res.result)
                                //{
                                //    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-下发出库任务 å¤±è´¥,OutboundFinishConfirmAsync è¿”回:{res.resMsg}";
                                //    continue;
                                //}
                                //else
                                //{
                                //    Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-下发出库任务 æˆåŠŸ,OutboundFinishConfirmAsync，参数: ç«™ç‚¹{rgvLocation}");
                                //}

                                res = await client.WriteOutStoreTaskInfoAsync((int)EDevice.Station, rgvLocation, doTask.PlaceCode, Convert.ToInt32(doTask.TaskNo));
                              var  res = await client.WriteOutStoreTaskInfoAsync((int)EDevice.Station, rgvLocation, doTask.PlaceCode, Convert.ToInt32(doTask.TaskNo));
                                if (!res.result)
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-下发出库任务 å¤±è´¥,WriteOutStoreTaskInfoAsync è¿”回:{res.resMsg}";

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

@@ -25,8 +25,8 @@
                Thread.Sleep(500);//休眠2秒，将休眠写到前面，是为了下面的continue方法执行后不显示错误信息的提示！！！【EditBy shaocx,2022-05-24】
                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = string.Empty;
                try
                {
                    if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTaskForOutbound && SystemValue.isStartedModel)
                {//SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTaskForOutbound &&
                    if (SystemValue.isStartedModel)
                    {
                        var rgvLocation = StationLocationEnum.BZ39.ToString();
                        var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
@@ -53,11 +53,23 @@
                                var task = wmsDB.wms_rbline_task.Where(x =>
                                 x.TaskNo == obj.R_Outbound_TaskID.ToString()
                                && x.RbTaskType == (int)RbTaskTypeEnum.出库任务
                                && x.TaskStatus == (int)TaskStatusEnum.已下发).FirstOrDefault();
                                ).OrderByDescending(x => x.Id).FirstOrDefault();
                                if (task == null)
                                {
                                    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()},根据 R_OutboundNumber:{obj.R_OutboundNumber}没有找到已下发的任务 ";
                                    continue;
                                }
                                else
                                {
                                    if (task.TaskStatus == (int)TaskStatusEnum.已完成)
                                    {
                                        //using (StationServiceClient client = new StationServiceClient())
                                        //{
                                        //    var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
                                        //}
                                        continue;
                                    }

                                }

                                var upiCode = task.UPI;
@@ -96,6 +108,10 @@
                                wmsDB.SaveChanges();
                            }
                        }
                        else
                        {
                
                        }
                    }
                }
                catch (Exception ex)

 CC/iWareSql/DataAccess/TaskHandler.cs

@@ -18,14 +18,14 @@
        /// </summary>
        /// <param name="wmsDB"></param>
        /// <returns></returns>
        public static bool ValidateIssueTaskForRobotBuffer(WmsDBModel.WmsDBModel wmsDB)
        public static bool ValidateIssueTaskForRobotBuffer(WmsDBModel.WmsDBModel wmsDB,string UPI)
        {
            var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus == (int)TaskStatusEnum.已下发
                && (
                  x.RbTaskType == (int)RbTaskTypeEnum.入库任务
                  ||
                   x.RbTaskType == (int)RbTaskTypeEnum.出库任务
                )
                )&&x.UPI== UPI
              ).ToList();

            if (isExist?.Count() > 0)
@@ -34,7 +34,27 @@
            }
            return true;
        }
        /// <summary>
        /// éªŒè¯ æœºå™¨äººç¼“存岛是否存在已下发的任务
        /// </summary>
        /// <param name="wmsDB"></param>
        /// <returns></returns>
        public static bool ValidateIssueOutTaskForRobotBuffer(WmsDBModel.WmsDBModel wmsDB)
        {
            var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus == (int)TaskStatusEnum.已下发
                && (
                  x.RbTaskType == (int)RbTaskTypeEnum.入库任务
                  ||
                   x.RbTaskType == (int)RbTaskTypeEnum.出库任务
                ) 
              ).ToList();

            if (isExist?.Count() > 0)
            {
                return false;
            }
            return true;
        }
        /// <summary>
        /// éªŒè¯ ç æ¿æ˜¯å¦æœ‰æ‰§è¡Œä¸­ä»»åŠ¡
        /// </summary>

 SDA/iWareSda/App.config

@@ -4,8 +4,8 @@
    <!-- è¯­è¨€é…ç½® é…ç½®  0 ä¸­æ–‡ 1 è‹±æ–‡ -->
    <add key="LanguageFlg" value="0"/>
    <!-- ç«™ç‚¹çš„PLC é…ç½® -->
      <!--<add key="Station_Address" value="172.17.51.202"/> -->
     <add key="Station_Address" value="192.168.10.100"/>
      <add key="Station_Address" value="172.17.51.202"/> 
     <!--<add key="Station_Address" value="192.168.10.100"/>-->
    <add key="Station_Rack" value="0"/>
    <add key="Station_Slot" value="1"/>
    <add key="Station_Port" value="102"/>

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

@@ -278,28 +278,32 @@
                    return false;
                }

                if (value)
                {
                    b2 = this.plcService.WriteValuePoint(stationObj.W_ReqOut, false, view_stationObj.W_ReqOut);
                    if (!b2.result)
                    {
                        msg = string.Format("向Station W_ReqOut åœ°å€{0} å†™  " + false + "失败,返回结果:" + b2.resMsg,
                            stationObj.W_ReqOut);
                        return false;
                    }
                    b2 = this.plcService.WriteValuePoint(stationObj.W_Destination_Out, 0, view_stationObj.W_Destination_Out);
                    if (!b2.result)
                    {
                        msg = string.Format("向Station W_Destination_Out åœ°å€{0} å†™  " + 0 + "失败,返回结果:" + b2.resMsg,
                            stationObj.W_Destination_Out);
                        return false;
                    }
                    b2 = this.plcService.WriteValuePoint(stationObj.W_Outbound_TaskID, 0, view_stationObj.W_Outbound_TaskID);
                    if (!b2.result)
                    {
                        msg = string.Format("向Station W_Outbound_TaskID åœ°å€{0} å†™  " + 0 + "失败,返回结果:" + b2.resMsg,
                            stationObj.W_Outbound_TaskID);
                        return false;
                    }
                }

                b2 = this.plcService.WriteValuePoint(stationObj.W_ReqOut, false, view_stationObj.W_ReqOut);
                if (!b2.result)
                {
                    msg = string.Format("向Station W_ReqOut åœ°å€{0} å†™  " + false + "失败,返回结果:" + b2.resMsg,
                        stationObj.W_ReqOut);
                    return false;
                }
                b2 = this.plcService.WriteValuePoint(stationObj.W_Destination_Out, 0, view_stationObj.W_Destination_Out);
                if (!b2.result)
                {
                    msg = string.Format("向Station W_Destination_Out åœ°å€{0} å†™  " + 0 + "失败,返回结果:" + b2.resMsg,
                        stationObj.W_Destination_Out);
                    return false;
                }
                b2 = this.plcService.WriteValuePoint(stationObj.W_Outbound_TaskID, 0, view_stationObj.W_Outbound_TaskID);
                if (!b2.result)
                {
                    msg = string.Format("向Station W_Outbound_TaskID åœ°å€{0} å†™  " + 0 + "失败,返回结果:" + b2.resMsg,
                        stationObj.W_Outbound_TaskID);
                    return false;
                }



                return true;