wangsr
/
PLT-IPC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
main
liulb@mesnac.com 1 year ago
parent cf78b2a9f6
commit 6efbcaf5cc
29 changed files with 669 additions and 156 deletions
Show Stats Download Patch File Download Diff File

70
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/AlarmHelper.cs
Unescape Escape View File

@ -8,6 +8,11 @@ using Mesnac.Codd.Session;
using Mesnac.Action.ChemicalWeighing.Entity;
using DevExpress.Office.Utils;
using Mesnac.Action.ChemicalWeighing.Entity.PptPlan;
using Mesnac.Action.ChemicalWeighing.Entity.Alarm;
using Mesnac.Action.ChemicalWeighing.DBHelper;
using Mesnac.Action.ChemicalWeighing.Product.PptPlan;
using DevExpress.Utils;
using System.Threading.Tasks;
namespace Mesnac.Action.ChemicalWeighing.Alarm
{
@ -615,5 +620,70 @@ namespace Mesnac.Action.ChemicalWeighing.Alarm
#endregion
public static void QueryUpdateAlarm()
{
IFreeSql fsql = FreeHelper.Instance;
string sql = @"select * from Pmt_Alarm ";
List<Pmt_Alarm> list = fsql.Select<Pmt_Alarm>().WithSql(sql).ToList();
if (list!=null&&list.Count() > 1)
{
// var affrows = Convert.ToInt32(fsql.Insert<Pmt_Alarm>(lrPlan).ExecuteIdentity());
foreach ( var item in list)
{
ReadAlarm(item);
}
}
}
private static void ReadAlarm(Pmt_Alarm item)
{
IFreeSql fsql = FreeHelper.Instance;
DataKeyValue plt_param = new DataKeyValue(item.Alarm_Point);
var value = plt_param.NowValue.ToInt();
Console.WriteLine(item.Alarm_Point + ":" + value);
if (value==1)
{
string sql = "select * from LR_Alarmlog";
var alarm = fsql.Select<LR_Alarmlog>(sql).Where(d => d.Alarm_ID == item.Alarm_ID && d.Alarm_Status == 1).ToOne();
if (alarm == null)
{
LR_Alarmlog lR_Alarmlog = new LR_Alarmlog();
lR_Alarmlog.Equip_Code = "01";
lR_Alarmlog.Alarm_ID = item.Alarm_ID;
lR_Alarmlog.Alarm_OccurTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
lR_Alarmlog.Alarm_Status = 1;
lR_Alarmlog.Alarm_GUID = "01";
var affrows = Convert.ToInt32(fsql.Insert<LR_Alarmlog>(lR_Alarmlog).ExecuteIdentity());
}
else
{
//alarm.Alarm_ClearTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss");
//alarm.Alarm_Status = 1;
//_= _lrAlarmlogServices.UpdateAsync(alarm).Result;
}
}
else
{
string sql = "select * from LR_Alarmlog";
LR_Alarmlog alarm = fsql.Select<LR_Alarmlog>().Where(d => d.Alarm_ID == item.Alarm_ID && d.Alarm_Status == 1).ToOne();
if (alarm != null)
{
alarm.Alarm_ClearTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
alarm.Alarm_Status = 0;
var affrows = Convert.ToInt32(fsql.Update<LR_Alarmlog>(alarm).ExecuteAffrows());
}
}
}
}
}

2
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/LRAlarmLog/ExportAction.cs
Unescape Escape View File

@ -22,7 +22,7 @@ namespace Mesnac.Action.ChemicalWeighing.Alarm.LRAlarmLog
base.RunIni(runtime); //必须要调用的
ICSharpCode.Core.LoggingService<ExportAction>.Debug("报警日志-导出...");
StringBuilder sbSql = new StringBuilder("SELECT Alarm_PLC, Alarm_Cn_Info, Alarm_OccurTime FROM LR_Alarmlog, Pmt_Alarm WHERE Pmt_Alarm.Alarm_ID=LR_Alarmlog.Alarm_ID ");
StringBuilder sbSql = new StringBuilder("SELECT Alarm_PLC, Alarm_Cn_Info, Alarm_OccurTime,Alarm_ClearTime FROM LR_Alarmlog, Pmt_Alarm WHERE Pmt_Alarm.Alarm_ID=LR_Alarmlog.Alarm_ID ");
List<DbMCControl> mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件
IBaseControl startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl;

2
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Alarm/LRAlarmLog/SelectAction.cs
Unescape Escape View File

@ -24,7 +24,7 @@ namespace Mesnac.Action.ChemicalWeighing.Alarm.LRAlarmLog
DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local);
dbHelper.ClearParameter();
StringBuilder sbSql = new StringBuilder("SELECT Alarm_PLC, Alarm_Cn_Info, Alarm_OccurTime FROM LR_Alarmlog, Pmt_Alarm WHERE Pmt_Alarm.Alarm_ID=LR_Alarmlog.Alarm_ID ");
StringBuilder sbSql = new StringBuilder("SELECT Alarm_PLC, Alarm_Cn_Info, Alarm_OccurTime,Alarm_ClearTime FROM LR_Alarmlog, Pmt_Alarm WHERE Pmt_Alarm.Alarm_ID=LR_Alarmlog.Alarm_ID ");
List<DbMCControl> mcControllist = GetAllDbMCControlsByOption(DbOptionTypes.Query);//获取所有待初始化控件
IBaseControl startdate = mcControllist.Where(t => t.BaseControl.MCKey != null && t.BaseControl.MCKey.ToLower() == "startdate").FirstOrDefault().BaseControl;

74
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Entity/Alarm/Pmt_Alarm.cs
Unescape Escape View File

@ -0,0 +1,74 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mesnac.Action.ChemicalWeighing.Entity.Alarm
{
public class Pmt_Alarm
{
public Pmt_Alarm()
{
}
/// <summary>
/// Desc:
/// Default:
/// Nullable:False
/// </summary>
public int Alarm_ID { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string Equip_Code { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string Alarm_PLC { get; set; }
/// <summary>
/// 点位
/// </summary>
public string Alarm_Point { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public int? Alarm_Block { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string Alarm_Alias { get; set; }
/// <summary>
/// Desc:中文名称
/// Default:
/// Nullable:True
/// </summary>
public string Alarm_Cn_Info { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string Alarm_En_Info { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public int? Alarm_Level { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string Alarm_Word { get; set; }
}
}

30
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchService.cs
Unescape Escape View File

@ -8,6 +8,10 @@ using ICSharpCode.Core;
using Mesnac.Equips;
using Mesnac.Codd.Session;
using Mesnac.Controls.Base;
using Mesnac.Action.ChemicalWeighing.DBHelper;
using Mesnac.Action.ChemicalWeighing.Entity;
using Mesnac.Action.ChemicalWeighing.Product.PptPlan;
using Mesnac.Action.ChemicalWeighing.Alarm;
namespace Mesnac.Action.ChemicalWeighing.FinishBatch
{
@ -65,7 +69,7 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch
{
//BasePlcHelper.Instance.PlcRead(BasePlcHelper.Instance.read_data, out int[] p);
Mesnac.Equips.Factory.Instance.SetMinHZReadDataEvent(ReadData);
// Mesnac.Equips.Factory.Instance.SetMinHZReadDataEvent(UpdateData);
Mesnac.Equips.Factory.Instance.SetMinHZReadDataEvent(UpdateAlarmData);
this.runState = true;
}
}
@ -114,13 +118,13 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch
{
#region 实时刷新自动保存报警
//SaveHelper.AlarmSaveHelper.Save();
SaveHelper.AlarmSaveHelper.Save();
#endregion
#region 更新小料计划状态
XlPlcHelper.PlcPlanHelper.ExecPlanState();
//XlPlcHelper.PlcPlanHelper.ExecPlanState();
#endregion
}
@ -131,7 +135,7 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch
}
}
private void UpdateData(object sender, Mesnac.Equips.ReadEventArgs e)
private void UpdateAlarmData2(object sender, Mesnac.Equips.ReadEventArgs e)
{
try
{
@ -150,5 +154,23 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch
}
}
#endregion
private void UpdateAlarmData(object sender, Mesnac.Equips.ReadEventArgs e)
{
try
{
lock (String.Empty)
{
#region 更新计划状态
AlarmHelper.QueryUpdateAlarm();
#endregion
}
}
catch (Exception ex)
{
ICSharpCode.Core.LoggingService<FinishBatchService>.Error(ex.Message, ex);
}
}
}
}

6
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/AlarmSaveHelper.cs
Unescape Escape View File

@ -14,6 +14,7 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
/// </summary>
public static event EventHandler OnAlarmSave;
public static event EventHandler OnAlarmSaveExtend;
public static event EventHandler OnRefreshAlarm;
public static object sender = null;
public static object senderExtend = null;
private static int WordLength = 16; //定义字长
@ -91,5 +92,10 @@ namespace Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper
#endregion 保存报警数据
}
public static void RefreshAlarm()
{
}
}
}

