From fa8d6d8410a6ec07903cd81f37f0880dabe8ddf4 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 23 11月 2024 13:59:00 +0800
Subject: [PATCH] 222
---
CC/iWareCC_ASRS/Common/SystemWarningMsg.cs | 2
CC/iWareCommon/log4net_iWare.config | 16 ++++----
CC/iWareCC_ASRS/FormCC.Designer.cs | 50 ++++++++++++------------
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/DataProcess_RobotBuffer_ModeChange.cs | 12 +++---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue | 2
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json | 6 +-
CC/iWareCC_ASRS/WmsTask/MainTaskDecompose_ZPRK.cs | 2
CC/iWareCommon/Utils/Log4Net/LogType.cs | 2
CC/iWareCC_ASRS/FormCC.cs | 6 +-
CC/iWareCC_ASRS/Common/SystemValue.cs | 2
CC/iWareCC_ASRS/Forms/SystemCheckForm.cs | 2
CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs | 2
12 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/CC/iWareCC_ASRS/Common/SystemValue.cs b/CC/iWareCC_ASRS/Common/SystemValue.cs
index 43d7111..43dc6bd 100644
--- a/CC/iWareCC_ASRS/Common/SystemValue.cs
+++ b/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>
/// 鏄惁鍏佽鎵ц 鍫嗗灈鏈哄叆鍙ｆ壂鐮佹娴嬬嚎绋�
diff --git a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
index 91d97bc..5640117 100644
--- a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
+++ b/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浠诲姟瀹屾垚纭鐨勮鍛婃秷鎭紙琛ュ伩锛�
diff --git a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs b/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs
index 2442caa..aa477b0 100644
--- a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/RgvThreadService/RgvTaskThreadService.cs
+++ b/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);
}
diff --git a/CC/iWareCC_ASRS/FormCC.Designer.cs b/CC/iWareCC_ASRS/FormCC.Designer.cs
index f85f44f..4ab904d 100644
--- a/CC/iWareCC_ASRS/FormCC.Designer.cs
+++ b/CC/iWareCC_ASRS/FormCC.Designer.cs
@@ -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;
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index 72a02be..ef4c92f 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/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);
diff --git a/CC/iWareCC_ASRS/Forms/SystemCheckForm.cs b/CC/iWareCC_ASRS/Forms/SystemCheckForm.cs
index cb83b9a..85fefe6 100644
--- a/CC/iWareCC_ASRS/Forms/SystemCheckForm.cs
+++ b/CC/iWareCC_ASRS/Forms/SystemCheckForm.cs
@@ -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;
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_RobotBuffer_ModeChange.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_RobotBuffer_ModeChange.cs"
index 97019c4..d148dc0 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_RobotBuffer_ModeChange.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/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鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy 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);
}
}
diff --git a/CC/iWareCC_ASRS/WmsTask/MainTaskDecompose_ZPRK.cs b/CC/iWareCC_ASRS/WmsTask/MainTaskDecompose_ZPRK.cs
index dbeb04a..ae426ad 100644
--- a/CC/iWareCC_ASRS/WmsTask/MainTaskDecompose_ZPRK.cs
+++ b/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())
{
diff --git a/CC/iWareCommon/Utils/Log4Net/LogType.cs b/CC/iWareCommon/Utils/Log4Net/LogType.cs
index 6d5473e..ee782bd 100644
--- a/CC/iWareCommon/Utils/Log4Net/LogType.cs
+++ b/CC/iWareCommon/Utils/Log4Net/LogType.cs
@@ -30,7 +30,7 @@
/// <summary>
/// 妗佹灦浠诲姟绾跨▼鏃ュ織
/// </summary>
- TrussThreadService = 15,
+ DataProcess_RobotBuffer_ModeChange = 15,
#region SDA鐩稿叧
diff --git a/CC/iWareCommon/log4net_iWare.config b/CC/iWareCommon/log4net_iWare.config
index 5282a49..a3215cb 100644
--- a/CC/iWareCommon/log4net_iWare.config
+++ b/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"/>
<!--鍫嗗灈鏈轰换鍔＄嚎绋嬫棩蹇�-->
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
index 29478a2..7889af6 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue
+++ b/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="" />
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json
index 6121877..c34ca40 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json
+++ b/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": {
--
Gitblit v1.9.3