CC/iWareCC_ASRS/Common/SystemValue.cs
@@ -132,7 +132,7 @@ /// <summary> /// æ¯å¦å 许æ§è¡ ä»»å¡å解线ç¨-ç»çå ¥åº /// </summary> public static bool isAllowRuning_MainTaskDecompose_ZPRK = false; public static bool isAllowRuning_DataProcess_RobotBuffer_ModeChange = false; /// <summary> /// æ¯å¦å 许æ§è¡ å åæºå ¥å£æ«ç æ£æµçº¿ç¨ CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
@@ -63,7 +63,7 @@ /// <summary> /// RGVä»»å¡å®æ确认çè¦åæ¶æ¯ /// </summary> public static string _lbl_Alert_RgvReleaseFinish = string.Empty; public static string _lbl_Alert_DataProcess_RobotBuffer_ModeChange = string.Empty; /// <summary> /// RGVä»»å¡å®æ确认çè¦åæ¶æ¯ï¼è¡¥å¿ï¼ CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs
@@ -536,7 +536,7 @@ { ConfirmFinishTaskHandle(i_deviceId, out errMsg); } SystemWarningMsg._lbl_Alert_RgvReleaseFinish = errMsg; SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange = errMsg; Thread.Sleep(2000); }
@@ -236,8 +236,8 @@ this.checkBox_OutTaskRetryToMes = new System.Windows.Forms.CheckBox(); this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = new System.Windows.Forms.Label(); this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound = new System.Windows.Forms.CheckBox(); this.lbl_MainTaskDecompose_ZPRK = new System.Windows.Forms.Label(); this.ckMainTaskDecompose_ZPRK = new System.Windows.Forms.CheckBox(); this.lbl_DataProcess_RobotBuffer_ModeChange = new System.Windows.Forms.Label(); this.ck_DataProcess_RobotBuffer_ModeChange = new System.Windows.Forms.CheckBox(); this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound = new System.Windows.Forms.Label(); this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound = new System.Windows.Forms.CheckBox(); this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = new System.Windows.Forms.Label(); @@ -2983,8 +2983,8 @@ this.groupBox1.Controls.Add(this.checkBox_OutTaskRetryToMes); this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound); this.groupBox1.Controls.Add(this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound); this.groupBox1.Controls.Add(this.lbl_MainTaskDecompose_ZPRK); this.groupBox1.Controls.Add(this.ckMainTaskDecompose_ZPRK); this.groupBox1.Controls.Add(this.lbl_DataProcess_RobotBuffer_ModeChange); this.groupBox1.Controls.Add(this.ck_DataProcess_RobotBuffer_ModeChange); this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound); this.groupBox1.Controls.Add(this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound); this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask); @@ -3189,28 +3189,28 @@ this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound.UseVisualStyleBackColor = true; this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged); // // lbl_MainTaskDecompose_ZPRK // lbl_DataProcess_RobotBuffer_ModeChange // this.lbl_MainTaskDecompose_ZPRK.AutoSize = true; this.lbl_MainTaskDecompose_ZPRK.BackColor = System.Drawing.Color.White; this.lbl_MainTaskDecompose_ZPRK.ForeColor = System.Drawing.Color.Red; this.lbl_MainTaskDecompose_ZPRK.Location = new System.Drawing.Point(213, 452); this.lbl_MainTaskDecompose_ZPRK.Name = "lbl_MainTaskDecompose_ZPRK"; this.lbl_MainTaskDecompose_ZPRK.Size = new System.Drawing.Size(70, 15); this.lbl_MainTaskDecompose_ZPRK.TabIndex = 43; this.lbl_MainTaskDecompose_ZPRK.Text = "label11"; this.lbl_DataProcess_RobotBuffer_ModeChange.AutoSize = true; this.lbl_DataProcess_RobotBuffer_ModeChange.BackColor = System.Drawing.Color.White; this.lbl_DataProcess_RobotBuffer_ModeChange.ForeColor = System.Drawing.Color.Red; this.lbl_DataProcess_RobotBuffer_ModeChange.Location = new System.Drawing.Point(213, 452); this.lbl_DataProcess_RobotBuffer_ModeChange.Name = "lbl_DataProcess_RobotBuffer_ModeChange"; this.lbl_DataProcess_RobotBuffer_ModeChange.Size = new System.Drawing.Size(70, 15); this.lbl_DataProcess_RobotBuffer_ModeChange.TabIndex = 43; this.lbl_DataProcess_RobotBuffer_ModeChange.Text = "label11"; // // ckMainTaskDecompose_ZPRK // ck_DataProcess_RobotBuffer_ModeChange // this.ckMainTaskDecompose_ZPRK.AutoSize = true; this.ckMainTaskDecompose_ZPRK.Location = new System.Drawing.Point(3, 452); this.ckMainTaskDecompose_ZPRK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ckMainTaskDecompose_ZPRK.Name = "ckMainTaskDecompose_ZPRK"; this.ckMainTaskDecompose_ZPRK.Size = new System.Drawing.Size(207, 19); this.ckMainTaskDecompose_ZPRK.TabIndex = 42; this.ckMainTaskDecompose_ZPRK.Text = "ä»»å¡å解线ç¨(ç»çå ¥åº)"; this.ckMainTaskDecompose_ZPRK.UseVisualStyleBackColor = true; this.ckMainTaskDecompose_ZPRK.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged); this.ck_DataProcess_RobotBuffer_ModeChange.AutoSize = true; this.ck_DataProcess_RobotBuffer_ModeChange.Location = new System.Drawing.Point(3, 452); this.ck_DataProcess_RobotBuffer_ModeChange.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ck_DataProcess_RobotBuffer_ModeChange.Name = "ck_DataProcess_RobotBuffer_ModeChange"; this.ck_DataProcess_RobotBuffer_ModeChange.Size = new System.Drawing.Size(166, 19); this.ck_DataProcess_RobotBuffer_ModeChange.TabIndex = 42; this.ck_DataProcess_RobotBuffer_ModeChange.Text = "åºåºæ¨¡å¼åæ¢çº¿ç¨ "; this.ck_DataProcess_RobotBuffer_ModeChange.UseVisualStyleBackColor = true; this.ck_DataProcess_RobotBuffer_ModeChange.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged); // // lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound // @@ -6209,8 +6209,8 @@ private System.Windows.Forms.DataGridViewTextBoxColumn InStoreTime; private System.Windows.Forms.Label lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound; private System.Windows.Forms.CheckBox ckDataProcess_RobotBuffer_AutoQiTaoOutbound; private System.Windows.Forms.Label lbl_MainTaskDecompose_ZPRK; private System.Windows.Forms.CheckBox ckMainTaskDecompose_ZPRK; private System.Windows.Forms.Label lbl_DataProcess_RobotBuffer_ModeChange; private System.Windows.Forms.CheckBox ck_DataProcess_RobotBuffer_ModeChange; private System.Windows.Forms.TabPage tabPage4; private System.Windows.Forms.Panel panel_DeviceTaskList_dgvPartTask_Finished; private System.Windows.Forms.Button button17; CC/iWareCC_ASRS/FormCC.cs
@@ -344,7 +344,7 @@ this.lbl_Alert_Srm4ReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm4ReleaseFinish; this.lbl_Alert_RgvRelease.Text = showNowTime + SystemWarningMsg._lbl_Alert_RgvRelease; this.lbl_Alert_RgvReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_RgvReleaseFinish; this.lbl_Alert_RgvReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange; this.lbl_Alert_RgvReleaseFinish_BuChang.Text = showNowTime + SystemWarningMsg._lbl_Alert_RgvReleaseFinish_BuChang; this.lbl_Alert_HandlerIssuingTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_HandlerIssuingTask; @@ -353,7 +353,7 @@ this.lbl_MainTaskDecompose.Text = showNowTime + SystemWarningMsg._lbl_Alert_MainTaskDecompose; this.lbl_MainTaskDecompose_ZPRK.Text = showNowTime + SystemWarningMsg._lbl_Alert_MainTaskDecompose_ZPRK; this.lbl_DataProcess_RobotBuffer_ModeChange.Text = showNowTime + SystemWarningMsg._lbl_Alert_MainTaskDecompose_ZPRK; this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound; @@ -1585,7 +1585,7 @@ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_MainTaskDecompose, ckMainTaskDecompose); DoCommonCheckedChanged(ref SystemValue.isAllowRuning_MainTaskDecompose_ZPRK, ckMainTaskDecompose_ZPRK); DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_ModeChange, ck_DataProcess_RobotBuffer_ModeChange); DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTaskForOutbound, checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound);
@@ -259,7 +259,7 @@ iWareCC.RgvService.SdaResEntity sdaResult = rgvService.IsRgvAuto((int)EDevice.RGV, Convert.ToInt32(EDevice.RGV).ToString()); if (sdaResult.result == false) { Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.TrussThreadService, "éªè¯RGVæ¯å¦å¯ä»¥æ¥åä»»å¡åºç°é误,int_deviceId:" + (int)EDevice.RGV + ",sdaResultStr:" + JsonConvert.SerializeObject(sdaResult)); Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.DataProcess_RobotBuffer_ModeChange, "éªè¯RGVæ¯å¦å¯ä»¥æ¥åä»»å¡åºç°é误,int_deviceId:" + (int)EDevice.RGV + ",sdaResultStr:" + JsonConvert.SerializeObject(sdaResult)); text_RGV.Invoke(new Action(() => { text_RGV.BackColor = Color.Salmon; })); text_RGV.Invoke(new Action(() => { text_RGV.Text = msg + "æ£æµå¤±è´¥ï¼" + sdaResult.resMsg; })); return false; CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/DataProcess_RobotBuffer_ModeChange.cs
@@ -27,14 +27,14 @@ public static async void Handler() { var alertMsg = ""; LogType logType = LogType.DataProcess_BZ39; LogType logType = LogType.DataProcess_RobotBuffer_ModeChange; while (true) { Thread.Sleep(2000);//ä¼ç 2ç§ï¼å°ä¼ç åå°åé¢ï¼æ¯ä¸ºäºä¸é¢çcontinueæ¹æ³æ§è¡åä¸æ¾ç¤ºé误信æ¯çæ示ï¼ï¼ï¼ãEditBy shaocx,2022-05-24ã SystemWarningMsg._lbl_alert_DataProcess_BZ39 = string.Empty; SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange = string.Empty; try { if (SystemValue.isAllowRuning_DataProcess_BZ39 && SystemValue.isStartedModel) if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_ModeChange && SystemValue.isStartedModel) { if (FormCC.IsAllowRunOutMode) @@ -44,7 +44,7 @@ var rbRunMode = wmsDB.wms_rbline_runmode.FirstOrDefault(); if (rbRunMode.LineRunMode == (int)RbRunModeEnum.åºåºæ¨¡å¼) { SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"å·²ç»æ¯åºåºæ¨¡å¼äº,æ¤æ¬¡å¾ªç¯ç»æ"; SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange = $"å·²ç»æ¯åºåºæ¨¡å¼äº,æ¤æ¬¡å¾ªç¯ç»æ"; continue; } rbRunMode.LineRunMode = (int)RbRunModeEnum.åºåºæ¨¡å¼; @@ -57,7 +57,7 @@ // 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}"; // SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange = $"{rgvLocation.ToString()}-ä¸ååºåºä»»å¡ 失败,WriteOutStoreTaskInfoAsync è¿å:{res.resMsg}"; // continue; // } // else @@ -74,7 +74,7 @@ } catch (Exception ex) { SystemWarningMsg._lbl_alert_DataProcess_BZ39 += " åºç°å¼å¸¸:" + ex.Message + SysGloble.SPLIT_STR; SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange += " åºç°å¼å¸¸:" + ex.Message + SysGloble.SPLIT_STR; Log4NetHelper.WriteErrorLog(logType, " åºç°å¼å¸¸ï¼" + ex.Message, ex); } } CC/iWareCC_ASRS/WmsTask/MainTaskDecompose_ZPRK.cs
@@ -31,7 +31,7 @@ try { SystemWarningMsg._lbl_Alert_MainTaskDecompose_ZPRK = ""; if (SystemValue.isAllowRuning_MainTaskDecompose_ZPRK && SystemValue.isStartedModel) if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_ModeChange && SystemValue.isStartedModel) { using (DbModel context = new DbModel()) { CC/iWareCommon/Utils/Log4Net/LogType.cs
@@ -30,7 +30,7 @@ /// <summary> /// æ¡æ¶ä»»å¡çº¿ç¨æ¥å¿ /// </summary> TrussThreadService = 15, DataProcess_RobotBuffer_ModeChange = 15, #region SDAç¸å ³ CC/iWareCommon/log4net_iWare.config
@@ -230,8 +230,8 @@ <filter type="log4net.Filter.DenyAllFilter" /> </appender> <!--MESæ¥å£ãä¿¡æ¯ãæ¥å¿--> <appender name="MesService_Info" type="log4net.Appender.RollingFileAppender"> <file value="d:\\Log\\LuLiMuYe\\iWareCC\\MesService_Info\\" /> <appender name="DataProcess_RobotBuffer_ModeChange_Info" type="log4net.Appender.RollingFileAppender"> <file value="d:\\Log\\LuLiMuYe\\iWareCC\\DataProcess_RobotBuffer_ModeChange_Info\\" /> <appendToFile value="true" /> <rollingStyle value="Date" /> <staticLogFileName value="false" /> @@ -241,13 +241,13 @@ <param name="ConversionPattern" value="%næ¶æ¯æ¶é´ï¼%d [%t] %næ¶æ¯çº§å«ï¼%-5p %næ¶ æ¯ ç±»ï¼%c [%x] %n%m %n "/> </layout> <filter type="log4net.Filter.LoggerMatchFilter"> <loggerToMatch value="MesService_Info" /> <loggerToMatch value="DataProcess_RobotBuffer_ModeChange_Info" /> </filter> <filter type="log4net.Filter.DenyAllFilter" /> </appender> <!--MESæ¥å£ãé误ãæ¥å¿--> <appender name="MesService_Error" type="log4net.Appender.RollingFileAppender"> <file value="d:\\Log\\LuLiMuYe\\iWareCC\\MesService_Error\\" /> <appender name="DataProcess_RobotBuffer_ModeChange_Error" type="log4net.Appender.RollingFileAppender"> <file value="d:\\Log\\LuLiMuYe\\iWareCC\\DataProcess_RobotBuffer_ModeChange_Error\\" /> <appendToFile value="true" /> <rollingStyle value="Date" /> <staticLogFileName value="false" /> @@ -257,7 +257,7 @@ <param name="ConversionPattern" value="%nå¼å¸¸æ¶é´ï¼%d [%t] %nå¼å¸¸çº§å«ï¼%-5p %nå¼ å¸¸ ç±»ï¼%c [%x] %n%m %n "/> </layout> <filter type="log4net.Filter.LoggerMatchFilter"> <loggerToMatch value="MesService_Error" /> <loggerToMatch value="DataProcess_RobotBuffer_ModeChange_Error" /> </filter> <filter type="log4net.Filter.DenyAllFilter" /> </appender> @@ -638,8 +638,8 @@ <appender-ref ref="DataProcess_RobotBuffer_FinishTaskForOutbound_Error"/> <appender-ref ref="DataProcess_RobotBuffer_AutoQiTaoOutbound_Info"/> <appender-ref ref="DataProcess_RobotBuffer_AutoQiTaoOutbound_Error"/> <appender-ref ref="MesService_Info"/> <appender-ref ref="MesService_Error"/> <appender-ref ref="DataProcess_RobotBuffer_ModeChange_Info"/> <appender-ref ref="DataProcess_RobotBuffer_ModeChange_Error"/> <appender-ref ref="OutPlanTask_Info"/> <appender-ref ref="OutPlanTask_Error"/> <!--å åæºä»»å¡çº¿ç¨æ¥å¿--> LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
@@ -199,7 +199,7 @@ </el-table-column> <el-table-column prop="planNo" label="æ¹æ¬¡å·" show-overflow-tooltip="" /> <el-table-column prop="orderId" label="订åå·" show-overflow-tooltip="" /> <el-table-column prop="upi" label="é¨ä»¶æ¡ç " show-overflow-tooltip="" /> <el-table-column prop="upi" label="é¨ä»¶æ¡ç " width="200px" show-overflow-tooltip="" /> <el-table-column prop="detailName" label="é¨ä»¶å称" show-overflow-tooltip="" /> <el-table-column prop="length" label="é¿" show-overflow-tooltip="" /> <el-table-column prop="width" label="宽" show-overflow-tooltip="" /> LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json
@@ -21,12 +21,12 @@ // } //], "DbSettings": { "EnableInitDb": false, // å¯ç¨åºåå§å "EnableDiffLog": false, // å¯ç¨åºè¡¨å·®å¼æ¥å¿ "EnableInitDb": true, // å¯ç¨åºåå§å "EnableDiffLog": true, // å¯ç¨åºè¡¨å·®å¼æ¥å¿ "EnableUnderLine": false // å¯ç¨é©¼å³°è½¬ä¸å线 }, "TableSettings": { "EnableInitTable": false, // å¯ç¨è¡¨åå§å "EnableInitTable": true, // å¯ç¨è¡¨åå§å "EnableIncreTable": false // å¯ç¨è¡¨å¢éæ´æ°-ç¹æ§[IncreTable] }, "SeedSettings": {