2
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
Unescape Escape View File

@ -272,6 +272,7 @@
<Compile Include="DeviceParamManage\InitDeviceParamInfo.cs" />
<Compile Include="DeviceParamManage\SelectDeviceParamInfo.cs" />
<Compile Include="DeviceParamManage\WriteDeviceParamInfo.cs" />
<Compile Include="Entity\Alarm\Pmt_Alarm.cs" />
<Compile Include="Entity\Barrel\Hw_Barrel.cs" />
<Compile Include="Entity\Cylinder\Hw_Cylinder.cs" />
<Compile Include="Entity\HwAlarm\Hw_Solvent_Alarm.cs" />
@ -400,6 +401,7 @@
<Compile Include="Report\BinReport\InitFormAction.cs" />
<Compile Include="Report\BinReport\BinAlarmAction.cs" />
<Compile Include="Report\BinReport\RefreshAction.cs" />
<Compile Include="Report\ProductionReport\Export.cs" />
<Compile Include="Report\ProductionReport\SelectPlanAction.cs" />
<Compile Include="Report\ProductionReport\SelectPlanTotalAction.cs" />
<Compile Include="Report\ScanControl.cs" />

123
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/PlanHelper.cs
Unescape Escape View File

@ -2587,7 +2587,7 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
}
dbHelper.CommandType = CommandType.Text;
string strSql = @"select p.Dosing_Id,p.Plan_Id,p.Plan_Serial,p.Recipe_ID,p.Recipe_Name,p.Version,p.Plan_Num,p.Real_Num,p.Shift_Id,p.Shift_Class,p.Plan_State,p.Plan_StateText,p.Plan_TotalWeight,p.Plan_TotalError,
r.Total_Weight,r.Total_Error,m.ID as MaterialID,m.Material_name,b.Bin_Serial as Station,b.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num
r.Total_Weight,r.Total_Error,m.ID as MaterialID,m.Material_name,b.Bin_Serial as Station,b.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num,p.IsPrenatalTest
from xl_plan p left join xl_recipe r on p.Recipe_ID=r.ID left join xl_weigh w on r.ID=w.Recipe_ID
left join xl_material m on w.Material_ID=m.ID
left join Pmt_Bin b on m.ID=b.Material_ID
@ -2715,7 +2715,7 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
//left join xl_material m on w.Material_ID=m.ID
//left join Pmt_Bin b on m.ID=b.Material_ID";
string strSql = @" select p.Dosing_Id,p.Plan_Id,p.Plan_Serial,p.Recipe_ID,p.Recipe_Name,p.Version,p.Plan_Num,p.Real_Num,p.Shift_Id,p.Shift_Class,p.Plan_State,p.Plan_StateText,p.Plan_TotalWeight,p.Plan_TotalError,
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num,p.IsPrenatalTest
from (select top 1 * from xl_plan where Plan_State=5 and Plan_Num<>Real_Num ORDER BY Plan_Serial) p
left join xl_recipe r on p.Recipe_ID=r.ID
left join xl_weigh w on r.ID=w.Recipe_ID
@ -2902,14 +2902,14 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
/// <exception cref="Exception"></exception>
public static List<Xl_DowLoadPlan> GetExecPlan(int serial)
{
//List<Xl_DowLoadPlan> lst = new List<Xl_DowLoadPlan>();
//DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local);
//if (dbHelper == null)
//{
// throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError);
//}
//dbHelper.CommandType = CommandType.Text;
List<Xl_DowLoadPlan> lst = new List<Xl_DowLoadPlan>();
DbHelper dbHelper = Mesnac.Basic.DataSourceFactory.Instance.GetDbHelper(Mesnac.Basic.DataSourceFactory.MCDbType.Local);
if (dbHelper == null)
{
throw new Exception(Mesnac.Basic.LanguageHelper.DataBaseConnectError);
}
dbHelper.CommandType = CommandType.Text;
string strSql = string.Empty;
//处理任务取消，但是当前任务会在执行完当前物料称量结束后才能
if (GetPlanInfo().Count()>0)
@ -2918,10 +2918,10 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num,p.IsPrenatalTest,ISNULL(p.FlagNum,0) as FlagNum
from xl_plan p left join xl_recipe r on p.Recipe_ID=r.ID left join xl_weigh w on r.ID=w.Recipe_ID left join
(select b.Bin_Serial,b.Bin_Name,b.Bin_Code,b.Material_ID,m.Material_name from Pmt_Bin b left join xl_material m on m.ID=b.Material_ID) m on w.Bin_Serial=m.Bin_Serial
where p.Plan_State=3 and w.Station is not null ";
//dbHelper.CommandText = strSql;
//dbHelper.ClearParameter();
//dbHelper.AddParameter("@Plan_Serial", serial);
where p.Plan_State=3 ";
dbHelper.CommandText = strSql;
dbHelper.ClearParameter();
dbHelper.AddParameter("@Plan_Serial", serial);
}
else
{
@ -2932,28 +2932,28 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num,p.IsPrenatalTest,ISNULL(p.FlagNum,0) as FlagNum
from (select * from xl_plan where Plan_State=7 and Start_Date=(select Max(Start_Date) from xl_plan where Plan_State=7) ) p left join xl_recipe r on p.Recipe_ID=r.ID left join xl_weigh w on r.ID=w.Recipe_ID left join
(select b.Bin_Serial,b.Bin_Name,b.Bin_Code,b.Material_ID,m.Material_name from Pmt_Bin b left join xl_material m on m.ID=b.Material_ID) m on w.Bin_Serial=m.Bin_Serial
where w.Station is not null ";
";
}
//dbHelper.CommandText = strSql;
//dbHelper.ClearParameter();
dbHelper.CommandText = strSql;
dbHelper.ClearParameter();
}
IFreeSql fsql = FreeHelper.Instance;
var list = fsql.Select<Xl_DowLoadPlan>()
.WithSql(strSql)
.Where(d => d.Plan_Serial.Equals(serial)).OrderBy(d => d.Station)
.ToList<Xl_DowLoadPlan>("*");
return list;
//DataTable table = dbHelper.ToDataTable();
//if (table != null && table.Rows.Count > 0)
//{
// Xl_DowLoadPlan entity = null;
// foreach (DataRow dr in table.Rows)
// {
// entity = ConvertDataRowToPlan(dr);
// lst.Add(entity);
// }
//}
//return lst;
//IFreeSql fsql = FreeHelper.Instance;
//var list = fsql.Select<Xl_DowLoadPlan>()
// .WithSql(strSql)
// .Where(d => d.Plan_Serial.Equals(serial)).OrderBy(d => d.Station)
// .ToList<Xl_DowLoadPlan>("*");
//return list;
DataTable table = dbHelper.ToDataTable();
if (table != null && table.Rows.Count > 0)
{
Xl_DowLoadPlan entity = null;
foreach (DataRow dr in table.Rows)
{
entity = ConvertDataRowToPlan(dr);
lst.Add(entity);
}
}
return lst;
}
public static int GetPlan()
@ -2992,10 +2992,10 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
string strSql = string.Empty;
strSql = @"select p.Dosing_Id,p.Plan_Id,p.Plan_Serial,p.Recipe_ID,p.Recipe_Name,p.Version,p.Plan_Num,p.Real_Num,p.Shift_Id,p.Shift_Class,p.Plan_State,p.Plan_StateText,p.Plan_TotalWeight,p.Plan_TotalError,
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num,p.IsPrenatalTest
from xl_plan p left join xl_recipe r on p.Recipe_ID=r.ID left join xl_weigh w on r.ID=w.Recipe_ID left join
(select b.Bin_Serial,b.Bin_Name,b.Bin_Code,b.Material_ID,m.Material_name from Pmt_Bin b left join xl_material m on m.ID=b.Material_ID) m on w.Bin_Serial=m.Bin_Serial
where p.Plan_State=3 and w.Station is not null ORDER BY p.Plan_Serial";
where p.Plan_State=3 ORDER BY p.Plan_Serial";
dbHelper.CommandText = strSql;
dbHelper.ClearParameter();
@ -3039,24 +3039,24 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
if (GetPlanInfo().Count() > 0)
{
strSql = @"select p.Dosing_Id,p.Plan_Id,p.Plan_Serial,p.Recipe_ID,p.Recipe_Name,p.Version,p.Plan_Num,p.Real_Num,p.Shift_Id,p.Shift_Class,p.Plan_State,p.Plan_StateText,p.Plan_TotalWeight,p.Plan_TotalError,
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num,p.IsPrenatalTest
from xl_plan p
left join xl_recipe r on p.Recipe_ID=r.ID
left join xl_weigh w on r.ID=w.Recipe_ID
left join (select b.Bin_Serial,b.Bin_Name,b.Bin_Code,b.Material_ID,m.Material_name from Pmt_Bin b left join xl_material m on m.ID=b.Material_ID) m on w.Bin_Serial=m.Bin_Serial
where p.Plan_State=3 and w.Station is not null ORDER BY p.Plan_Serial";
where p.Plan_State=3 ORDER BY p.Plan_Serial";
}
else
{
if (BasePlcHelper.Instance.plt_plc_SystemRunning.NowValue.ToInt() == 1)
{
strSql = @" select p.Dosing_Id,p.Plan_Id,p.Plan_Serial,p.Recipe_ID,p.Recipe_Name,p.Version,p.Plan_Num,p.Real_Num,p.Shift_Id,p.Shift_Class,p.Plan_State,p.Plan_StateText,p.Plan_TotalWeight,p.Plan_TotalError,
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num,p.IsPrenatalTest
from (select * from xl_plan where Plan_State=7 and Start_Date=(select Max(Start_Date) from xl_plan where Plan_State=7) ) p
left join xl_recipe r on p.Recipe_ID=r.ID
left join xl_weigh w on r.ID=w.Recipe_ID
left join (select b.Bin_Serial,b.Bin_Name,b.Bin_Code,b.Material_ID,m.Material_name from Pmt_Bin b left join xl_material m on m.ID=b.Material_ID) m on w.Bin_Serial=m.Bin_Serial
where w.Station is not null ORDER BY p.Plan_Serial";
ORDER BY p.Plan_Serial";
}
}
@ -3103,29 +3103,29 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
}
string strSql = string.Empty;
dbHelper.CommandType = CommandType.Text;
//if (GetPlanInfo().Count() > 0)
//{
if (GetPlanInfo().Count() > 0)
{
strSql = @"select p.Dosing_Id,p.Plan_Id,p.Plan_Serial,p.Recipe_ID,p.Recipe_Name,p.Version,p.Plan_Num,p.Real_Num,p.Shift_Id,p.Shift_Class,p.Plan_State,p.Plan_StateText,p.Plan_TotalWeight,p.Plan_TotalError,
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num,p.IsPrenatalTest
from (select * from xl_plan where Start_Date=(select Max(Start_Date) from xl_plan ) ) p
left join xl_recipe r on p.Recipe_ID=r.ID
left join xl_weigh w on r.ID=w.Recipe_ID
left join (select b.Bin_Serial,b.Bin_Name,b.Bin_Code,b.Material_ID,m.Material_name from Pmt_Bin b left join xl_material m on m.ID=b.Material_ID) m on w.Bin_Serial=m.Bin_Serial
where w.Station is not null ORDER BY p.Plan_Serial";
// }
// else
// {
// if (BasePlcHelper.Instance.plt_plc_SystemRunning.NowValue.ToInt() == 1)
// {
// strSql = @" select p.Dosing_Id,p.Plan_Id,p.Plan_Serial,p.Recipe_ID,p.Recipe_Name,p.Version,p.Plan_Num,p.Real_Num,p.Shift_Id,p.Shift_Class,p.Plan_State,p.Plan_StateText,p.Plan_TotalWeight,p.Plan_TotalError,
// r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num
// from (select * from xl_plan where Plan_State=7 and Start_Date=(select Max(Start_Date) from xl_plan where Plan_State=7) ) p
//left join xl_recipe r on p.Recipe_ID=r.ID
//left join xl_weigh w on r.ID=w.Recipe_ID
//left join (select b.Bin_Serial,b.Bin_Name,b.Bin_Code,b.Material_ID,m.Material_name from Pmt_Bin b left join xl_material m on m.ID=b.Material_ID) m on w.Bin_Serial=m.Bin_Serial
//where w.Station is not null ORDER BY p.Plan_Serial";
// }
// }
where p.Plan_State=3 ORDER BY p.Plan_Serial";
}
else
{
if (BasePlcHelper.Instance.plt_plc_SystemRunning.NowValue.ToInt() == 1)
{
strSql = @" select p.Dosing_Id,p.Plan_Id,p.Plan_Serial,p.Recipe_ID,p.Recipe_Name,p.Version,p.Plan_Num,p.Real_Num,p.Shift_Id,p.Shift_Class,p.Plan_State,p.Plan_StateText,p.Plan_TotalWeight,p.Plan_TotalError,
r.Total_Weight,r.Total_Error,m.Material_ID as MaterialID,m.Material_name,m.Bin_Serial as Station,m.Bin_Name as StationName,w.Set_Weight,w.Set_Error,p.IsRetransmission,p.Retransmission_Num
from (select * from xl_plan where Plan_State=7 and Start_Date=(select Max(Start_Date) from xl_plan where Plan_State=7) ) p
left join xl_recipe r on p.Recipe_ID=r.ID
left join xl_weigh w on r.ID=w.Recipe_ID
left join (select b.Bin_Serial,b.Bin_Name,b.Bin_Code,b.Material_ID,m.Material_name from Pmt_Bin b left join xl_material m on m.ID=b.Material_ID) m on w.Bin_Serial=m.Bin_Serial
ORDER BY p.Plan_Serial";
}
}
dbHelper.CommandText = strSql;
@ -3179,7 +3179,7 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
left join xl_recipe r on p.Recipe_ID=r.ID
left join xl_weigh w on r.ID=w.Recipe_ID
left join(select b.Bin_Serial,b.Bin_Name,b.Bin_Code,b.Material_ID,m.Material_name from Pmt_Bin b left join xl_material m on m.ID=b.Material_ID) m on w.Bin_Serial=m.Bin_Serial
where w.Station is not null ORDER BY w.Weight_Id";
ORDER BY w.Weight_Id";
// }
// else
// {
@ -3189,7 +3189,7 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
//left join xl_recipe r on p.Recipe_ID=r.ID
//left join xl_weigh w on r.ID=w.Recipe_ID
//left join(select b.Bin_Serial,b.Bin_Name,b.Bin_Code,b.Material_ID,m.Material_name from Pmt_Bin b left join xl_material m on m.ID=b.Material_ID) m on w.Bin_Serial=m.Bin_Serial
//where w.Station is not null ORDER BY w.Weight_Id";
// ORDER BY w.Weight_Id";
// }
@ -3616,7 +3616,8 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
plan.Set_Error = Convert.ToDecimal(Mesnac.Basic.DataProcessor.RowValue(dr, "Set_Error", 0.000).ToString());
plan.IsRetransmission = Mesnac.Basic.DataProcessor.RowValue(dr, "IsRetransmission", 0);
plan.Retransmission_Num = Mesnac.Basic.DataProcessor.RowValue(dr, "Retransmission_Num", 0);
plan.IsPrenatalTest = Mesnac.Basic.DataProcessor.RowValue(dr, "IsPrenatalTest", 0);
return plan;
}
else

7
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/XlPlan/RefreshAction.cs
Unescape Escape View File

@ -13,6 +13,7 @@ using Mesnac.Action.ChemicalWeighing.Entity;
using Mesnac.Action.ChemicalWeighing.Technical;
using Mesnac.Action.ChemicalWeighing.DBHelper;
using Mesnac.Action.ChemicalWeighing.ChemicalWeighingPlc;
using Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper;
namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
{
@ -79,6 +80,8 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
StopAction.OnStopPlan -= Process_Event;
StopAction.OnStopPlan += Process_Event;
//自动下传计划成功时，刷新本地计划
//XlPlcHelper.PlcPlanHelper.sender = runtime;
//XlPlcHelper.PlcPlanHelper.AutoDownloadPlan -= Process_Event;
@ -120,10 +123,12 @@ namespace Mesnac.Action.ChemicalWeighing.Product.XlPlan
//DataTable table = PlanHelper.GetPlanData(selectedDate, shiftID);
//DataTable table = PlanHelper.GetPlanData(selectedDate);
//DataTable table = PlanHelper.GetPlanData();
IFreeSql fsql = FreeHelper.Instance;
string sql = @"select * from (SELECT Batch,ProductName,Plan_Serial,Recipe_ID,Recipe_Name,Equip_Code,Version,Plan_Id,Plan_Num,Real_Num,Plan_State,Plan_StateText,Start_Date,End_Date,Plan_Date,IsPrenatalTest,CreateTime FROM xl_plan
where IsPrenatalTest=0 or IsPrenatalTest IS NULL
) t ";// where datediff(day, t.CreateTime,getdate())=0
) t where CONVERT(varchar(100), t.Start_Date, 23) >= CONVERT(varchar(100), GETDATE(), 23) or (CONVERT(varchar(100), t.Start_Date, 23) >= CONVERT(varchar(100), GETDATE(), 23) and t.Plan_State=8) or t.Plan_State=5 or t.Plan_State=3 ";// where datediff(day, t.CreateTime,getdate())=0
DataTable table = fsql.Select<object>().WithSql(sql).OrderBy("Plan_State").ToDataTable("*");
lock (String.Empty)

8
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/BinReport/RefreshAction.cs
Unescape Escape View File

@ -92,11 +92,11 @@ namespace Mesnac.Action.ChemicalWeighing.Report.BinReport
string sql = @"select Bin_Serial,Bin_Name,Material_ID,x.Material_name,LimitWeight,BinWeight,ISNULL(e.OutWeight,0.00) OutWeight,ISNULL(o.EnterWeight,0.00) EnterWeight from Pmt_Bin b left join xl_material x on b.Material_ID=x.ID
left join (
select distinct BinId,BinName,MaterialCode,MaterialName,ISNULL(SUM(Weights),0.00) as OutWeight,TypeName from Pmt_Bin b left join Hw_BinAlarm a on b.Material_ID=a.MaterialCode where TypeName='出库' and MaterialCode is not null group by BinId,BinName,MaterialCode,MaterialName,TypeName
) e on b.Bin_Serial=e.BinId and b.Material_ID=e.MaterialCode
select distinct BinId,BinName,MaterialCode,MaterialName,ISNULL(SUM(Weights),0.00) as OutWeight,TypeName from ( select b.* from Pmt_Bin b inner join xl_material m on b.Material_ID=m.ID ) b
left join Hw_BinAlarm a on b.Material_ID=a.MaterialCode and b.Bin_Serial=a.BinId where TypeName='出库' and MaterialCode is not null group by BinId,BinName,MaterialCode,MaterialName,TypeName ) e on b.Bin_Serial=e.BinId and b.Material_ID=e.MaterialCode
left join (
select distinct BinId,BinName,MaterialCode,MaterialName,ISNULL(SUM(Weights),0.00) as EnterWeight,TypeName from Pmt_Bin b left join Hw_BinAlarm a on b.Material_ID=a.MaterialCode where TypeName='入库' and MaterialCode is not null group by BinId,BinName,MaterialCode,MaterialName,TypeName
) o on b.Bin_Serial=o.BinId and b.Material_ID=e.MaterialCode";
select distinct BinId,BinName,MaterialCode,MaterialName,ISNULL(SUM(Weights),0.00) as EnterWeight,TypeName from ( select b.* from Pmt_Bin b inner join xl_material m on b.Material_ID=m.ID ) b
left join Hw_BinAlarm a on b.Material_ID=a.MaterialCode and b.Bin_Serial=a.BinId where TypeName='入库' and MaterialCode is not null group by BinId,BinName,MaterialCode,MaterialName,TypeName) o on b.Bin_Serial=o.BinId and b.Material_ID=e.MaterialCode";
lock (String.Empty)
{

175
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/Export.cs
Unescape Escape View File

@ -0,0 +1,175 @@
using DataTable = System.Data.DataTable;
using Workbook = Microsoft.Office.Interop.Excel.Workbook;
using Worksheet = Microsoft.Office.Interop.Excel.Worksheet;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport
{
public class Export
{
string FileName = @"D:\WeightExportFile.xlsx";
DataTable dt;
DataTable MoreDataTable;
public void ExportTo(string fileName,DataTable dt1, DataTable dt2, DataTable dt3)
{
//dt = new DataTable();
//dt.Columns.Add("机台", typeof(string));
//dt.Columns.Add("湿混等待时间", typeof(string));
//dt.Columns.Add("RGV等待时间", typeof(string));
//dt.Columns.Add("总等待时间", typeof(string));
//MoreDataTable = new DataTable();
//MoreDataTable.Columns.Add("湿混等待时间", typeof(string));
//MoreDataTable.Columns.Add("RGV等待时间", typeof(string));
//MoreDataTable.Columns.Add("总等待时间", typeof(string));
//MoreDataTable.Columns.Add("起始时间", typeof(string));
//MoreDataTable.Columns.Add("结束时间", typeof(string));
// 使用 Microsoft Office Interop Excel 组件导出 Excel 文件
Microsoft.Office.Interop.Excel.Application excelApp = new Microsoft.Office.Interop.Excel.Application();
Workbook workbook = excelApp.Workbooks.Add();
//AllExport(workbook);
MoreDataExport(workbook, dt1, dt2, dt3);
// 将 Excel 文件保存到磁盘
try
{
workbook.SaveAs(fileName);
}
catch (Exception e)
{
MessageBox.Show("请重新选择导出路径或关闭已打开的导出文件！ " + e);
}
// 关闭 Excel 应用程序和工作簿对象，并释放资源
workbook.Close();
//excelApp.Quit();
System.Runtime.InteropServices.Marshal.ReleaseComObject(workbook);
//System.Runtime.InteropServices.Marshal.ReleaseComObject(excelApp);
}
/// <summary>
/// 数据和导出
/// </summary>
/// <param name="workbook"></param>
private void AllExport(Workbook workbook)
{
//DataTableSum();
Worksheet worksheet = (Worksheet)workbook.Worksheets[1];
worksheet.Name = "总量统计";
worksheet.Cells[1, 1] = "机台";
worksheet.Cells[1, 2] = "湿混等待时间";
worksheet.Cells[1, 3] = "RGV等待时间";
worksheet.Cells[1, 4] = "总等待时间";
int row = 2;
//读取数据
foreach (DataRow item in dt.Rows)
{
worksheet.Cells[row, 1] = item[0];
worksheet.Cells[row, 2] = item[1];
worksheet.Cells[row, 3] = item[2];
worksheet.Cells[row, 4] = item[3];
row++;
}
System.Runtime.InteropServices.Marshal.ReleaseComObject(worksheet);
}
//详细数据导出
private void MoreDataExport(Workbook workbook, DataTable dt1, DataTable dt2, DataTable dt3)
{
for (int i = 1; i <= 3; i++)
{
if (i==1)
{
Worksheet worksheet = (Worksheet)workbook.Worksheets.Add();
worksheet.Name = "执行计划报表";
worksheet.Cells[1, 1] = "执行批次";
worksheet.Cells[1, 2] = "产品名称";
worksheet.Cells[1, 3] = "计划号";
worksheet.Cells[1, 4] = "配方名";
worksheet.Cells[1, 5] = "执行状态";
worksheet.Cells[1, 6] = "计划批次";
worksheet.Cells[1, 7] = "完成批次";
worksheet.Cells[1, 8] = "开始时间";
worksheet.Cells[1, 9] = "结束时间";
worksheet.Cells[1, 10] = "总重量";
worksheet.Cells[1, 11] = "总误差";
int row = 2;
foreach (DataRow item in dt1.Rows)
{
worksheet.Cells[row, 1] = item[0];
worksheet.Cells[row, 2] = item[1];
worksheet.Cells[row, 3] = item[2];
worksheet.Cells[row, 4] = item[4];
worksheet.Cells[row, 5] = item[6];
worksheet.Cells[row, 6] = item[7];
worksheet.Cells[row, 7] = item[8];
worksheet.Cells[row, 8] = item[9];
worksheet.Cells[row, 9] = item[16];
worksheet.Cells[row, 10] = item[11];
worksheet.Cells[row, 11] = item[13];
row++;
}
System.Runtime.InteropServices.Marshal.ReleaseComObject(worksheet);
}
if (i == 2)
{
Worksheet worksheet = (Worksheet)workbook.Worksheets.Add();
worksheet.Name = "执行计划车报表";
worksheet.Cells[1, 1] = "计划号";
worksheet.Cells[1, 2] = "执行批次";
worksheet.Cells[1, 3] = "总计重量";
worksheet.Cells[1, 4] = "总计误差";
int row = 2;
foreach (DataRow item in dt2.Rows)
{
worksheet.Cells[row, 1] = item[2];
worksheet.Cells[row, 2] = item[3];
worksheet.Cells[row, 3] = item[4];
worksheet.Cells[row, 4] = item[5];
row++;
}
System.Runtime.InteropServices.Marshal.ReleaseComObject(worksheet);
}
if (i == 3)
{
Worksheet worksheet = (Worksheet)workbook.Worksheets.Add();
worksheet.Name = "计划详细数据";
worksheet.Cells[1, 1] = "计划号";
worksheet.Cells[1, 2] = "物料名称";
worksheet.Cells[1, 3] = "料仓";
worksheet.Cells[1, 4] = "设定重量";
worksheet.Cells[1, 5] = "实际重量";
worksheet.Cells[1, 6] = "设定误差";
worksheet.Cells[1, 7] = "实际误差";
int row = 2;
foreach (DataRow item in dt3.Rows)
{
worksheet.Cells[row, 1] = item[2];
worksheet.Cells[row, 2] = item[6];
worksheet.Cells[row, 3] = item[4];
worksheet.Cells[row, 4] = item[7];
worksheet.Cells[row, 5] = item[9];
worksheet.Cells[row, 6] = item[8];
worksheet.Cells[row, 7] = item[10];
row++;
}
System.Runtime.InteropServices.Marshal.ReleaseComObject(worksheet);
}
}
}
}
}

67
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/ExportAction.cs
Unescape Escape View File

@ -28,7 +28,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport
this._runtime = runtime;
ICSharpCode.Core.LoggingService<ExportAction>.Debug("生产报表-导出...");
this._dgvLRPlan = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "RT_plan").FirstOrDefault();
this._dgvLRPlan = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "xl_plan").FirstOrDefault();
DataGridView lR_planGridView = this._dgvLRPlan.BaseControl as DataGridView;
@ -39,23 +39,25 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport
DialogResult result = sfd.ShowDialog();
if (result == DialogResult.OK)
{
DbMCControl weighGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "LR_weigh").FirstOrDefault();
// 创建一个新的DataTable对象
System.Data.DataTable dt = new System.Data.DataTable();
DataGridView dataGridView1 = weighGridControl.BaseControl as DataGridView;
// 添加列
foreach (DataGridViewColumn column in dataGridView1.Columns)
{
dt.Columns.Add(column.HeaderText, column.ValueType);
}
string fileName = sfd.FileName;
if (!String.IsNullOrEmpty(fileName))
{
try
{
DataTabletoExcel(_dgvLRPlan, fileName);
//DataTabletoExcel(_dgvLRPlan, fileName);
//DataTabletoSubPlanExcel(subPlanGridControl, sfd2.FileName);
//DataTabletoWeighExcel(subPlanGridContro3, sfd3.FileName);
Export export = new Export();
DbMCControl weighGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "xl_plan").FirstOrDefault();
System.Data.DataTable dts1 = _dgvLRPlan.BaseControl.BindDataSource as System.Data.DataTable;
DbMCControl subPlanGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "LR_plan").FirstOrDefault();
System.Data.DataTable dts2 = subPlanGridControl.BaseControl.BindDataSource as System.Data.DataTable;
DbMCControl subPlanGridContro3 = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "LR_weigh").FirstOrDefault();
System.Data.DataTable dts3 = subPlanGridContro3.BaseControl.BindDataSource as System.Data.DataTable;
export.ExportTo(fileName, dts1, dts2, dts3);
string msg1 = StringParser.Parse(ResourceService.GetString("Mesnac_Action_ChemicalWeighing_Report_ProductionReport_ExportAction_msg1")); //导出生产报表数据至Excel成功!
ICSharpCode.Core.LoggingService<ExportAction>.Info(msg1);
@ -100,21 +102,52 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport
System.Data.DataTable dts = myDGV.BaseControl.BindDataSource as System.Data.DataTable;
dts.Columns["Batch"].ColumnName = "执行批次";
dts.Columns["ProductName"].ColumnName = "产品名称";
dts.Columns["Plan_Id"].ColumnName= "计划号";
dts.Columns["Recipe_ID"].ColumnName= "物料ID";
dts.Columns["Recipe_Name"].ColumnName= "物料名称";
dts.Columns["Version"].ColumnName= "版本";
dts.Columns["Plan_Num"].ColumnName= "计划批次";
dts.Columns["Real_Num"].ColumnName= "完成批次";
dts.Columns["Start_Date"].ColumnName= "开始时间";
dts.Columns["End_Date"].ColumnName= "结束时间";
dts.Columns["Shift_name"].ColumnName= "班组";
dts.Columns["Weight_Man"].ColumnName = "执行人";
dts.Columns["Total_Weight"].ColumnName = "总重量";
dts.Columns["Total_Error"].ColumnName = "总误差";
dts.Columns["IsRetransmission"].ColumnName = "是否重传";
System.IO.Stream fs = new System.IO.FileStream(strFileName, System.IO.FileMode.Create, System.IO.FileAccess.ReadWrite);
Mesnac.Basic.DataToFileHandler.Instance.ToExcel(dts, ref fs);
fs.Close();
}
public void DataTabletoSubPlanExcel(DbMCControl myDGV, string strFileName)
{
System.Data.DataTable dts = myDGV.BaseControl.BindDataSource as System.Data.DataTable;
dts.Columns["Plan_Id"].ColumnName = "计划号";
dts.Columns["Real_Num"].ColumnName = "执行批次";
dts.Columns["Total_Weight"].ColumnName = "总计重量";
dts.Columns["Total_Error"].ColumnName = "总计误差";
System.IO.Stream fs = new System.IO.FileStream(strFileName, System.IO.FileMode.Create, System.IO.FileAccess.ReadWrite);
Mesnac.Basic.DataToFileHandler.Instance.ToExcel(dts, ref fs);
fs.Close();
}
public void DataTabletoWeighExcel(DbMCControl myDGV, string strFileName)
{
System.Data.DataTable dts = myDGV.BaseControl.BindDataSource as System.Data.DataTable;
dts.Columns["Material_Name"].ColumnName = "物料名称";
dts.Columns["Bin_Serial"].ColumnName = "料仓";
dts.Columns["Set_Weight"].ColumnName = "设定重量";
dts.Columns["Real_Weight"].ColumnName = "实际重量";
dts.Columns["Set_Error"].ColumnName = "设定误差";
dts.Columns["Real_Error"].ColumnName = "实际误差";
dts.Columns["Dosing_ID"].ColumnName = "批次";
System.IO.Stream fs = new System.IO.FileStream(strFileName, System.IO.FileMode.Create, System.IO.FileAccess.ReadWrite);
Mesnac.Basic.DataToFileHandler.Instance.ToExcel(dts, ref fs);
fs.Close();

19
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/InitFormAction.cs
Unescape Escape View File

@ -5,6 +5,7 @@ using Mesnac.Controls.Base;
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -32,14 +33,14 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport
var comRecipe = base.GetControlById("comRecipe") as System.Windows.Forms.ComboBox;//配方名称
if (comRecipe != null)
{
List<SimplePmtRecipe> list = XlDbHelper.GetRecipeMaterialListPY();
IFreeSql _freeSql = DBHelper.FreeHelper.Instance;
string sql = "select distinct Batch from xl_plan where Batch is not null";
var list= _freeSql.Select<BatchObj>().WithSql(sql).ToList();
comRecipe.DataSource = list;
comRecipe.DisplayMember = "Recipe_Name";
comRecipe.ValueMember = "ID";
comRecipe.DisplayMember = "Batch";
comRecipe.ValueMember = "Batch";
}
}
#region 事件处理方法
@ -57,4 +58,10 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport
#endregion
}
public class BatchObj
{
public string Batch { get; set; }
}
}

8
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/SelectPlanAction.cs
Unescape Escape View File

@ -41,10 +41,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport
dbHelper.ClearParameter();
StringBuilder sb = new StringBuilder();
// sb.AppendLine(@" select * from (select p.Plan_Id,p.Recipe_ID,p.Recipe_Name,p.Version,p.Plan_StateText,p.Plan_Num,p.Real_Num,p.Start_Date,B.Shift_name as Shift_Name,p.Weight_Man,r.Total_Weight,Plan_TotalWeight,Total_Error,Plan_TotalError,
// case when IsRetransmission=0 then '是' when IsRetransmission=1 then '否' when IsRetransmission is null then '否' end as IsRetransmission,
//(CASE WHEN p.End_Date IS NULL THEN GETDATE() ELSE p.End_Date END) End_Date
// from xl_plan p left join xl_recipe r on p.Recipe_ID=r.ID Left Join Pmt_ShifTime B On(p.Shift_Id = B.Shift_ID)) t WHERE 1=1");
sb.AppendLine(@" select * from (select p.Batch,p.ProductName, p.Plan_Id,p.Recipe_ID,p.Recipe_Name,p.Version,p.Plan_StateText,p.Plan_Num,p.Real_Num,p.Start_Date,p.Weight_Man,r.Total_Weight,Plan_TotalWeight,Total_Error,Plan_TotalError,
case when IsRetransmission=0 then '是' when IsRetransmission=1 then '否' when IsRetransmission is null then '否' end as IsRetransmission,
(CASE WHEN p.End_Date IS NULL THEN GETDATE() ELSE p.End_Date END) End_Date
@ -77,7 +74,7 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport
if (!String.IsNullOrEmpty(this._recipeName))
{
sb.AppendLine(@" And t.Recipe_Name ='" + _recipeName + "' ");
sb.AppendLine(@" And t.Batch ='" + _recipeName + "' ");
}
sb.Append(" ORDER BY t.Start_Date desc");
@ -85,7 +82,6 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport
dbHelper.CommandText = sb.ToString();
dbHelper.CommandType = System.Data.CommandType.Text;
//刷新生产计划DataGridView数据
this._dgvLRPlan = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "xl_plan").FirstOrDefault();
if (_dgvLRPlan == null || !(_dgvLRPlan.BaseControl is DataGridView))

48
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/ProductionReport/SelectPlanTotalAction.cs
Unescape Escape View File

@ -55,32 +55,36 @@ namespace Mesnac.Action.ChemicalWeighing.Report.ProductionReport
runtime.IsReturn = false;
return;
}
string planId = xl_planGridView.SelectedRows[0].Cells["Plan_Id"].Value as string;
string sb = @" select ID,Dosing_Id,Plan_Id, Real_Num,Total_Weight as Total_Weight,Total_Error as Total_Error from LR_plan where Plan_Id=@PlanId";
dbHelper.CommandText = sb.ToString();
dbHelper.CommandType = System.Data.CommandType.Text;
dbHelper.AddParameter("@PlanId", planId);
DataTable table = dbHelper.ToDataTable();
if (table != null && table.Rows.Count > 0)
{
_dgvLRPlan.BaseControl.BindDataSource = null;
_dgvLRPlan.BaseControl.BindDataSource = table;
}
else
try
{
_dgvLRPlan.BaseControl.BindDataSource = null;
var weighGridControl=this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "LR_weigh").FirstOrDefault();
if (weighGridControl == null || !(weighGridControl.BaseControl is DataGridView))
string planId = xl_planGridView.SelectedRows[0].Cells["Plan_Id"].Value as string;
string sb = @" select ID,Dosing_Id,Plan_Id, Real_Num,Total_Weight as Total_Weight,Total_Error as Total_Error from LR_plan where Plan_Id=@PlanId";
dbHelper.CommandText = sb.ToString();
dbHelper.CommandType = System.Data.CommandType.Text;
dbHelper.AddParameter("@PlanId", planId);
DataTable table = dbHelper.ToDataTable();
if (table != null && table.Rows.Count > 0)
{
ICSharpCode.Core.LoggingService<SelectPlanAction>.Warn("{生产报表} 缺少生产计划详细DataGridView控件...");
runtime.IsReturn = false;
return;
_dgvLRPlan.BaseControl.BindDataSource = null;
_dgvLRPlan.BaseControl.BindDataSource = table;
}
weighGridControl.BaseControl.BindDataSource = null;
else
{
_dgvLRPlan.BaseControl.BindDataSource = null;
var weighGridControl = this.GetDbMCControlByKey(Mesnac.Basic.DataSourceFactory.MCDbType.Local, "LR_weigh").FirstOrDefault();
if (weighGridControl == null || !(weighGridControl.BaseControl is DataGridView))
{
ICSharpCode.Core.LoggingService<SelectPlanAction>.Warn("{生产报表} 缺少生产计划详细DataGridView控件...");
runtime.IsReturn = false;
return;
}
weighGridControl.BaseControl.BindDataSource = null;
}
}
catch { }
DataGridView _clientGrid = _dgvLRPlan.BaseControl as DataGridView;
SetBackColor(_clientGrid);

15
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Report/XlDbHelper.cs
Unescape Escape View File

@ -578,5 +578,20 @@ namespace Mesnac.Action.ChemicalWeighing.Report
return false;
}
}
public static bool UpdatePlanDetail()
{
try
{
IFreeSql fsql = FreeHelper.Instance;
return true;
}
catch (Exception ex)
{
ICSharpCode.Core.LoggingService<XlDbHelper>.Error("执行小料存盘事务信息异常：" + ex.Message, ex);
return false;
}
}
}
}

66
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Show/XlInitAction.cs
Unescape Escape View File

@ -4,6 +4,7 @@ using Mesnac.Action.Base;
using Mesnac.Action.ChemicalWeighing.BinManage;
using Mesnac.Action.ChemicalWeighing.Entity;
using Mesnac.Action.ChemicalWeighing.Entity.PptPlan;
using Mesnac.Action.ChemicalWeighing.FinishBatch.SaveHelper;
using Mesnac.Action.ChemicalWeighing.Product.XlPlan;
using Mesnac.Communication;
using Mesnac.Controls.Default;
@ -55,6 +56,10 @@ namespace Mesnac.Action.ChemicalWeighing.Show
}
#region 初始化
//刷新本地计划
//AlarmSaveHelper.OnRefreshAlarm -= Process_Event;
//AlarmSaveHelper.OnRefreshAlarm += Process_Event;
#region 获取界面控件
string source = string.Empty;
@ -102,6 +107,12 @@ namespace Mesnac.Action.ChemicalWeighing.Show
timer.AutoReset = true;
timer.Enabled = true;
timer.Start();
System.Timers.Timer timer2 = new System.Timers.Timer(10000);
timer2.Elapsed += new ElapsedEventHandler(AlarmShow);
timer2.AutoReset = true;
timer2.Enabled = true;
timer2.Start();
}
#region 方法定义
@ -134,7 +145,7 @@ namespace Mesnac.Action.ChemicalWeighing.Show
#endregion
private void ServerStart(object sender, ElapsedEventArgs e)//
private void ServerStart(object sender, ElapsedEventArgs e)
{
try
{
@ -155,32 +166,34 @@ namespace Mesnac.Action.ChemicalWeighing.Show
var labeTaskState = base.GetControlById("MCLabeTaskState") as System.Windows.Forms.Label;//任务状态
List<Xl_DowLoadPlan> materialList = PlanHelper.GetPlanList();//正在执行的任务
if (materialList == null) { return; }
if (materialList == null&& materialList.Count()==0) { return; }
var item = materialList.FirstOrDefault();
if (!string.IsNullOrEmpty(planFlag))
{
if (item != null)
{
labeTaskState.Text = item.Plan_StateText;
if (planFlag == item.Plan_Id) return;
planFlag = item.Plan_Id;
labeTaskState.Text = item.Plan_StateText;
}
else
{
labeTaskState.Text = "状态";
return;
}
}
else
{
planFlag = item.Plan_Id;
}
if (item != null)
{
planFlag=item.Plan_Id;
lblTotalBatch.Text = item.Plan_Num.ToString();
lblPlan.Text = item.Plan_Id;
lblRecipeName.Text = item.Recipe_Name;
lblStandardWeight.Text = item.Total_Weight.ToString("f3");
}
else
{
@ -207,8 +220,10 @@ namespace Mesnac.Action.ChemicalWeighing.Show
var data = PlanHelper.GetExecPlanDataTable();
if (data != null && data.Rows.Count > 0)
{
clientGridControl.BaseControl.BindDataSource = null;
clientGridControl.BaseControl.BindDataSource = data;
SetWeight(materialList);
}
else
{
@ -231,16 +246,11 @@ namespace Mesnac.Action.ChemicalWeighing.Show
#endregion
AlarmShow();
SetWeight(materialList);
///MaterialShow();
}
}
catch (Exception)
{
throw;
}
finally
@ -255,7 +265,7 @@ namespace Mesnac.Action.ChemicalWeighing.Show
/// <summary>
/// 预警展示
/// </summary>
private void AlarmShow()
private void AlarmShow(object sender, ElapsedEventArgs e)
{
//异常报警
lock (String.Empty)
@ -270,6 +280,10 @@ namespace Mesnac.Action.ChemicalWeighing.Show
alarmClientGridControl.BaseControl.BindDataSource = null;
alarmClientGridControl.BaseControl.BindDataSource = alarmData;
}
else
{
alarmClientGridControl.BaseControl.BindDataSource = null;
}
#region 根据计划状态处理背景色
@ -290,8 +304,8 @@ namespace Mesnac.Action.ChemicalWeighing.Show
public void SetWeight(List<Xl_DowLoadPlan> materialList)
{
if (materialList.Count==0)
{
//if (materialList.Count==0)
//{
for (int i = 1; i <= 28; i++)
{
switch (i)
@ -371,9 +385,7 @@ namespace Mesnac.Action.ChemicalWeighing.Show
break;
}
}
}
else
{
foreach (var item in materialList)
{
switch (item.Station)
@ -453,7 +465,7 @@ namespace Mesnac.Action.ChemicalWeighing.Show
break;
}
}
}
}
@ -823,5 +835,21 @@ namespace Mesnac.Action.ChemicalWeighing.Show
}
}
#endregion
#region 事件处理方法
private void Process_Event(object sender, EventArgs e)
{
if (sender is RuntimeParameter)
{
this.Run(sender as RuntimeParameter);
}
else
{
this.Run(this._runtime);
}
}
#endregion
}
}

2
Main/MCEdit/Data/MCProject/SCWSProject2.mprj
Unescape Escape View File

@ -17,7 +17,7 @@
<Node Name="FormAuthority" Text="角色授权" ToolTipText="FormAuthority" Tag="FormAuthority" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="FrmBarrel" Text="料桶管理" ToolTipText="FrmBarrel" Tag="FrmBarrel" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="BinAlarm" Text="料仓报警" ToolTipText="BinAlarm" Tag="BinAlarm" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="PrenatalTest" Text="小料产前检测" ToolTipText="PrenatalTest" Tag="PrenatalTest" ImageIndex="3" SelectedImageIndex="3" />
<Node Name="PrenatalTest" Text="系统防错自检" ToolTipText="PrenatalTest" Tag="PrenatalTest" ImageIndex="3" SelectedImageIndex="3" />
</Node>
<Node Name="nodeDevice" Text="设备" ToolTipText="" Tag="nodeDevice" ImageIndex="2" SelectedImageIndex="2">
<Node Name="CWSS_PLC" Text="CWSS_PLC" ToolTipText="" Tag="CWSS_PLC" ImageIndex="5" SelectedImageIndex="5" />

2
Main/MCEdit/Data/MCProject/nodeDevice.xml
Unescape Escape View File

@ -7,7 +7,7 @@
<ReadHz value="1000" />
<UnitLen value="8" />
<Connection mode="Net">
<IP value="192.168.10.100" />
<IP value="127.0.0.1" />
<Rack value="0" />
<Slot value="0" />
</Connection>

2
Main/MCEdit/Data/MCProject/nodeForm/FrmAlarmRecord.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView1" children="Controls">
<Property name="DisplayAllColumn">False</Property>
<Property name="DgvColumn">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABAAAADQAAAAHAwAAAAABAAAABAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAUEAAAAKE1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnMCAAAACl9maWxlZERhdGEMX2Rpc3BsYXlOYW1lAQECAAAABggAAAAJQWxhcm1fUExDBgkAAAAJ5oql6K2mUExDAQUAAAAEAAAABgoAAAANQWxhcm1fQ25fSW5mbwYLAAAADOaKpeitpuivpuaDhQEGAAAABAAAAAYMAAAAD0FsYXJtX09jY3VyVGltZQYNAAAADOaKpeitpuaXtumXtAEHAAAABAAAAAYOAAAAEEFsYXJtX090aGVyX0luZm8GDwAAAAzmiqXorabkvY3nva4L</Binary>
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABQAAAEAAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAADQMFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYJAAAACUFsYXJtX1BMQwYKAAAACeaKpeitplBMQwEFAAAABAAAAAYLAAAADUFsYXJtX0NuX0luZm8GDAAAAAzmiqXorabor6bmg4UBBgAAAAQAAAAGDQAAABBBbGFybV9PdGhlcl9JbmZvBg4AAAAM5oql6K2m5L2N572uAQcAAAAEAAAABg8AAAAPQWxhcm1fT2NjdXJUaW1lBhAAAAAM5oql6K2m5pe26Ze0AQgAAAAEAAAABhEAAAAPQWxhcm1fQ2xlYXJUaW1lBhIAAAAM57uT5p2f5pe26Ze0Cw==</Binary>
</Property>
<Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>

2
Main/MCEdit/Data/MCProject/nodeForm/FrmBarrel.xml
Unescape Escape View File

@ -3,7 +3,7 @@
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView1" children="Controls">
<Property name="DisplayAllColumn">False</Property>
<Property name="DgvColumn">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAACAAAAI0AAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAABQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGDAAAAAJJRAYNAAAABuW6j+WPtwEFAAAABAAAAAYOAAAACkJhcnJlbE5hbWUGDwAAAAzmlpnmobblkI3np7ABBgAAAAQAAAAGEAAAAAdCYXJDb2RlBhEAAAAa5paZ5qG257yW56CBKOm7mOiupOadoeeggSkBBwAAAAQAAAAGEgAAAApNYXRlcmlhbElEBhMAAAAP54mp5paZ5LqM57u056CBAQgAAAAEAAAABhQAAAAMTWF0ZXJpYWxOYW1lBhUAAAAM57uR5a6a54mp5paZAQkAAAAEAAAABhYAAAAGV2VpZ2h0BhcAAAAM57uR5a6a6YeN6YePAQoAAAAEAAAABhgAAAAISXNFbmFibGUGGQAAAAzmmK/lkKblkK/nlKgBCwAAAAQAAAAGGgAAAAZSZW1hcmsGGwAAAAblpIfms6gL</Binary>
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAABwAAAJUAAAAHAwAAAAABAAAACAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAoFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYLAAAAAklEBgwAAAAG5bqP5Y+3AQUAAAAEAAAABg0AAAAKQmFycmVsTmFtZQYOAAAADOaWmeahtuWQjeensAEGAAAABAAAAAYPAAAAB0JhckNvZGUGEAAAABrmlpnmobbnvJbnoIEo6buY6K6k5p2h56CBKQEHAAAABAAAAAYRAAAADE1hdGVyaWFsTmFtZQYSAAAAEue7keWumumFjeaWueWQjeensAEIAAAABAAAAAYTAAAABldlaWdodAYUAAAADOe7keWumumHjemHjwEJAAAABAAAAAYVAAAACElzRW5hYmxlBhYAAAAM5piv5ZCm5ZCv55SoAQoAAAAEAAAABhcAAAAGUmVtYXJrBhgAAAAG5aSH5rOoCw==</Binary>
</Property>
<Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL</Binary>

32
Main/MCEdit/Data/MCProject/nodeForm/PrenatalTest.xml
Unescape Escape View File

@ -54,7 +54,7 @@
<Property name="OldFillColor">DarkGray</Property>
<Property name="BackColor">GradientInactiveCaption</Property>
<Property name="FlatStyle">Flat</Property>
<Property name="Text">产前检测</Property>
<Property name="Text">系统防错自检</Property>
<Property name="Dock">Top</Property>
<Property name="Font">宋体, 14.25pt, style=Bold</Property>
<Property name="Location">0, 30</Property>
@ -63,6 +63,32 @@
<Property name="TabIndex">36</Property>
</Object>
<Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
<Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton5" children="Controls">
<Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDUyMkZGMEE3MUJERjQyRTNBNzdBNEVFMTg3NDczQUNFBgYAAAAM57uI5q2i6K6h5YiSBgcAAAAM57uI5q2i6K6h5YiSCw==</Binary>
</Property>
<Property name="MCKey" />
<Property name="MCDataSourceID" />
<Property name="IsDbControl">False</Property>
<Property name="InitDataSource" />
<Property name="ActionDataSource" />
<Property name="BindDataSource" />
<Property name="DbOptionType">None</Property>
<Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property>
<Property name="MCPurview">False</Property>
<Property name="Format" />
<Property name="TextName" />
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
<Property name="BackColor">Transparent</Property>
<Property name="Text">终止</Property>
<Property name="Font">宋体, 14.25pt, style=Bold</Property>
<Property name="Location">206, 1</Property>
<Property name="Name">MCButton5</Property>
<Property name="Size">100, 30</Property>
<Property name="TabIndex">39</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton9" children="Controls">
<Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEJEMDc2MEY4RjY1OEREMDMwNTI3OTRDOTcxQTdEMUMwBgYAAAAS5Lqn5YmN5qOA5p+l5Yi35pawBgcAAAAS5Lqn5YmN5qOA5p+l5Yi35pawCw==</Binary>
@ -107,7 +133,7 @@
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
<Property name="BackColor">Transparent</Property>
<Property name="Text">开始检测</Property>
<Property name="Text">开始自检</Property>
<Property name="Font">宋体, 14.25pt, style=Bold</Property>
<Property name="Location">3, 0</Property>
<Property name="Name">MCButton8</Property>
@ -137,7 +163,7 @@
<Property name="BackColor">Control</Property>
<Property name="Size">1300, 740</Property>
<Property name="StartPosition">WindowsDefaultLocation</Property>
<Property name="Text">小料产前检测</Property>
<Property name="Text">系统防错自检</Property>
<Property name="WindowState">Normal</Property>
<Property name="BackgroundImage" />
<Property name="BackgroundImageLayout">Tile</Property>

4
Main/MCEdit/Data/MCProject/nodeForm/小料监控.xml
Unescape Escape View File

@ -960,7 +960,7 @@
<Property name="MCEnabled">True</Property>
<Property name="MCPurview">False</Property>
<Property name="Format" />
<Property name="TextName">CWSS_PLC.DB104.net7/1000</Property>
<Property name="TextName">CWSS_PLC.DB104.net9/1000</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
<Property name="Text">0.000</Property>
@ -3372,7 +3372,7 @@
<Property name="StatusName">CWSS_PLC.DB104.LS1AS01</Property>
<Property name="AlarmName" />
<Property name="Status">ylNormal</Property>
<Property name="Location">1289, 650</Property>
<Property name="Location">1288, 651</Property>
<Property name="Name">SwitchLight43</Property>
<Property name="Size">13, 13</Property>
</Object>

30
Main/MCEdit/Data/MCProject/nodeForm/生产报表-小料.xml
Unescape Escape View File

@ -108,7 +108,7 @@
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView1" children="Controls">
<Property name="DisplayAllColumn">False</Property>
<Property name="DgvColumn">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAADwAAAIMBAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAAkOAAAACQ8AAAAJEAAAAAkRAAAACRIAAAAKBQQAAAAoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAKX2ZpbGVkRGF0YQxfZGlzcGxheU5hbWUBAQIAAAAGEwAAAAVCYXRjaAYUAAAADOaJp+ihjOaJueasoQEFAAAABAAAAAYVAAAAC1Byb2R1Y3ROYW1lBhYAAAAM5Lqn5ZOB5ZCN56ewAQYAAAAEAAAABhcAAAAHcGxhbl9JZAYYAAAACeiuoeWIkuWPtwEHAAAABAAAAAYZAAAAC1JlY2lwZV9OYW1lBhoAAAAM6YWN5pa55ZCN56ewAQgAAAAEAAAABhsAAAAHVmVyc2lvbgYcAAAADOmFjeaWueeJiOacrAEJAAAABAAAAAYdAAAADlBsYW5fU3RhdGVUZXh0Bh4AAAAM6K6h5YiS54q25oCBAQoAAAAEAAAABh8AAAAIUGxhbl9OdW0GIAAAAAzorqHliJLmibnmrKEBCwAAAAQAAAAGIQAAAAhSZWFsX051bQYiAAAADOaJp+ihjOaJueasoQEMAAAABAAAAAYjAAAAClN0YXJ0X0RhdGUGJAAAAAzlvIDlp4vml7bpl7QBDQAAAAQAAAAGJQAAAAxUb3RhbF9XZWlnaHQGJgAAAAzorqHliJLph43ph48BDgAAAAQAAAAGJwAAABBQbGFuX1RvdGFsV2VpZ2h0BigAAAAM5a6e6ZmF6YeN6YePAQ8AAAAEAAAABikAAAALVG90YWxfRXJyb3IGKgAAAAzorqHliJLor6/lt64BEAAAAAQAAAAGKwAAAA9QbGFuX1RvdGFsRXJyb3IGLAAAAAzlrp7pmYXor6/lt64BEQAAAAQAAAAGLQAAAApXZWlnaHRfTWFuBi4AAAAJ5omn6KGM5Lq6ARIAAAAEAAAABi8AAAAIRW5kX0RhdGUGMAAAAAznu5PmnZ/ml7bpl7QL</Binary>
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAADgAAAKEBAAAHAwAAAAABAAAAEAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAACQYAAAAJBwAAAAkIAAAACQkAAAAJCgAAAAkLAAAACQwAAAAJDQAAAAkOAAAACQ8AAAAJEAAAAAkRAAAADQIFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYSAAAABUJhdGNoBhMAAAAM5omn6KGM5om55qyhAQUAAAAEAAAABhQAAAALUHJvZHVjdE5hbWUGFQAAAAzkuqflk4HlkI3np7ABBgAAAAQAAAAGFgAAAAdQbGFuX0lkBhcAAAAJ6K6h5YiS5Y+3AQcAAAAEAAAABhgAAAALUmVjaXBlX05hbWUGGQAAAAzphY3mlrnlkI3np7ABCAAAAAQAAAAGGgAAAA5QbGFuX1N0YXRlVGV4dAYbAAAADOiuoeWIkueKtuaAgQEJAAAABAAAAAYcAAAACFBsYW5fTnVtBh0AAAAM6K6h5YiS5om55qyhAQoAAAAEAAAABh4AAAAIUmVhbF9OdW0GHwAAAAzmiafooYzmibnmrKEBCwAAAAQAAAAGIAAAAApTdGFydF9EYXRlBiEAAAAM5byA5aeL5pe26Ze0AQwAAAAEAAAABiIAAAAMVG90YWxfV2VpZ2h0BiMAAAAM6K6h5YiS6YeN6YePAQ0AAAAEAAAABiQAAAAQUGxhbl9Ub3RhbFdlaWdodAYlAAAADOWunumZhemHjemHjwEOAAAABAAAAAYmAAAAC1RvdGFsX0Vycm9yBicAAAAM6K6h5YiS6K+v5beuAQ8AAAAEAAAABigAAAAPUGxhbl9Ub3RhbEVycm9yBikAAAAM5a6e6ZmF6K+v5beuARAAAAAEAAAABioAAAAKV2VpZ2h0X01hbgYrAAAACeaJp+ihjOS6ugERAAAABAAAAAYsAAAACEVuZF9EYXRlBi0AAAAM57uT5p2f5pe26Ze0Cw==</Binary>
</Property>
<Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAIAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs=</Binary>
@ -173,11 +173,11 @@
<Property name="DbOptionType">None</Property>
<Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property>
<Property name="Text">配方名称</Property>
<Property name="Text">批次</Property>
<Property name="Font">宋体, 12pt</Property>
<Property name="Location">692, 26</Property>
<Property name="Name">MCLabel6</Property>
<Property name="Size">72, 16</Property>
<Property name="Size">40, 16</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCCombobox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="comRecipe" children="Controls">
<Property name="AllowTypeAllSymbols">True</Property>
@ -285,6 +285,30 @@
<Property name="Size">110, 26</Property>
<Property name="TabIndex">11</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton2" children="Controls">
<Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAOAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQwQUE3RkYzNUFEQTQwNEY4Q0RCQTg3ODZEOTExODFEBgYAAAAS5a+85Ye655Sf5Lqn5oql6KGoBgcAAAAS5a+85Ye655Sf5Lqn5oql6KGoCw==</Binary>
</Property>
<Property name="MCKey" />
<Property name="MCDataSourceID" />
<Property name="IsDbControl">False</Property>
<Property name="InitDataSource" />
<Property name="ActionDataSource" />
<Property name="BindDataSource" />
<Property name="DbOptionType">None</Property>
<Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property>
<Property name="MCPurview">True</Property>
<Property name="Format" />
<Property name="TextName" />
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
<Property name="Text">导出报表</Property>
<Property name="Location">1075, 17</Property>
<Property name="Name">MCButton2</Property>
<Property name="Size">125, 34</Property>
<Property name="TabIndex">6</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton3" children="Controls">
<Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAMAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEIyQkQ0Q0ZBOTcwMTQzOUU5QUE2RDM3NTIzQzZDRDhBBgYAAAAS5p+l6K+i55Sf5Lqn6K6h5YiSBgcAAAAS5p+l6K+i55Sf5Lqn6K6h5YiSCw==</Binary>

1
Main/MCEdit/MCEdit.csproj
Unescape Escape View File

@ -375,6 +375,7 @@
<Content Include="Data\MCProject\nodeForm\FrmRecipe.xml" />
<Content Include="Data\MCProject\nodeForm\FrmScadaExtentScreen.xml" />
<Content Include="Data\MCProject\nodeForm\FrmShift.xml" />
<Content Include="Data\MCProject\nodeForm\PrenatalTest.xml" />
<Content Include="Data\MCProject\nodeForm\小料监控.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>

2
Main/MCRun/Data/MCProject/nodeDataSource.xml
Unescape Escape View File

@ -1,3 +1,3 @@
<DataSources>
<DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="192.168.10.50" UserName="sa" Password="sa" DataBase="cwss_xl" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
<DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="Localhost" UserName="sa" Password="sa" DataBase="cwss_xl" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
</DataSources>

24
Main/MCRun/Data/MCProject/nodeForm/生产报表-小料.xml
Unescape Escape View File

@ -285,6 +285,30 @@
<Property name="Size">110, 26</Property>
<Property name="TabIndex">11</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton2" children="Controls">
<Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAOAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEQwQUE3RkYzNUFEQTQwNEY4Q0RCQTg3ODZEOTExODFEBgYAAAAS5a+85Ye655Sf5Lqn5oql6KGoBgcAAAAS5a+85Ye655Sf5Lqn5oql6KGoCw==</Binary>
</Property>
<Property name="MCKey" />
<Property name="MCDataSourceID" />
<Property name="IsDbControl">False</Property>
<Property name="InitDataSource" />
<Property name="ActionDataSource" />
<Property name="BindDataSource" />
<Property name="DbOptionType">None</Property>
<Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property>
<Property name="MCPurview">True</Property>
<Property name="Format" />
<Property name="TextName" />
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
<Property name="Text">查询</Property>
<Property name="Location">1073, 17</Property>
<Property name="Name">MCButton2</Property>
<Property name="Size">125, 34</Property>
<Property name="TabIndex">6</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton3" children="Controls">
<Property name="ClickActionList">
<Binary>AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAMAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEIyQkQ0Q0ZBOTcwMTQzOUU5QUE2RDM3NTIzQzZDRDhBBgYAAAAS5p+l6K+i55Sf5Lqn6K6h5YiSBgcAAAAS5p+l6K+i55Sf5Lqn6K6h5YiSCw==</Binary>

BIN
Main/MCRun/Data/MCProject/生产报表_20240118.xls
View File

Binary file not shown.

2
Main/MCRun/MCRun.csproj
Unescape Escape View File

@ -6,7 +6,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{91C803A6-90D1-4361-8B92-9AFD9E766411}</ProjectGuid>
<OutputType>Exe</OutputType>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MCRun</RootNamespace>
<AssemblyName>MCRun</AssemblyName>

Write Preview
Loading…
Cancel
Save