diff --git a/Action/Compressor/Mesnac.Action.Compressor/AutoChangeType/ChangeType.cs b/Action/Compressor/Mesnac.Action.Compressor/AutoChangeType/ChangeType.cs index 997799d..3849be6 100644 --- a/Action/Compressor/Mesnac.Action.Compressor/AutoChangeType/ChangeType.cs +++ b/Action/Compressor/Mesnac.Action.Compressor/AutoChangeType/ChangeType.cs @@ -14,6 +14,7 @@ namespace Mesnac.Action.Compressor { public class ChangeType : BaseAction, IAction { + private RuntimeParameter _runtime; private IBaseControl _lineName = null; //班次 private IBaseControl _productName = null; //物料名称 string ProductType = "ProductType"; @@ -34,10 +35,10 @@ namespace Mesnac.Action.Compressor public void Run(RuntimeParameter runtime) { - try { base.RunIni(runtime); //必须调用 + this._runtime = runtime; ICSharpCode.Core.LoggingService.Debug("开始更换机型.."); //查询产线名称 //ComboBox comboBox1 = base.GetControlById("MCCombobox1") as ComboBox; @@ -48,86 +49,88 @@ namespace Mesnac.Action.Compressor //string shiftNO = comboBox3.SelectedValue.ToString(); //string linname = comboBox1.SelectedValue.ToString(); string productID = comboBox2.SelectedValue.ToString(); + string productName = comboBox2.Text.ToString(); //切换班次 ICSharpCode.Core.LoggingService.Debug("开始查询产线机型.."); //根据产线查询工位所属PLC - List bdSubstations = SubStationHelper.GetSubstationList("A"); - if (bdSubstations == null || bdSubstations.Count == 0) - { - ICSharpCode.Core.LoggingService.ErrorFormatted("未查询到产线工位信息.."); - MessageBox.Show("未查询到该产线工位信息!", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); - return; - } - else - { - ICSharpCode.Core.LoggingService.Debug("开始查询产线类别.."); + //List bdSubstations = SubStationHelper.GetSubstationList("A"); + //if (bdSubstations == null || bdSubstations.Count == 0) + //{ + // ICSharpCode.Core.LoggingService.ErrorFormatted("未查询到产线工位信息.."); + // MessageBox.Show("未查询到该产线工位信息!", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); + // return; + //} + //else + //{ - //根据机型查询类别 - string ProductType = SubStationHelper.GetProductTypeInfoByProductID(productID); - if (string.IsNullOrEmpty(ProductType)) + + //} + //ICSharpCode.Core.LoggingService.Debug("开始查询产线类别.."); + + //根据机型查询类别 + //string ProductType = SubStationHelper.GetProductTypeInfoByProductID(productID); + //if (string.IsNullOrEmpty(ProductType)) + //{ + // ICSharpCode.Core.LoggingService.ErrorFormatted("未查询到机种编号{0}对应的机型信息..", productID); + // MessageBox.Show("未查询到该机种对应的机型信息!", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); + // return; + //} + //object[] data = new object[1]; + //data[0] = ProductType;//对照与PLC定义的点位信息 + //提示是否开始一键换型 + //for (int i = 0; i < bdSubstations.Count; i++) + //{ + // //ICSharpCode.Core.LoggingService.Debug("开始查找设备类型.." + bdSubstations[i].PLCName); + + // FindPLC(bdSubstations[i].PLCName); + // //if (_equip.Group.Count > 1) + // //{ + // foreach (var item in _equip.Group) + // { + // bool iflag = _equip.Write(int.Parse(item.Value.Block.ToString()), 5, data); + // if (iflag) + // { + // ICSharpCode.Core.LoggingService.DebugFormatted("{0}地址下发成功，{1}工位，{2}型号切换成功!}", item.Value.Block.ToString(), bdSubstations[i].StationName, comboBox2.SelectedText.ToString()); + // } + // else + // { + // ICSharpCode.Core.LoggingService.ErrorFormatted("{0}工位换型失败!", bdSubstations[i].StationName); + // } + // } + // //} + // i = i + 1; + //} + //机种更换信息插库 + TRpProductchangeinfo rpProductchangeinfo = SubStationHelper.GetProductChangeInfoList("A"); + if (rpProductchangeinfo != null && rpProductchangeinfo.ProductId != null) + { + //如果存在则更新 + rpProductchangeinfo.ProductId = int.Parse(productID); + rpProductchangeinfo.LineName = "A"; + rpProductchangeinfo.BeginTime = DateTime.Now; + rpProductchangeinfo.EndTime = DateTime.Now; + if (SubStationHelper.UpdateBaseT_RP_ProductChangeInfo(rpProductchangeinfo)) { - ICSharpCode.Core.LoggingService.ErrorFormatted("未查询到机种编号{0}对应的机型信息..", productID); - MessageBox.Show("未查询到该机种对应的机型信息!", Mesnac.Basic.LanguageHelper.Caption, MessageBoxButtons.OK, MessageBoxIcon.Information); - return; - } - object[] data = new object[1]; - data[0] = ProductType;//对照与PLC定义的点位信息 - //提示是否开始一键换型 - for (int i = 0; i < bdSubstations.Count; i++) - { - //ICSharpCode.Core.LoggingService.Debug("开始查找设备类型.." + bdSubstations[i].PLCName); - - FindPLC(bdSubstations[i].PLCName); - //if (_equip.Group.Count > 1) - //{ - foreach (var item in _equip.Group) - { - bool iflag = _equip.Write(int.Parse(item.Value.Block.ToString()), 5, data); - if (iflag) - { - ICSharpCode.Core.LoggingService.DebugFormatted("{0}地址下发成功，{1}工位，{2}型号切换成功!}", item.Value.Block.ToString(), bdSubstations[i].StationName, comboBox2.SelectedText.ToString()); - } - else - { - ICSharpCode.Core.LoggingService.ErrorFormatted("{0}工位换型失败!", bdSubstations[i].StationName); - } - } - //} - i = i + 1; - } - //机种更换信息插库 - TRpProductchangeinfo rpProductchangeinfo = SubStationHelper.GetProductChangeInfoList("A"); - if (rpProductchangeinfo != null && rpProductchangeinfo.ProductId != null) - { - //如果存在则更新 - rpProductchangeinfo.ProductId = int.Parse(productID); - rpProductchangeinfo.LineName = "A"; - rpProductchangeinfo.BeginTime = DateTime.Now; - rpProductchangeinfo.EndTime = DateTime.Now; - if (SubStationHelper.UpdateBaseT_RP_ProductChangeInfo(rpProductchangeinfo)) - { - ICSharpCode.Core.LoggingService.Debug("一键换型记录更新成功!"); - } - else - { - ICSharpCode.Core.LoggingService.ErrorFormatted("一键换型记录更新失败!"); - } + ICSharpCode.Core.LoggingService.Debug("一键换型记录更新成功!" + productName); } else { - //不存在则插入 - //TRpProductchangeinfo rpProductchangeinfo = new TRpProductchangeinfo(); - rpProductchangeinfo.ProductId = int.Parse(productID); - rpProductchangeinfo.LineName = "A"; - rpProductchangeinfo.InsertTime = DateTime.Now; - rpProductchangeinfo.Operator = "1"; - rpProductchangeinfo.BeginTime = DateTime.Now; - rpProductchangeinfo.EndTime = DateTime.Now; - rpProductchangeinfo.PersonInCharge = "管理员"; - SubStationHelper.InsertProductChangeInfo(rpProductchangeinfo); + ICSharpCode.Core.LoggingService.ErrorFormatted("一键换型记录更新失败!"); } - + } + else + { + //不存在则插入 + //TRpProductchangeinfo rpProductchangeinfo = new TRpProductchangeinfo(); + rpProductchangeinfo.ProductId = int.Parse(productID); + rpProductchangeinfo.LineName = "A"; + rpProductchangeinfo.InsertTime = DateTime.Now; + rpProductchangeinfo.Operator = "1"; + rpProductchangeinfo.BeginTime = DateTime.Now; + rpProductchangeinfo.EndTime = DateTime.Now; + rpProductchangeinfo.PersonInCharge = "管理员"; + SubStationHelper.InsertProductChangeInfo(rpProductchangeinfo); } } catch (Exception ex) diff --git a/Action/Compressor/Mesnac.Action.Compressor/Mesnac.Action.Compressor.csproj b/Action/Compressor/Mesnac.Action.Compressor/Mesnac.Action.Compressor.csproj index ccb9df2..74150ae 100644 --- a/Action/Compressor/Mesnac.Action.Compressor/Mesnac.Action.Compressor.csproj +++ b/Action/Compressor/Mesnac.Action.Compressor/Mesnac.Action.Compressor.csproj @@ -9,8 +9,9 @@ Properties Mesnac.Action.Compressor Mesnac.Action.Compressor - v4.0 + v4.5.2 512 + true @@ -20,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -28,6 +30,7 @@ TRACE prompt 4 + false @@ -101,6 +104,7 @@ + diff --git a/Action/Compressor/Mesnac.Action.Compressor/SubStation/ControlOffLineScan.cs b/Action/Compressor/Mesnac.Action.Compressor/SubStation/ControlOffLineScan.cs index 09cb5d9..7891275 100644 --- a/Action/Compressor/Mesnac.Action.Compressor/SubStation/ControlOffLineScan.cs +++ b/Action/Compressor/Mesnac.Action.Compressor/SubStation/ControlOffLineScan.cs @@ -75,7 +75,7 @@ namespace AUCMA_Air.Business BarScanPort = new SerialPort(); //AGVPort.PortName = BaseSystemInfo.SerialPortName;//设置串口名 默认COM1 BarScanPort.PortName = m_ComPort; - BarScanPort.BaudRate = 9600;//设置串口的波特率 + BarScanPort.BaudRate = 115200;//设置串口的波特率 BarScanPort.StopBits = StopBits.One; BarScanPort.DataBits = 8;//设置数据位 BarScanPort.Parity = Parity.None; diff --git a/Action/Compressor/Mesnac.Action.Compressor/SubStation/LeakageScanBarCode.cs b/Action/Compressor/Mesnac.Action.Compressor/SubStation/LeakageScanBarCode.cs index f13908a..3f824bc 100644 --- a/Action/Compressor/Mesnac.Action.Compressor/SubStation/LeakageScanBarCode.cs +++ b/Action/Compressor/Mesnac.Action.Compressor/SubStation/LeakageScanBarCode.cs @@ -40,7 +40,7 @@ namespace Mesnac.Action.Compressor _isFirstRun = false; } //查询PLC - FindPLC("A20"); + FindPLC("A23"); //WritePLCData(); //初始化串口 InitPort(); @@ -91,88 +91,43 @@ namespace Mesnac.Action.Compressor { try { - //if(code.Length == 20 || code.Length== 10) - //{ - // ProductCode = code; - // IsScanProductCodeFlag = true; - // if (IsScanStationCodeFlag && IsScanProductCodeFlag) - // { - // if (StationCode == 5010) - // { - // base.LogDebug("发送工位1扫码条码:" + ProductCode); - // } - // else if (StationCode == 5510) - // { - // base.LogDebug("发送工位2扫码条码:" + ProductCode); - // } - // //发送条码给PLC - - // WritePLCBarCode(ProductCode, StationCode); - - // IsScanStationCodeFlag = false; - // IsScanProductCodeFlag = false; - // ProductCode = ""; - - // } - - //} - - //判断条码位数 - if (code.Trim() == "LeakTestST1") + ProductCode = code; + IsScanProductCodeFlag = true; + base.LogDebug("扫码条码:" + ProductCode); + #region 20240728修改兼容20位以下条码 + //20240728修改兼容20位以下条码 + if (ProductCode.Length < 20) { - StationCode = 5010; - IsScanStationCodeFlag = true; - base.LogDebug("完成扫描工位1工位码!"); - } - else if (code.Trim() == "LeakTestST2") - { - StationCode = 5510; - IsScanStationCodeFlag = true; - base.LogDebug("完成扫描工位2工位码!"); - + ProductCode = ProductCode.ToString().PadRight(20, ' '); } else { - ProductCode = code; - IsScanProductCodeFlag = true; - base.LogDebug("扫码条码:" + ProductCode); - //if (IsScanStationCodeFlag && IsScanProductCodeFlag) - //{ - // if (StationCode == 5010) - // { - // base.LogDebug("发送工位1扫码条码:" + ProductCode); - // } - // else if (StationCode == 5510) - // { - // base.LogDebug("发送工位2扫码条码:" + ProductCode); - // } - // //发送条码给PLC - - // WritePLCBarCode(ProductCode, StationCode); - - // IsScanStationCodeFlag = false; - // IsScanProductCodeFlag = false; - // ProductCode = ""; - - //} + ProductCode = ProductCode.Substring(0, 20); } + //发送条码给PLC + //20240728修改兼容20位以下条码 + int stationcode = int.Parse(_equip.Group["B1"].Block); + WriteString(ProductCode, stationcode); - if (IsScanStationCodeFlag && IsScanProductCodeFlag) - { - if (StationCode == 5010) - { - base.LogDebug("发送工位1扫码条码:" + ProductCode); - } - else - { - base.LogDebug("发送工位2扫码条码:" + ProductCode); - } - //发送条码给PLC - WritePLCBarCode(ProductCode, StationCode); - IsScanStationCodeFlag = false; - IsScanProductCodeFlag = false; - ProductCode = ""; - } + + #endregion + + //if (IsScanStationCodeFlag && IsScanProductCodeFlag) + //{ + // if (StationCode == 5010) + // { + // base.LogDebug("发送工位1扫码条码:" + ProductCode); + // } + // else + // { + // base.LogDebug("发送工位2扫码条码:" + ProductCode); + // } + + + // IsScanStationCodeFlag = false; + // IsScanProductCodeFlag = false; + // ProductCode = ""; + //} } catch (Exception ex) { @@ -188,33 +143,26 @@ namespace Mesnac.Action.Compressor /// /// /// - public bool WritePLCBarCode(string code,int StationCode) + public bool WriteString(string code, int StationCode) { - //主线条码第10位 - - byte[] buffer = new byte[code.Length]; - string strCode = ""; - buffer = System.Text.ASCIIEncoding.Default.GetBytes(code); - for (int i = 0; i < buffer.Length; i++) + try { - string Trim = ","; - if (i == buffer.Length - 2) + byte[] tempByte = System.Text.Encoding.ASCII.GetBytes(code); + object[] temp = new object[tempByte.Length / 2]; + for (int i = 0; i < temp.Length; i++) { - Trim = ""; + temp[i] = BitConverter.ToInt16(tempByte, 2 * i); } - strCode += buffer[i+1].ToString("X") + buffer[i].ToString("X") + Trim; - i = i + 1; - } - string[] message = strCode.Trim().Split(','); - object[] bytes = new object[message.Length]; + bool result1 = _equip.Write(StationCode, 10, temp); + ICSharpCode.Core.LoggingService.Debug(StationCode + " 偏移量 " + 10 + "写入结果：" + result1); - for (int i = 0; i < message.Length; i++) - { - bytes[i] = Convert.ToInt32(message[i],16); + return true; + } + catch (Exception ex) + { + ICSharpCode.Core.LoggingService.Error(string.Format(ex.ToString())); + return false; } - bool result1 = _equip.Write(StationCode, 10, bytes); - ICSharpCode.Core.LoggingService.Debug(StationCode + " 偏移量 " + 10 + "写入结果：" + result1); - return true; } } } diff --git a/Action/Compressor/Mesnac.Action.Compressor/SubStation/MaterialBinding.cs b/Action/Compressor/Mesnac.Action.Compressor/SubStation/MaterialBinding.cs new file mode 100644 index 0000000..203f5b8 --- /dev/null +++ b/Action/Compressor/Mesnac.Action.Compressor/SubStation/MaterialBinding.cs @@ -0,0 +1,164 @@ + +using AUCMA_Air.Business; +using Mesnac.Action.Base; +using Mesnac.Compressor.Entity; +using Mesnac.Compressor.Station; +using Mesnac.Equips; +using Mesnac.Equips.BaseInfo; +using Mesnac.Gui.Workbench; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Mesnac.Action.Compressor +{ + public class MaterialBinding : BaseAction, IAction + { + private RuntimeParameter _runtime; + ControlOffLineScan ControlOffLineScan = new ControlOffLineScan(); + BaseEquip _equip; + private static bool _isFirstRun = true; + int StationCode = 5010; + + string ProductCode = ""; + public void Run(RuntimeParameter runtime) + { + + base.RunIni(runtime); //必须调用 + this._runtime = runtime; + if (_isFirstRun == true) + { + //开启串口 + //textBox.Text = "***"; + WorkbenchSingleton.Workbench.ShutDown += new EventHandler(Workbench_ShutDown); + _isFirstRun = false; + } + //查询PLC + FindPLC("A23"); + //初始化串口 + InitPort(); + ControlOffLineScan.RecAutoDataAction += Receive; + } + + private void Workbench_ShutDown(object sender, EventArgs e) + { + ControlOffLineScan.Dispose(); + } + public void FindPLC(string plcname) + { + try + { + foreach (BaseEquip equip in Factory.Instance.AllEquips.Values) + { + if (equip.Name == plcname) + { + ICSharpCode.Core.LoggingService.Debug("找到设备类型:" + equip.Name); + + _equip = equip; + break; + } + } + } + catch (Exception ex) + { + ICSharpCode.Core.LoggingService.Error(string.Format(ex.ToString())); + + } + + } + public void InitPort() + { + try + { + ControlOffLineScan.SystemInitialization(); + Task task = new Task(() => + { + // 打开串口 + if (ControlOffLineScan.Open()) + ICSharpCode.Core.LoggingService.Debug("条码枪连接成功！"); + + }); + task.Start(); + + + } + catch (Exception ex) + { + ICSharpCode.Core.LoggingService.Error(string.Format(ex.ToString())); + } + + } + private void InitForm() + { + try + { + var lblReqSerialName = base.GetControlById("MCLabel217") as System.Windows.Forms.Label;//计划数 + } + catch (Exception ex) + { + ICSharpCode.Core.LoggingService.Error(string.Format(ex.ToString())); + } + } + + public void Receive(string code) + { + try + { + ProductCode = code; + base.LogDebug("扫码条码:" + ProductCode); + #region 20240728修改兼容20位以下条码 + //20240728修改兼容20位以下条码 + if (ProductCode.Length < 20) + { + ProductCode = ProductCode.ToString().PadRight(20, ' '); + } + else + { + ProductCode = ProductCode.Substring(0, 20); + } + //发送条码给PLC + //20240728修改兼容20位以下条码 + int stationcode = int.Parse(_equip.Group["B1"].Block); + WriteString(ProductCode, stationcode); + + + #endregion + } + catch (Exception ex) + { + ProductCode = ""; + base.LogError(ex.ToString()); + } + //发送PLC条码 + } + /// + /// 条码写入PLC + /// + /// + /// + public bool WriteString(string code, int StationCode) + { + try + { + byte[] tempByte = System.Text.Encoding.ASCII.GetBytes(code); + object[] temp = new object[tempByte.Length / 2]; + for (int i = 0; i < temp.Length; i++) + { + temp[i] = BitConverter.ToInt16(tempByte, 2 * i); + } + bool result1 = _equip.Write(StationCode, 10, temp); + ICSharpCode.Core.LoggingService.Debug(StationCode + " 偏移量 " + 10 + "写入结果：" + result1); + + return true; + } + catch (Exception ex) + { + ICSharpCode.Core.LoggingService.Error(string.Format(ex.ToString())); + return false; + } + } + } +} diff --git a/Action/Compressor/Mesnac.Action.Compressor/Sys/TimerRunService.cs b/Action/Compressor/Mesnac.Action.Compressor/Sys/TimerRunService.cs index 6313ef1..66f72c7 100644 --- a/Action/Compressor/Mesnac.Action.Compressor/Sys/TimerRunService.cs +++ b/Action/Compressor/Mesnac.Action.Compressor/Sys/TimerRunService.cs @@ -92,8 +92,8 @@ namespace Mesnac.Action.Compressor.Sys lock (String.Empty) { //定时读取OEE任务 - ReadDeviceOeeData(); - ReadDevcieState(); + //ReadDeviceOeeData(); + //ReadDevcieState(); } } diff --git a/Action/Mesnac.Action.Base/Mesnac.Action.Base.csproj b/Action/Mesnac.Action.Base/Mesnac.Action.Base.csproj index b321748..28c8cf9 100644 --- a/Action/Mesnac.Action.Base/Mesnac.Action.Base.csproj +++ b/Action/Mesnac.Action.Base/Mesnac.Action.Base.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Mesnac.Action.Base Mesnac.Action.Base - v4.0 + v4.5.2 512 @@ -29,6 +29,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +38,7 @@ TRACE prompt 4 + false diff --git a/Action/Mesnac.Action.Default/Mesnac.Action.Default.csproj b/Action/Mesnac.Action.Default/Mesnac.Action.Default.csproj index 9a1dd9c..de2c222 100644 --- a/Action/Mesnac.Action.Default/Mesnac.Action.Default.csproj +++ b/Action/Mesnac.Action.Default/Mesnac.Action.Default.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Mesnac.Action.Default Mesnac.Action.Default - v4.0 + v4.5.2 512 @@ -29,6 +29,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +38,7 @@ TRACE prompt 4 + false diff --git a/Action/Mesnac.ActionService/Mesnac.ActionService.csproj b/Action/Mesnac.ActionService/Mesnac.ActionService.csproj index 20cdd67..5df7e85 100644 --- a/Action/Mesnac.ActionService/Mesnac.ActionService.csproj +++ b/Action/Mesnac.ActionService/Mesnac.ActionService.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Mesnac.ActionService Mesnac.ActionService - v4.0 + v4.5.2 512 @@ -19,6 +19,7 @@ + true @@ -28,6 +29,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -36,6 +38,7 @@ TRACE prompt 4 + false diff --git a/BusinessTest/DbHandler.cs b/BusinessTest/DbHandler.cs index fb31e9b..b3b97ca 100644 --- a/BusinessTest/DbHandler.cs +++ b/BusinessTest/DbHandler.cs @@ -17,7 +17,37 @@ namespace Mesnac.Compressor.Data initDB(); } - + public string GetABarCode(string barcode) + { + string iflag = ""; + try + { + StringBuilder sb = new StringBuilder(); + if (barcode != "") + { + sb.Append(" SELECT TOP(1) SemiBarcode FROM T_RP_BarcodeRelationShip WHERE ProductBarcode='").Append(barcode).Append("' order by InsertTime desc"); + } + DbHandler db = new DbHandler(); + db.dbHelper.ClearParameter(); + db.dbHelper.CommandType = CommandType.Text; + db.dbHelper.CommandText = ""; + //ICSharpCode.Core.LoggingService.InfoFormatted("查询上工位信息:{0},{1}：", sb.ToString(), barcode); + db.dbHelper.CommandText = sb.ToString(); + var obj = db.dbHelper.ToScalar(); + if (obj != null) + { + return obj.ToString(); + } + else + { + return ""; + } + } + catch (Exception ex) + { + return iflag; + } + } public void initDB() { DbSession dbsession = new DbSession(SqlClientFactory.Instance, constr); diff --git a/BusinessTest/Form1.cs b/BusinessTest/Form1.cs index a0d2634..7d48cf1 100644 --- a/BusinessTest/Form1.cs +++ b/BusinessTest/Form1.cs @@ -18,11 +18,42 @@ namespace BusinessTest { InitializeComponent(); } - + public string GetABarCode(string barcode) + { + string iflag = ""; + try + { + StringBuilder sb = new StringBuilder(); + if (barcode != "") + { + sb.Append(" SELECT TOP(1) SemiBarcode FROM T_RP_BarcodeRelationShip WHERE ProductBarcode='").Append(barcode).Append("' order by InsertTime desc"); + } + DbHandler db = new DbHandler(); + db.dbHelper.ClearParameter(); + db.dbHelper.CommandType = CommandType.Text; + db.dbHelper.CommandText = ""; + //ICSharpCode.Core.LoggingService.InfoFormatted("查询上工位信息:{0},{1}：", sb.ToString(), barcode); + db.dbHelper.CommandText = sb.ToString(); + var obj = db.dbHelper.ToScalar(); + if (obj != null) + { + return obj.ToString(); + } + else + { + return ""; + } + } + catch (Exception ex) + { + return iflag; + } + } private void button1_Click(object sender, EventArgs e) { DbHandler db = new DbHandler(); + string aaaa = GetABarCode("E26A00MBB24080609109"); //string LastWorkInfo = LastWorkProductionInfo("E26A00MBB24041215513", "T_RP_StationPara_B140", "ScanBarcode"); //TEST(); @@ -73,7 +104,7 @@ namespace BusinessTest } - string ss = getSemiBarcodeAByDongPanCode("E26A00MBB2"); + //string ss = getSemiBarcodeAByDongPanCode("E26A00MBB2"); string ISDis = db.getChongTouStateByBarCode("2403150139"); @@ -207,37 +238,6 @@ namespace BusinessTest return tmp; } - public string getSemiBarcodeAByDongPanCode(string productbarcode) - { - StringBuilder sb = new StringBuilder(); - try - { - if (productbarcode != "") - { - sb.Append(" SELECT TOP(1) SemiBarcode FROM T_RP_BarcodeRelationShip WHERE ProductBarcode='").Append(productbarcode).Append("' order by InsertTime desc"); - } - - DbHandler db = new DbHandler(); - db.dbHelper.ClearParameter(); - db.dbHelper.CommandType = CommandType.Text; - db.dbHelper.CommandText = ""; - - db.dbHelper.CommandText = sb.ToString(); - var obj = db.dbHelper.ToScalar(); - if (obj != null) - { - return obj.ToString(); - } - else - { - return ""; - } - } - catch (Exception e) - { - return ""; - } - } } diff --git a/Comprosser/Data/Mesnac.Compressor.Data.csproj b/Comprosser/Data/Mesnac.Compressor.Data.csproj index 14a5e40..7cd871f 100644 --- a/Comprosser/Data/Mesnac.Compressor.Data.csproj +++ b/Comprosser/Data/Mesnac.Compressor.Data.csproj @@ -9,8 +9,9 @@ Properties Mesnac.Compressor.Data Mesnac.Compressor.Data - v4.0 + v4.5.2 512 + true @@ -20,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -28,6 +30,7 @@ TRACE prompt 4 + false diff --git a/Comprosser/DisassemblyTable/App.config b/Comprosser/DisassemblyTable/App.config index a6163de..6656ac4 100644 --- a/Comprosser/DisassemblyTable/App.config +++ b/Comprosser/DisassemblyTable/App.config @@ -1,4 +1,4 @@ - +
@@ -6,11 +6,11 @@ - - - - - + + + + + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/Comprosser/DisassemblyTable/DbHandler.cs b/Comprosser/DisassemblyTable/DbHandler.cs index d9e435d..819997b 100644 --- a/Comprosser/DisassemblyTable/DbHandler.cs +++ b/Comprosser/DisassemblyTable/DbHandler.cs @@ -7,6 +7,7 @@ using System.Data; using System.Data.SqlClient; using Mesnac.Compressor.Entity; using Mesnac.Log; +using System.Web.Security; namespace Mesnac.Compressor.Data { @@ -48,7 +49,7 @@ namespace Mesnac.Compressor.Data return dt; } - public DataTable GetReStartStationList() + public DataTable GetReStartStationList(string station) { if (dbHelper == null) { @@ -58,13 +59,56 @@ namespace Mesnac.Compressor.Data dbHelper.CommandType = CommandType.Text; dbHelper.CommandText = ""; StringBuilder sb = new StringBuilder(); - sb.Append("SELECT StationID,StationCode,StationName FROM dbo.T_BD_SubStation where StationID in ('4','10','18','24','27' ) ORDER BY StationID"); - //sb.Append("SELECT StationID,StationCode,StationName FROM dbo.T_BD_SubStation where LineID < 5 ORDER BY StationID"); + sb.Append("SELECT StationID,StationCode,StationName,TableName FROM dbo.T_BD_SubStation where 1= 1"); + sb.Append("and StationID<="); + sb.Append(station); + sb.Append(" ORDER BY StationID"); dbHelper.CommandText = sb.ToString(); Console.WriteLine(sb.ToString()); DataTable dt = dbHelper.ToDataTable(); return dt; } + public DataTable GetDeleteReStartStationList(string station) + { + if (dbHelper == null) + { + return null; + } + dbHelper.ClearParameter(); + dbHelper.CommandType = CommandType.Text; + dbHelper.CommandText = ""; + StringBuilder sb = new StringBuilder(); + sb.Append("SELECT StationID,StationCode,StationName,TableName FROM dbo.T_BD_SubStation where 1=1"); + sb.Append("and StationID>="); + sb.Append(station); + sb.Append(" ORDER BY StationID"); + dbHelper.CommandText = sb.ToString(); + Console.WriteLine(sb.ToString()); + DataTable dt = dbHelper.ToDataTable(); + return dt; + } + + public void DeleteStationData(string tablename,string ProductBarCode) + { + try + { + if (dbHelper == null) + { + return; + } + dbHelper.ClearParameter(); + dbHelper.CommandType = CommandType.Text; + dbHelper.CommandText = "DELETE FROM "+ tablename + " WHERE ScanBarcode=@ProductBarCode "; + dbHelper.AddParameter("@ProductBarCode", ProductBarCode); + + dbHelper.ExecuteNonQuery(); + } + catch (Exception ex) + { + + } + } + public bool IsHaveTraceState(string ProductBarCode) { bool iflag = false; @@ -125,15 +169,47 @@ namespace Mesnac.Compressor.Data // ICSharpCode.Core.LoggingService.Info(string.Format(ex.ToString())); } } + public bool DeletePrintInfo(string ProductBarcode) + { + StringBuilder sb = new StringBuilder(); + try + { + sb.Append(" delete from base_Barcode_PrintInfo").Append(" WHERE ProductBarcode = '").Append(ProductBarcode).Append("' "); + + DbHandler db = new DbHandler(); + db.dbHelper.ClearParameter(); + db.dbHelper.CommandType = CommandType.Text; + db.dbHelper.CommandText = sb.ToString(); + db.dbHelper.ExecuteNonQuery(); + return true; + } + catch (Exception ex) + { + LogService.Instance.Error("异常：" + ex.Message); + return false; + + } + } + public bool UpdateTraceReStartStation(string ISDis,string RestartStation,string ProductBarcode) { StringBuilder sb = new StringBuilder(); try { - sb.Append(" UPDATE dbo.T_SY_TraceState SET ISDis='").Append(ISDis); - - sb.Append("' , RestartStation='").Append(RestartStation).Append("' WHERE ProductBarcode='").Append(ProductBarcode).Append("' "); + //整机拆解，清空组件码 + sb.Append(" UPDATE dbo.T_SY_TraceState SET ISDis='").Append(ISDis).Append("',CurrentStationID ='").Append(RestartStation); + sb.Append("' , RestartStation='").Append(RestartStation); + if (RestartStation == "11") + { + sb.Append("' ,SemiBarcode_A = '' ,SemiBarcode_B = '',SemiBarcode_C = '',SemiBarcode2 = '"); + } + //控制器拆解，清控制器码 + else + { + sb.Append("' ,SemiBarcode2 = '"); + } + sb.Append("' WHERE ProductBarcode='").Append(ProductBarcode).Append("' "); DbHandler db = new DbHandler(); db.dbHelper.ClearParameter(); db.dbHelper.CommandType = CommandType.Text; diff --git a/Comprosser/DisassemblyTable/Disassembly.Designer.cs b/Comprosser/DisassemblyTable/Disassembly.Designer.cs index 64acf07..0deb8ba 100644 --- a/Comprosser/DisassemblyTable/Disassembly.Designer.cs +++ b/Comprosser/DisassemblyTable/Disassembly.Designer.cs @@ -28,26 +28,35 @@ /// private void InitializeComponent() { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Disassembly)); this.label1 = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.panel4 = new System.Windows.Forms.Panel(); - this.radioButton5 = new System.Windows.Forms.RadioButton(); - this.radioButton4 = new System.Windows.Forms.RadioButton(); - this.radioButton3 = new System.Windows.Forms.RadioButton(); - this.radioButton2 = new System.Windows.Forms.RadioButton(); - this.radioButton1 = new System.Windows.Forms.RadioButton(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.button1 = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); + this.tb_ngstation = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.radioButton2 = new System.Windows.Forms.RadioButton(); + this.radioButton1 = new System.Windows.Forms.RadioButton(); + this.label2 = new System.Windows.Forms.Label(); + this.cbReStartStation = new System.Windows.Forms.ComboBox(); this.button2 = new System.Windows.Forms.Button(); this.groupBox1.SuspendLayout(); this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); + this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // label1 @@ -79,76 +88,76 @@ this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(1114, 462); + this.groupBox1.Size = new System.Drawing.Size(1747, 768); this.groupBox1.TabIndex = 10; this.groupBox1.TabStop = false; this.groupBox1.Text = "不合格工位分析"; // // panel4 // - this.panel4.Controls.Add(this.radioButton5); - this.panel4.Controls.Add(this.radioButton4); - this.panel4.Controls.Add(this.radioButton3); - this.panel4.Controls.Add(this.radioButton2); - this.panel4.Controls.Add(this.radioButton1); + this.panel4.Controls.Add(this.dataGridView1); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Location = new System.Drawing.Point(4, 40); this.panel4.Margin = new System.Windows.Forms.Padding(4); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(1106, 418); + this.panel4.Size = new System.Drawing.Size(1739, 724); this.panel4.TabIndex = 14; // - // radioButton5 + // dataGridView1 // - this.radioButton5.AutoSize = true; - this.radioButton5.Location = new System.Drawing.Point(897, 33); - this.radioButton5.Name = "radioButton5"; - this.radioButton5.Size = new System.Drawing.Size(106, 37); - this.radioButton5.TabIndex = 4; - this.radioButton5.Text = "其他"; - this.radioButton5.UseVisualStyleBackColor = true; - // - // radioButton4 - // - this.radioButton4.AutoSize = true; - this.radioButton4.Location = new System.Drawing.Point(719, 33); - this.radioButton4.Name = "radioButton4"; - this.radioButton4.Size = new System.Drawing.Size(172, 37); - this.radioButton4.TabIndex = 3; - this.radioButton4.Text = "拆解报废"; - this.radioButton4.UseVisualStyleBackColor = true; - // - // radioButton3 - // - this.radioButton3.AutoSize = true; - this.radioButton3.Location = new System.Drawing.Point(489, 33); - this.radioButton3.Name = "radioButton3"; - this.radioButton3.Size = new System.Drawing.Size(206, 37); - this.radioButton3.TabIndex = 2; - this.radioButton3.Text = "壳体加热NG"; - this.radioButton3.UseVisualStyleBackColor = true; - // - // radioButton2 - // - this.radioButton2.AutoSize = true; - this.radioButton2.Location = new System.Drawing.Point(251, 33); - this.radioButton2.Name = "radioButton2"; - this.radioButton2.Size = new System.Drawing.Size(206, 37); - this.radioButton2.TabIndex = 1; - this.radioButton2.Text = "前盖组件NG"; - this.radioButton2.UseVisualStyleBackColor = true; - // - // radioButton1 - // - this.radioButton1.AutoSize = true; - this.radioButton1.Checked = true; - this.radioButton1.Location = new System.Drawing.Point(57, 33); - this.radioButton1.Name = "radioButton1"; - this.radioButton1.Size = new System.Drawing.Size(173, 37); - this.radioButton1.TabIndex = 0; - this.radioButton1.TabStop = true; - this.radioButton1.Text = "动静盘NG"; - this.radioButton1.UseVisualStyleBackColor = true; + this.dataGridView1.AllowUserToAddRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); + this.dataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dataGridView1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); + this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dataGridView1.ColumnHeadersHeight = 50; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Top; + this.dataGridView1.EnableHeadersVisualStyles = false; + this.dataGridView1.Location = new System.Drawing.Point(0, 0); + this.dataGridView1.Margin = new System.Windows.Forms.Padding(4); + this.dataGridView1.MultiSelect = false; + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.ReadOnly = true; + this.dataGridView1.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Aqua; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Aqua; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView1.RowHeadersVisible = false; + this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); + this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle4; + this.dataGridView1.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridView1.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dataGridView1.RowTemplate.Height = 61; + this.dataGridView1.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridView1.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal; + this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dataGridView1.Size = new System.Drawing.Size(1739, 194); + this.dataGridView1.TabIndex = 430; // // button1 // @@ -165,6 +174,8 @@ // // panel1 // + this.panel1.Controls.Add(this.tb_ngstation); + this.panel1.Controls.Add(this.label3); this.panel1.Controls.Add(this.button1); this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.textBox1); @@ -172,9 +183,30 @@ this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Margin = new System.Windows.Forms.Padding(4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1114, 159); + this.panel1.Size = new System.Drawing.Size(1747, 159); this.panel1.TabIndex = 11; // + // tb_ngstation + // + this.tb_ngstation.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.tb_ngstation.Location = new System.Drawing.Point(232, 81); + this.tb_ngstation.Margin = new System.Windows.Forms.Padding(4); + this.tb_ngstation.Multiline = true; + this.tb_ngstation.Name = "tb_ngstation"; + this.tb_ngstation.Size = new System.Drawing.Size(622, 42); + this.tb_ngstation.TabIndex = 13; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(56, 93); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(163, 29); + this.label3.TabIndex = 12; + this.label3.Text = "不合格工位"; + // // panel2 // this.panel2.Controls.Add(this.groupBox1); @@ -182,29 +214,89 @@ this.panel2.Location = new System.Drawing.Point(0, 159); this.panel2.Margin = new System.Windows.Forms.Padding(4); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1114, 462); + this.panel2.Size = new System.Drawing.Size(1747, 768); this.panel2.TabIndex = 12; // // panel3 // - this.panel3.Controls.Add(this.button2); + this.panel3.Controls.Add(this.groupBox2); this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(0, 402); + this.panel3.Location = new System.Drawing.Point(0, 609); this.panel3.Margin = new System.Windows.Forms.Padding(4); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1114, 219); + this.panel3.Size = new System.Drawing.Size(1747, 318); this.panel3.TabIndex = 13; // + // groupBox2 + // + this.groupBox2.Controls.Add(this.radioButton2); + this.groupBox2.Controls.Add(this.radioButton1); + this.groupBox2.Controls.Add(this.label2); + this.groupBox2.Controls.Add(this.cbReStartStation); + this.groupBox2.Controls.Add(this.button2); + this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBox2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold); + this.groupBox2.Location = new System.Drawing.Point(0, 0); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(1747, 318); + this.groupBox2.TabIndex = 13; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "返修"; + // + // radioButton2 + // + this.radioButton2.AutoSize = true; + this.radioButton2.Font = new System.Drawing.Font("宋体", 26F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radioButton2.Location = new System.Drawing.Point(407, 151); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(312, 56); + this.radioButton2.TabIndex = 18; + this.radioButton2.Text = "控制器拆解"; + this.radioButton2.UseVisualStyleBackColor = true; + // + // radioButton1 + // + this.radioButton1.AutoSize = true; + this.radioButton1.Font = new System.Drawing.Font("宋体", 26F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.radioButton1.Location = new System.Drawing.Point(62, 151); + this.radioButton1.Name = "radioButton1"; + this.radioButton1.Size = new System.Drawing.Size(259, 56); + this.radioButton1.TabIndex = 17; + this.radioButton1.Text = "整机拆解"; + this.radioButton1.UseVisualStyleBackColor = true; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(916, 49); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(133, 29); + this.label2.TabIndex = 14; + this.label2.Text = "返修工位"; + this.label2.Visible = false; + // + // cbReStartStation + // + this.cbReStartStation.FormattingEnabled = true; + this.cbReStartStation.Location = new System.Drawing.Point(1068, 43); + this.cbReStartStation.Margin = new System.Windows.Forms.Padding(4); + this.cbReStartStation.Name = "cbReStartStation"; + this.cbReStartStation.Size = new System.Drawing.Size(626, 41); + this.cbReStartStation.TabIndex = 13; + this.cbReStartStation.Visible = false; + // // button2 // - this.button2.Location = new System.Drawing.Point(921, 107); + this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold); + this.button2.Location = new System.Drawing.Point(847, 156); this.button2.Margin = new System.Windows.Forms.Padding(4); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(147, 51); this.button2.TabIndex = 12; this.button2.Text = "确认"; this.button2.UseVisualStyleBackColor = true; - this.button2.Visible = false; this.button2.Click += new System.EventHandler(this.button2_Click); // // Disassembly @@ -212,7 +304,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.ClientSize = new System.Drawing.Size(1114, 621); + this.ClientSize = new System.Drawing.Size(1747, 927); this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); @@ -221,15 +313,18 @@ this.Name = "Disassembly"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "拆解台"; + this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Disassembly_FormClosing); this.Load += new System.EventHandler(this.Disassembly_Load); this.groupBox1.ResumeLayout(false); this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.panel2.ResumeLayout(false); this.panel3.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); this.ResumeLayout(false); } @@ -243,12 +338,15 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.Panel panel4; private System.Windows.Forms.Panel panel3; - private System.Windows.Forms.RadioButton radioButton4; - private System.Windows.Forms.RadioButton radioButton3; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.TextBox tb_ngstation; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.ComboBox cbReStartStation; private System.Windows.Forms.RadioButton radioButton2; private System.Windows.Forms.RadioButton radioButton1; - private System.Windows.Forms.RadioButton radioButton5; - private System.Windows.Forms.Button button2; } } diff --git a/Comprosser/DisassemblyTable/Disassembly.cs b/Comprosser/DisassemblyTable/Disassembly.cs index 3cc9556..72f2be6 100644 --- a/Comprosser/DisassemblyTable/Disassembly.cs +++ b/Comprosser/DisassemblyTable/Disassembly.cs @@ -24,15 +24,15 @@ namespace DisassemblyTable string connType= System.Configuration.ConfigurationManager.AppSettings["Type"]; public delegate void Transit(string data); public string NGStationID = ""; - private ScanerHook_V2 listener; + //private ScanerHook_V2 listener; public Disassembly() { InitializeComponent(); InitPort(); //initCombox(); //USB扫码枪 - initUsbScanBarCode(); - listener.Start(); + //initUsbScanBarCode(); + //listener.Start(); InitializeInputLanguage("en-US"); } @@ -40,8 +40,8 @@ namespace DisassemblyTable { try { - listener = new ScanerHook_V2(); - listener.ScanerEvent += Listener_ScanerEvent; + //listener = new ScanerHook_V2(); + //listener.ScanerEvent += Listener_ScanerEvent; } catch (Exception ex) @@ -123,12 +123,9 @@ namespace DisassemblyTable { Receive(barcode); } - - - public void Receive(string Data) { - if (this.InvokeRequired) + if (this.InvokeRequired) { this.Invoke(new Transit(Receive), Data); return; @@ -141,126 +138,83 @@ namespace DisassemblyTable { return; } + textBox1.Text = Data.Trim(); //判断条码内容为什么组件（动静盘，前盖，壳体） if (Data.Trim().Contains("M")) { + DbHandler db = new DbHandler(); + DataSet ds = db.Select(Data.Trim()); + DataTable dt1 = ds.Tables[0]; + if (dt1 != null && dt1.Rows.Count > 0) + { + DataRow dr = dt1.Rows[0]; + string NGstation = dr["StationName"].ToString(); + this.tb_ngstation.Text = NGstation; + NGStationID = dr["OrderID"].ToString(); + //BindReStartStationInfo(); + } + else + { + //MessageBox.Show("未查询到当前条码生产NG信息"); + this.tb_ngstation.Text = "未查询到当前条码生产NG信息"; + //DataTable dt = GetNewDatatable(); + //dataGridView1.DataSource = dt; + NGStationID = ""; + //BindReStartStationInfo(); + return; + } + if (ds.Tables.Count > 1) + { + dataGridView1.DataSource = ds.Tables[1]; + } //解绑 //通过条码查询是什么组件 - DbHandler dbHandler = new DbHandler(); - string remark = ""; - if (radioButton1.Checked) - { - remark = radioButton1.Text; - } - else if (radioButton2.Checked) - { - remark = radioButton2.Text; - } - else if (radioButton3.Checked) - { - remark = radioButton3.Text; - } - else if (radioButton4.Checked) - { - remark = radioButton4.Text; - } - else if (radioButton5.Checked) - { - remark = radioButton5.Text; - } - dbHandler.InsertRepairInfo(Data, Data, "2", remark); - LogService.Instance.Error("》》》重投成功，产品码：" + textBox1.Text.Trim() + ",重投工位：2"); + //DbHandler dbHandler = new DbHandler(); + //string remark = ""; + //if (radioButton1.Checked) + //{ + // remark = radioButton1.Text; + //} + //else if (radioButton2.Checked) + //{ + // remark = radioButton2.Text; + //} + //else if (radioButton3.Checked) + //{ + // remark = radioButton3.Text; + //} + //else if (radioButton4.Checked) + //{ + // remark = radioButton4.Text; + //} + //else if (radioButton5.Checked) + //{ + // remark = radioButton5.Text; + //} + //dbHandler.InsertRepairInfo("", Data, "2", remark); + //LogService.Instance.Error("》》》重投成功，产品码：" + textBox1.Text.Trim() + ",重投工位：2"); } - textBox1.Text = Data.Trim(); + } - catch + catch(Exception ex) { - + Console.WriteLine(ex.ToString()); } - - - } //cb_qiangai.Enabled = false; cb_zhuanzi.Enabled = false; cb_allRestart.Enabled = false; - - //private void button1_Click(object sender, EventArgs e) - //{ - // try - // { - // if (string.IsNullOrEmpty(textBox1.Text)) - // { - // MessageBox.Show("条码为空！", "提示！"); - // return; - // } - // DbHandler db = new DbHandler(); - // int state1 = 0, state2 = 0, state3 = 0, state4 = 0; - // string RestartStation = ""; - // string checker = UserInfo.Instance.UserName; - // if (cb_qiangai.Enabled == true) - // { - // if (cb_qiangai.CheckState == CheckState.Checked) - // { - // state1 = 1; - // } - // else - // { - // state1 = 0; - // } - // } - // if (cb_zhuanzi.Enabled == true) - // { - // if (cb_zhuanzi.CheckState == CheckState.Checked) - // { - // state2 = 1; - // } - // else - // { - // state2 = 0; - // } - // } - // if (cb_allRestart.Enabled == true) - // { - // if (cb_allRestart.CheckState == CheckState.Checked) - // { - // state3 = 1; - // RestartStation = comboBox1.SelectedValue.ToString(); - // //RestartStation = NGStationID; - // } - // else - // { - // state3 = 0; - // } - // } - - // if (cb_AllScrapped.Checked) - // { - // state4 = 1; - // } - // if (db.Test(textBox1.Text, state1, state2, state3, state4, RestartStation, checker)) - // { - // MessageBox.Show("拆解成功！", "提示！"); - // ClearAllControl(); - // } - // else - // { - // MessageBox.Show("拆解失败！", "提示！"); - // } - // } - // catch(Exception ex) - // { - // //MessageBox.Show(ex.ToString()); - // } - //} + } private void ClearAllControl() { this.textBox1.Text = ""; + dataGridView1.DataSource = null; + this.tb_ngstation.Text = ""; } private void Disassembly_FormClosing(object sender, FormClosingEventArgs e) { try { - listener.Stop(); + // listener.Stop(); if (connType.ToLower() == "socket") { //socket.StopService(); @@ -366,81 +320,72 @@ namespace DisassemblyTable { try { + if (string.IsNullOrEmpty(NGStationID)) + { + NGStationID = "20"; + } DbHandler db = new DbHandler(); - //cbReStartStation.DisplayMember = "StationName"; - //cbReStartStation.ValueMember = "StationID"; - //cbReStartStation.DataSource = db.GetReStartStationList(); + cbReStartStation.DisplayMember = "StationName"; + cbReStartStation.ValueMember = "StationID"; + cbReStartStation.DataSource = db.GetReStartStationList(NGStationID); } catch (Exception ex) { - + MessageBox.Show("工位绑定失败"); } } private void button2_Click(object sender, EventArgs e) { try { + if (textBox1.Text.Trim() == "") { - MessageBox.Show("条码为空！", "提示！"); + MessageBox.Show("条码为空！", "系统提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } string REMARK = ""; - DbHandler dbHandler = new DbHandler(); + string RestarStation = "11"; + if (!radioButton1.Checked && !radioButton2.Checked) + { + MessageBox.Show("请选择拆解类型！", "系统提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } if (radioButton1.Checked) { REMARK = radioButton1.Text; - }else if (radioButton2.Checked) + RestarStation = "11"; + } + else if (radioButton2.Checked) { REMARK = radioButton2.Text; - }else if (radioButton3.Checked) - { - REMARK = radioButton3.Text; - }else if (radioButton4.Checked) - { - REMARK = radioButton4.Text; + RestarStation = "24"; + } - else if (radioButton5.Checked) + + DbHandler dbHandler = new DbHandler(); + dbHandler.InsertRepairInfo(textBox1.Text, textBox1.Text.Trim(), RestarStation, REMARK); + LogService.Instance.Error("》》》返修成功，产品码：" + textBox1.Text.Trim()); + //清空返修后的数据 + + bool iflag = dbHandler.UpdateTraceReStartStation("1", RestarStation, textBox1.Text.Trim()); + if (iflag) { - REMARK = radioButton5.Text; + //根据NG工位删除之后的数据 + SelectStationData(textBox1.Text.Trim()); } - dbHandler.InsertRepairInfo(textBox1.Text, textBox1.Text.Trim(),"2", REMARK); - //这里要判断下是否存在条码 - //bool isHaveData = dbHandler.IsHaveTraceState(textBox1.Text.Trim()); - //数据库里不存在该记录，有可能转盘上线工位没绑定 - //string MBarCode = ""; - //if (!isHaveData) - //{ - // //手动插入一条记录 - // //tb_ngstation.Text = "未查询到当前条码生产信息！"; - // //生成M码A码 - // string Asemibacode = dbHandler.CreatNewSemibarcode(); - // MBarCode = dbHandler.GetLastMainBarcode("M"); - // string machineID = dbHandler.GetNowProductionInfo(); - // dbHandler.InsertTrace(MBarCode, Asemibacode, textBox1.Text.Trim(), machineID); - - //} - //修改重投字段为2 - //更新重投工位字段 - - //bool iflag = dbHandler.UpdateTraceReStartStation("2", cbReStartStation.SelectedValue.ToString(), textBox1.Text.Trim()); - //if (iflag) - //{ - // //插入返修记录 - // dbHandler.InsertRepairInfo(MBarCode, textBox1.Text.Trim(), cbReStartStation.SelectedValue.ToString()); - // LogService.Instance.Error("》》》重投成功，产品码："+ textBox1.Text.Trim() + ",重投工位："+ cbReStartStation.SelectedValue.ToString()); - - // //修改重投状态T_RP_SemiProInfo - // textBox1.Text = ""; - // MessageBox.Show("重投工位设定成功!", "系统提示", MessageBoxButtons.OK, MessageBoxIcon.Information); - - //} - //else - //{ - // MessageBox.Show("重投工位设定失败!", "系统提示", MessageBoxButtons.OK, MessageBoxIcon.Error); - // LogService.Instance.Error("重投工位设定失败"); - //} + bool iflag1 = dbHandler.DeletePrintInfo(textBox1.Text.Trim()); + if (iflag1) + { + LogService.Instance.Error("》》》打印记录清除成功，产品码：" + textBox1.Text.Trim()); + } + //修改重投状态T_RP_SemiProInfo + textBox1.Text = ""; + radioButton1.Checked = false; + radioButton2.Checked = false; + MessageBox.Show("返修记录成功!", "系统提示", MessageBoxButtons.OK, MessageBoxIcon.Information); + } catch (Exception ex) { @@ -448,6 +393,55 @@ namespace DisassemblyTable } } + private void SelectStationData(string Barcode) + { + try + { + DbHandler dbHandler = new DbHandler(); + string cbReStartStation = ""; + if (radioButton1.Checked) + { + cbReStartStation = "22"; + } + else + { + cbReStartStation = "25"; + } + DataTable dt1 = dbHandler.GetDeleteReStartStationList(cbReStartStation); + if (dt1 != null && dt1.Rows.Count > 0) + { + foreach (DataRow VARIABLE in dt1.Rows) + { + //删除工位数据 + DeleteStationData(VARIABLE["TableName"].ToString(), Barcode); + } + } + } + catch (Exception ex) + { + LogService.Instance.Error("空间名：" + ex.Source + "；" + '\n' + + "方法名：" + ex.TargetSite + '\n' + + "故障点：" + ex.StackTrace.Substring(ex.StackTrace.LastIndexOf("\\") + 1, ex.StackTrace.Length - ex.StackTrace.LastIndexOf("\\") - 1) + '\n' + + "错误提示：" + ex.Message); + } + } + + private void DeleteStationData(string TableName,string BarCode) + { + try + { + DbHandler dbHandler = new DbHandler(); + dbHandler.DeleteStationData(TableName, BarCode); + } + catch (Exception ex) + { + LogService.Instance.Error("空间名：" + ex.Source + "；" + '\n' + + "方法名：" + ex.TargetSite + '\n' + + "故障点：" + ex.StackTrace.Substring(ex.StackTrace.LastIndexOf("\\") + 1, ex.StackTrace.Length - ex.StackTrace.LastIndexOf("\\") - 1) + '\n' + + "错误提示：" + ex.Message); + } + } + private void Disassembly_Load(object sender, EventArgs e) { //BindReStartStationInfo(); diff --git a/Comprosser/DisassemblyTable/DisassemblyTable.csproj b/Comprosser/DisassemblyTable/DisassemblyTable.csproj index 0044908..ac8356a 100644 --- a/Comprosser/DisassemblyTable/DisassemblyTable.csproj +++ b/Comprosser/DisassemblyTable/DisassemblyTable.csproj @@ -9,8 +9,9 @@ Properties DisassemblyTable DisassemblyTable - v4.0 + v4.5.2 512 + AnyCPU @@ -21,6 +22,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -30,6 +32,7 @@ TRACE prompt 4 + false @@ -108,6 +111,7 @@ True Resources.resx + True Designer @@ -131,10 +135,6 @@ {7088C4AE-8DD9-4537-83BA-FB465507C095} Mesnac.Compressor.Entity - - {cbbe0897-7b21-4cba-a77f-ec9772ba1b7a} - Mesnac.Compressor.ScanGun - {2571ef4a-1682-4fac-bc32-db98510bcb0c} SocketProcess diff --git a/Comprosser/DisassemblyTable/Properties/Resources.Designer.cs b/Comprosser/DisassemblyTable/Properties/Resources.Designer.cs index da9ce22..3e3ad21 100644 --- a/Comprosser/DisassemblyTable/Properties/Resources.Designer.cs +++ b/Comprosser/DisassemblyTable/Properties/Resources.Designer.cs @@ -1,17 +1,17 @@ //------------------------------------------------------------------------------ // // 此代码由工具生成。 -// 运行时版本: 4.0.30319.34209 +// 运行时版本:4.0.30319.42000 // // 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将丢失。 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ -namespace DisassemblyTable.Properties -{ - - +namespace DisassemblyTable.Properties { + using System; + + /// /// 一个强类型的资源类，用于查找本地化的字符串等。 /// @@ -19,51 +19,43 @@ namespace DisassemblyTable.Properties // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// - /// 返回此类使用的、缓存的 ResourceManager 实例。 + /// 返回此类使用的缓存的 ResourceManager 实例。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DisassemblyTable.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// - /// 为所有资源查找重写当前线程的 CurrentUICulture 属性， - /// 方法是使用此强类型资源类。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/Comprosser/DisassemblyTable/Properties/Settings.Designer.cs b/Comprosser/DisassemblyTable/Properties/Settings.Designer.cs index ca886a4..c7eb201 100644 --- a/Comprosser/DisassemblyTable/Properties/Settings.Designer.cs +++ b/Comprosser/DisassemblyTable/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ -namespace DisassemblyTable.Properties -{ - - +namespace DisassemblyTable.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/Comprosser/DisassemblyTable/SerialEquip.cs b/Comprosser/DisassemblyTable/SerialEquip.cs index e7048fb..3f8b3dd 100644 --- a/Comprosser/DisassemblyTable/SerialEquip.cs +++ b/Comprosser/DisassemblyTable/SerialEquip.cs @@ -28,7 +28,7 @@ namespace DisassemblyTable //string EquipCom = "COM3"; Comm.serialPort.PortName = EquipCom; //波特率 - Comm.serialPort.BaudRate = 9600; + Comm.serialPort.BaudRate = 115200; //数据位 Comm.serialPort.DataBits = 8; //两个停止位 diff --git a/Comprosser/Entity/Mesnac.Compressor.Entity.csproj b/Comprosser/Entity/Mesnac.Compressor.Entity.csproj index cf9f6f6..db85ed6 100644 --- a/Comprosser/Entity/Mesnac.Compressor.Entity.csproj +++ b/Comprosser/Entity/Mesnac.Compressor.Entity.csproj @@ -9,8 +9,9 @@ Properties Mesnac.Compressor.Entity Mesnac.Compressor.Entity - v4.0 + v4.5.2 512 + true @@ -20,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -28,6 +30,7 @@ TRACE prompt 4 + false diff --git a/Comprosser/FrmPrint/App.config b/Comprosser/FrmPrint/App.config index 2e2a767..4711ba7 100644 --- a/Comprosser/FrmPrint/App.config +++ b/Comprosser/FrmPrint/App.config @@ -5,10 +5,15 @@ - - - - + + + + + + + + + diff --git a/Comprosser/FrmPrint/Entity/TSYTraceState.cs b/Comprosser/FrmPrint/Entity/TSYTraceState.cs index d285fd6..d18d48c 100644 --- a/Comprosser/FrmPrint/Entity/TSYTraceState.cs +++ b/Comprosser/FrmPrint/Entity/TSYTraceState.cs @@ -8,6 +8,18 @@ namespace FrmPrint { [SugarColumn(ColumnName = "ProductBarcode")] public string ProductBarcode { get; set; } + + [SugarColumn(ColumnName = "SemiBarcode_A")] + public string SemiBarcode_A { get; set; } + [SugarColumn(ColumnName = "SemiBarcode_B")] + public string SemiBarcode_B { get; set; } + [SugarColumn(ColumnName = "SemiBarcode_C")] + public string SemiBarcode_C { get; set; } + [SugarColumn(ColumnName = "SemiBarcode2")] + public string SemiBarcode2 { get; set; } + + + [SugarColumn(ColumnName = "CurrentStationID")] public string CurrentStationID { get; set; } diff --git a/Comprosser/FrmPrint/Form1.Designer.cs b/Comprosser/FrmPrint/Form1.Designer.cs index 95b728f..4318a2d 100644 --- a/Comprosser/FrmPrint/Form1.Designer.cs +++ b/Comprosser/FrmPrint/Form1.Designer.cs @@ -47,24 +47,29 @@ this.panel1 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.panel10 = new System.Windows.Forms.Panel(); - this.lst_OperInfo = new System.Windows.Forms.ListBox(); + this.time4 = new System.Windows.Forms.Label(); + this.panel3 = new System.Windows.Forms.Panel(); + this.comboBox3 = new System.Windows.Forms.ComboBox(); + this.time2 = new System.Windows.Forms.Label(); this.cb_machine = new System.Windows.Forms.ComboBox(); this.btn_print = new System.Windows.Forms.Button(); this.label7 = new System.Windows.Forms.Label(); + this.time3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.txt_barcode = new System.Windows.Forms.Label(); + this.time1 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.panel5 = new System.Windows.Forms.Panel(); - this.lb_UserName = new System.Windows.Forms.Label(); - this.cb_shift = new System.Windows.Forms.ComboBox(); - this.time4 = new System.Windows.Forms.Label(); - this.time2 = new System.Windows.Forms.Label(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); + this.comboBox2 = new System.Windows.Forms.ComboBox(); + this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); this.label8 = new System.Windows.Forms.Label(); - this.time3 = new System.Windows.Forms.Label(); - this.time1 = new System.Windows.Forms.Label(); - this.btn_close = new System.Windows.Forms.Button(); + this.lb_UserName = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); + this.lst_OperInfo = new System.Windows.Forms.ListBox(); + this.btn_close = new System.Windows.Forms.Button(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -84,14 +89,12 @@ this.timer1 = new System.Windows.Forms.Timer(this.components); this.panel9 = new System.Windows.Forms.Panel(); this.timer2 = new System.Windows.Forms.Timer(this.components); - this.panel3 = new System.Windows.Forms.Panel(); - this.radioButton2 = new System.Windows.Forms.RadioButton(); - this.radioButton1 = new System.Windows.Forms.RadioButton(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel10.SuspendLayout(); - this.panel5.SuspendLayout(); this.panel3.SuspendLayout(); + this.panel5.SuspendLayout(); + this.panel9.SuspendLayout(); this.SuspendLayout(); // // columnHeader30 @@ -204,14 +207,17 @@ // this.panel10.BackColor = System.Drawing.Color.Transparent; this.panel10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel10.Controls.Add(this.time4); this.panel10.Controls.Add(this.panel3); - this.panel10.Controls.Add(this.lst_OperInfo); + this.panel10.Controls.Add(this.time2); this.panel10.Controls.Add(this.cb_machine); this.panel10.Controls.Add(this.btn_print); this.panel10.Controls.Add(this.label7); + this.panel10.Controls.Add(this.time3); this.panel10.Controls.Add(this.label3); this.panel10.Controls.Add(this.label1); this.panel10.Controls.Add(this.txt_barcode); + this.panel10.Controls.Add(this.time1); this.panel10.Controls.Add(this.label5); this.panel10.Dock = System.Windows.Forms.DockStyle.Fill; this.panel10.Location = new System.Drawing.Point(0, 66); @@ -220,31 +226,89 @@ this.panel10.Size = new System.Drawing.Size(1740, 480); this.panel10.TabIndex = 72; // - // lst_OperInfo + // time4 // - this.lst_OperInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); - this.lst_OperInfo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lst_OperInfo.Font = new System.Drawing.Font("微软雅黑", 14F); - this.lst_OperInfo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.lst_OperInfo.FormattingEnabled = true; - this.lst_OperInfo.ItemHeight = 36; - this.lst_OperInfo.Location = new System.Drawing.Point(186, 253); - this.lst_OperInfo.Margin = new System.Windows.Forms.Padding(4); - this.lst_OperInfo.Name = "lst_OperInfo"; - this.lst_OperInfo.Size = new System.Drawing.Size(1525, 182); - this.lst_OperInfo.TabIndex = 74; + this.time4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); + this.time4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.time4.ForeColor = System.Drawing.Color.LightGreen; + this.time4.Location = new System.Drawing.Point(1615, 18); + this.time4.Name = "time4"; + this.time4.Size = new System.Drawing.Size(116, 34); + this.time4.TabIndex = 450; + this.time4.Text = "08:00:00"; + this.time4.TextAlign = System.Drawing.ContentAlignment.TopCenter; + this.time4.Visible = false; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.Transparent; + this.panel3.Controls.Add(this.comboBox3); + this.panel3.Location = new System.Drawing.Point(186, 3); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(447, 72); + this.panel3.TabIndex = 1002; + // + // comboBox3 + // + this.comboBox3.Font = new System.Drawing.Font("微软雅黑", 12F); + this.comboBox3.FormattingEnabled = true; + this.comboBox3.Items.AddRange(new object[] { + "A", + "B", + "C", + "D", + "E", + "F", + "G", + "H", + "I", + "J", + "K", + "L", + "M", + "N", + "O", + "P", + "Q", + "R", + "S", + "T", + "U", + "V", + "W", + "X", + "Y", + "Z"}); + this.comboBox3.Location = new System.Drawing.Point(0, 15); + this.comboBox3.Name = "comboBox3"; + this.comboBox3.Size = new System.Drawing.Size(122, 39); + this.comboBox3.TabIndex = 1010; + // + // time2 + // + this.time2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); + this.time2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.time2.ForeColor = System.Drawing.Color.LightGreen; + this.time2.Location = new System.Drawing.Point(1449, 18); + this.time2.Name = "time2"; + this.time2.Size = new System.Drawing.Size(184, 34); + this.time2.TabIndex = 449; + this.time2.Text = "2021-10-22"; + this.time2.TextAlign = System.Drawing.ContentAlignment.TopCenter; + this.time2.Visible = false; // // cb_machine // this.cb_machine.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); - this.cb_machine.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.cb_machine.Font = new System.Drawing.Font("微软雅黑", 14F); this.cb_machine.ForeColor = System.Drawing.Color.Aqua; this.cb_machine.FormattingEnabled = true; - this.cb_machine.Location = new System.Drawing.Point(186, 94); + this.cb_machine.Location = new System.Drawing.Point(186, 153); this.cb_machine.Margin = new System.Windows.Forms.Padding(4); this.cb_machine.Name = "cb_machine"; - this.cb_machine.Size = new System.Drawing.Size(447, 37); + this.cb_machine.Size = new System.Drawing.Size(447, 44); this.cb_machine.TabIndex = 4; + this.cb_machine.SelectedIndexChanged += new System.EventHandler(this.cb_machine_SelectedIndexChanged); this.cb_machine.TextUpdate += new System.EventHandler(this.cb_machine_TextUpdate); // // btn_print @@ -265,19 +329,32 @@ this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label7.Location = new System.Drawing.Point(29, 97); + this.label7.Location = new System.Drawing.Point(29, 156); this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(71, 29); this.label7.TabIndex = 3; this.label7.Text = "机种"; // + // time3 + // + this.time3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); + this.time3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.time3.ForeColor = System.Drawing.Color.LightGreen; + this.time3.Location = new System.Drawing.Point(1259, 18); + this.time3.Name = "time3"; + this.time3.Size = new System.Drawing.Size(116, 34); + this.time3.TabIndex = 447; + this.time3.Text = "08:00:00"; + this.time3.TextAlign = System.Drawing.ContentAlignment.TopCenter; + this.time3.Visible = false; + // // label3 // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label3.Location = new System.Drawing.Point(20, 244); + this.label3.Location = new System.Drawing.Point(9, 425); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(159, 36); this.label3.TabIndex = 73; @@ -288,7 +365,7 @@ this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label1.Location = new System.Drawing.Point(20, 171); + this.label1.Location = new System.Drawing.Point(20, 300); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(159, 36); this.label1.TabIndex = 71; @@ -299,14 +376,27 @@ this.txt_barcode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txt_barcode.Font = new System.Drawing.Font("微软雅黑", 14F); this.txt_barcode.ForeColor = System.Drawing.Color.Aqua; - this.txt_barcode.Location = new System.Drawing.Point(186, 161); + this.txt_barcode.Location = new System.Drawing.Point(186, 290); this.txt_barcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.txt_barcode.Name = "txt_barcode"; - this.txt_barcode.Size = new System.Drawing.Size(520, 60); + this.txt_barcode.Size = new System.Drawing.Size(447, 60); this.txt_barcode.TabIndex = 999; this.txt_barcode.Text = " "; this.txt_barcode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // time1 + // + this.time1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); + this.time1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.time1.ForeColor = System.Drawing.Color.LightGreen; + this.time1.Location = new System.Drawing.Point(1093, 18); + this.time1.Name = "time1"; + this.time1.Size = new System.Drawing.Size(184, 34); + this.time1.TabIndex = 446; + this.time1.Text = "2021-10-22"; + this.time1.TextAlign = System.Drawing.ContentAlignment.TopCenter; + this.time1.Visible = false; + // // label5 // this.label5.AutoSize = true; @@ -321,14 +411,12 @@ // // panel5 // - this.panel5.Controls.Add(this.lb_UserName); - this.panel5.Controls.Add(this.cb_shift); - this.panel5.Controls.Add(this.time4); - this.panel5.Controls.Add(this.time2); + this.panel5.Controls.Add(this.comboBox1); + this.panel5.Controls.Add(this.dateTimePicker2); + this.panel5.Controls.Add(this.comboBox2); + this.panel5.Controls.Add(this.dateTimePicker1); this.panel5.Controls.Add(this.label8); - this.panel5.Controls.Add(this.time3); - this.panel5.Controls.Add(this.time1); - this.panel5.Controls.Add(this.btn_close); + this.panel5.Controls.Add(this.lb_UserName); this.panel5.Controls.Add(this.label4); this.panel5.Dock = System.Windows.Forms.DockStyle.Top; this.panel5.Location = new System.Drawing.Point(0, 0); @@ -337,6 +425,59 @@ this.panel5.Size = new System.Drawing.Size(1740, 66); this.panel5.TabIndex = 71; // + // comboBox1 + // + this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(192, 10); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(145, 39); + this.comboBox1.TabIndex = 1014; + // + // dateTimePicker2 + // + this.dateTimePicker2.CalendarFont = new System.Drawing.Font("微软雅黑", 12F); + this.dateTimePicker2.CustomFormat = "yyyy-MM-dd"; + this.dateTimePicker2.Font = new System.Drawing.Font("微软雅黑", 12F); + this.dateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dateTimePicker2.Location = new System.Drawing.Point(387, 7); + this.dateTimePicker2.Name = "dateTimePicker2"; + this.dateTimePicker2.Size = new System.Drawing.Size(187, 39); + this.dateTimePicker2.TabIndex = 1013; + // + // comboBox2 + // + this.comboBox2.Font = new System.Drawing.Font("微软雅黑", 12F); + this.comboBox2.FormattingEnabled = true; + this.comboBox2.Location = new System.Drawing.Point(576, 7); + this.comboBox2.Name = "comboBox2"; + this.comboBox2.Size = new System.Drawing.Size(145, 39); + this.comboBox2.TabIndex = 1012; + // + // dateTimePicker1 + // + this.dateTimePicker1.CalendarFont = new System.Drawing.Font("微软雅黑", 12F); + this.dateTimePicker1.CustomFormat = "yyyy-MM-dd"; + this.dateTimePicker1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dateTimePicker1.Location = new System.Drawing.Point(3, 10); + this.dateTimePicker1.Name = "dateTimePicker1"; + this.dateTimePicker1.Size = new System.Drawing.Size(187, 39); + this.dateTimePicker1.TabIndex = 1011; + this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged); + // + // label8 + // + this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); + this.label8.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label8.ForeColor = System.Drawing.Color.LightGreen; + this.label8.Location = new System.Drawing.Point(343, 11); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(38, 36); + this.label8.TabIndex = 1010; + this.label8.Text = "至"; + this.label8.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // // lb_UserName // this.lb_UserName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -350,94 +491,6 @@ this.lb_UserName.Text = "用户名"; this.lb_UserName.TextAlign = System.Drawing.ContentAlignment.TopCenter; // - // cb_shift - // - this.cb_shift.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); - this.cb_shift.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.cb_shift.ForeColor = System.Drawing.Color.Aqua; - this.cb_shift.FormattingEnabled = true; - this.cb_shift.Location = new System.Drawing.Point(1463, 11); - this.cb_shift.Margin = new System.Windows.Forms.Padding(4); - this.cb_shift.Name = "cb_shift"; - this.cb_shift.Size = new System.Drawing.Size(134, 37); - this.cb_shift.TabIndex = 2; - this.cb_shift.Visible = false; - this.cb_shift.SelectedIndexChanged += new System.EventHandler(this.cb_shift_SelectedIndexChanged); - // - // time4 - // - this.time4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); - this.time4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.time4.ForeColor = System.Drawing.Color.LightGreen; - this.time4.Location = new System.Drawing.Point(518, 0); - this.time4.Name = "time4"; - this.time4.Size = new System.Drawing.Size(116, 34); - this.time4.TabIndex = 450; - this.time4.Text = "08:00:00"; - this.time4.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // time2 - // - this.time2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); - this.time2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.time2.ForeColor = System.Drawing.Color.LightGreen; - this.time2.Location = new System.Drawing.Point(352, 0); - this.time2.Name = "time2"; - this.time2.Size = new System.Drawing.Size(184, 34); - this.time2.TabIndex = 449; - this.time2.Text = "2021-10-22"; - this.time2.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // label8 - // - this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); - this.label8.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.ForeColor = System.Drawing.Color.LightGreen; - this.label8.Location = new System.Drawing.Point(284, -2); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(61, 34); - this.label8.TabIndex = 448; - this.label8.Text = "至"; - this.label8.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // time3 - // - this.time3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); - this.time3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.time3.ForeColor = System.Drawing.Color.LightGreen; - this.time3.Location = new System.Drawing.Point(162, 0); - this.time3.Name = "time3"; - this.time3.Size = new System.Drawing.Size(116, 34); - this.time3.TabIndex = 447; - this.time3.Text = "08:00:00"; - this.time3.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // time1 - // - this.time1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); - this.time1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.time1.ForeColor = System.Drawing.Color.LightGreen; - this.time1.Location = new System.Drawing.Point(-4, 0); - this.time1.Name = "time1"; - this.time1.Size = new System.Drawing.Size(184, 34); - this.time1.TabIndex = 446; - this.time1.Text = "2021-10-22"; - this.time1.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // btn_close - // - this.btn_close.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.btn_close.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btn_close.Location = new System.Drawing.Point(1308, 8); - this.btn_close.Margin = new System.Windows.Forms.Padding(4); - this.btn_close.Name = "btn_close"; - this.btn_close.Size = new System.Drawing.Size(135, 54); - this.btn_close.TabIndex = 7; - this.btn_close.Text = "关 闭"; - this.btn_close.UseVisualStyleBackColor = false; - this.btn_close.Visible = false; - this.btn_close.Click += new System.EventHandler(this.btn_close_Click); - // // label4 // this.label4.BackColor = System.Drawing.Color.Transparent; @@ -453,6 +506,35 @@ this.label4.Text = "奥特佳条码打印系统"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // lst_OperInfo + // + this.lst_OperInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); + this.lst_OperInfo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lst_OperInfo.Dock = System.Windows.Forms.DockStyle.Fill; + this.lst_OperInfo.Font = new System.Drawing.Font("微软雅黑", 14F); + this.lst_OperInfo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); + this.lst_OperInfo.FormattingEnabled = true; + this.lst_OperInfo.ItemHeight = 36; + this.lst_OperInfo.Location = new System.Drawing.Point(0, 0); + this.lst_OperInfo.Margin = new System.Windows.Forms.Padding(4); + this.lst_OperInfo.Name = "lst_OperInfo"; + this.lst_OperInfo.Size = new System.Drawing.Size(1744, 414); + this.lst_OperInfo.TabIndex = 74; + // + // btn_close + // + this.btn_close.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btn_close.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btn_close.Location = new System.Drawing.Point(1596, 347); + this.btn_close.Margin = new System.Windows.Forms.Padding(4); + this.btn_close.Name = "btn_close"; + this.btn_close.Size = new System.Drawing.Size(135, 54); + this.btn_close.TabIndex = 7; + this.btn_close.Text = "关 闭"; + this.btn_close.UseVisualStyleBackColor = false; + this.btn_close.Visible = false; + this.btn_close.Click += new System.EventHandler(this.btn_close_Click); + // // columnHeader1 // this.columnHeader1.Text = "编号"; @@ -552,6 +634,8 @@ // // panel9 // + this.panel9.Controls.Add(this.btn_close); + this.panel9.Controls.Add(this.lst_OperInfo); this.panel9.Dock = System.Windows.Forms.DockStyle.Fill; this.panel9.Location = new System.Drawing.Point(0, 550); this.panel9.Margin = new System.Windows.Forms.Padding(4); @@ -562,47 +646,9 @@ // timer2 // this.timer2.Enabled = true; - this.timer2.Interval = 50; + this.timer2.Interval = 1000; this.timer2.Tick += new System.EventHandler(this.timer2_Tick); // - // panel3 - // - this.panel3.BackColor = System.Drawing.Color.Transparent; - this.panel3.Controls.Add(this.radioButton2); - this.panel3.Controls.Add(this.radioButton1); - this.panel3.Location = new System.Drawing.Point(186, 3); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(447, 72); - this.panel3.TabIndex = 1002; - // - // radioButton2 - // - this.radioButton2.AutoSize = true; - this.radioButton2.Font = new System.Drawing.Font("微软雅黑", 14F); - this.radioButton2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.radioButton2.Location = new System.Drawing.Point(327, 15); - this.radioButton2.Name = "radioButton2"; - this.radioButton2.Size = new System.Drawing.Size(96, 40); - this.radioButton2.TabIndex = 1003; - this.radioButton2.TabStop = true; - this.radioButton2.Text = "夜班"; - this.radioButton2.UseVisualStyleBackColor = true; - this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged); - // - // radioButton1 - // - this.radioButton1.AutoSize = true; - this.radioButton1.Font = new System.Drawing.Font("微软雅黑", 14F); - this.radioButton1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.radioButton1.Location = new System.Drawing.Point(18, 15); - this.radioButton1.Name = "radioButton1"; - this.radioButton1.Size = new System.Drawing.Size(96, 40); - this.radioButton1.TabIndex = 1002; - this.radioButton1.TabStop = true; - this.radioButton1.Text = "白班"; - this.radioButton1.UseVisualStyleBackColor = true; - this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); - // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); @@ -614,16 +660,16 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Margin = new System.Windows.Forms.Padding(4); this.Name = "Form1"; - this.Text = "条码打印系统"; + this.Text = "条码打印系统V1.7"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Form1_FormClosed); this.Load += new System.EventHandler(this.Form1_Load); this.panel1.ResumeLayout(false); this.panel2.ResumeLayout(false); this.panel10.ResumeLayout(false); this.panel10.PerformLayout(); - this.panel5.ResumeLayout(false); this.panel3.ResumeLayout(false); - this.panel3.PerformLayout(); + this.panel5.ResumeLayout(false); + this.panel9.ResumeLayout(false); this.ResumeLayout(false); } @@ -668,13 +714,10 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label txt_barcode; - private System.Windows.Forms.ComboBox cb_shift; private System.Windows.Forms.Label label5; private System.Windows.Forms.Panel panel5; private System.Windows.Forms.Button btn_close; - private System.Windows.Forms.Button btn_print; private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label8; private System.Windows.Forms.Label time3; private System.Windows.Forms.Label time1; private System.Windows.Forms.Label time4; @@ -684,8 +727,13 @@ private System.Windows.Forms.Label lb_UserName; private System.Windows.Forms.Timer timer2; private System.Windows.Forms.Panel panel3; - private System.Windows.Forms.RadioButton radioButton2; - private System.Windows.Forms.RadioButton radioButton1; + private System.Windows.Forms.ComboBox comboBox3; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.DateTimePicker dateTimePicker2; + private System.Windows.Forms.ComboBox comboBox2; + private System.Windows.Forms.DateTimePicker dateTimePicker1; + private System.Windows.Forms.Label label8; + public System.Windows.Forms.Button btn_print; } } diff --git a/Comprosser/FrmPrint/Form1.cs b/Comprosser/FrmPrint/Form1.cs index 3929a87..3d44df9 100644 --- a/Comprosser/FrmPrint/Form1.cs +++ b/Comprosser/FrmPrint/Form1.cs @@ -25,11 +25,15 @@ using static log4net.Appender.RollingFileAppender; using static System.Windows.Forms.VisualStyles.VisualStyleElement; using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button; using System.Collections; +using System.Runtime.InteropServices; +using System.Reflection.Emit; namespace FrmPrint { public partial class Form1 : Form { + [DllImport("kernel32.dll", EntryPoint = "SetProcessWorkingSetSize")] + public static extern int SetProcessWorkingSetSize(IntPtr process, int minSize, int maxSize); protected DbHandler db = new DbHandler(); DbHelper dbHelper = null; SerialEquip Com; @@ -53,34 +57,32 @@ namespace FrmPrint } CheckForIllegalCrossThreadCalls = false; printManager.RefreshShowMessageEvent += ShowMessage; - BindClass(); + //BindClass(); //bindMachine(); getMachine(); //initUsbScanBarCode(); InitPort(); } - private void SetRadiobutton() - { - try - { - radioButton1.ForeColor = Color.FromArgb(106, 203, 254); - radioButton2.ForeColor = Color.FromArgb(106, 203, 254); - - //radioButton1.BackColor = Color.FromArgb(3, 27, 61); - //radioButton2.BackColor = Color.FromArgb(3, 27, 61); - - } - catch (Exception ex) - { - - } - } private void Form1_Load(object sender, EventArgs e) { this.WindowState = FormWindowState.Maximized; cb_machine.DropDownStyle = ComboBoxStyle.DropDown; + DateTime startTime = DateTime.Today.AddHours(1); + // 结束时间设置为 23:00:00 + DateTime endTime = DateTime.Today.AddHours(23); + // 从开始时间开始，每次增加 1 小时，直到达到结束时间 + for (DateTime currentTime = startTime; currentTime <= endTime; currentTime = currentTime.AddHours(1)) + { + // 将当前时间格式化为 HH:mm:ss 并添加到 ComboBox 中 + comboBox1.Items.Add(currentTime.ToString("HH:mm:ss")); + comboBox2.Items.Add(currentTime.ToString("HH:mm:ss")); + } + for (char i = 'A'; i <= 'Z'; i++) + { + comboBox3.Items.Add(i); + } if (iNIFile.IniReadValue("SystemConfig", "UserName") != "用户名") { iNIFile.IniWriteValue("SystemConfig", "UserName", "用户名"); @@ -89,18 +91,27 @@ namespace FrmPrint { iNIFile.IniWriteValue("SystemConfig", "PrintState", "2"); } + ShowMessage("系统启动成功!"); //listener.Start(); //加载默认时间 lb_UserName.Text = UserName; lb_UserName.ForeColor = Color.Red; LoadTime(); - //timer1.Enabled = true; + //dateTimePicker1.Visible = false; + //dateTimePicker1.Visible = true; + //dateTimePicker2.Visible = false; + //dateTimePicker2.Visible = true; + //comboBox1.Visible = false; + //comboBox1.Visible = true; + //comboBox2.Visible = false; + //comboBox2.Visible = true; } public void ShowMessage(string strMessage) { try { + LogHelper.Info(strMessage); if (this.lst_OperInfo.Items.Count > 100) { this.lst_OperInfo.Items.Clear(); @@ -136,8 +147,7 @@ namespace FrmPrint try { ShowMessage(" "+ Data+"条码扫描成功!"); - LogHelper.Info(Data + "条码扫描成功!"); - //Thread.Sleep(5000); + Thread.Sleep(1000); PrintPrepare(Data.Trim()); } catch(Exception ex) @@ -154,19 +164,25 @@ namespace FrmPrint { if (string.IsNullOrEmpty(Data)) { - ShowMessage("请确认条码是否正确!"); return; } if (Data.Length != 20) { - ShowMessage("请确认条码是否正确!"); - return; + if (Data.Length != 11 && Data.Length != 19) + { + ShowMessage("请确认条码是否正确!"); + return; + } } //提示换班 //var date = DateTime.Now; //DateTime dt1 = DateTime.Parse(time2.Text + " "+ time4.Text); //DateTime dt2 = DateTime.Parse(time1.Text + " " + time3.Text); - + if (comboBox3.Text == "") + { + ShowMessage("请选择班组!"); + return; + } if (cb_machine.Text == "") { ShowMessage("请选择机种!"); @@ -203,16 +219,40 @@ namespace FrmPrint #region 打印代码暂时屏蔽 //根据条码查询是否到当前工位 - //ShowMessage("正在查询产品是否到达条码打印工位..."); - //bool iFlag = await SelectPrintStation(Data.Replace("\r", "")); - //if (!iFlag) + + bool iFlag = false; + //豪森工位合格查询 + //if (System.Configuration.ConfigurationManager.AppSettings["SqlString"].ToString().Contains("HS")) //{ - // return; + // iFlag = GetStationNGBySemiBarCode(Data.Replace("\r", "")); //} - //else + ////卓樱工位合格查询 + //if (System.Configuration.ConfigurationManager.AppSettings["SqlString"].ToString().Contains("JYD_shengjie")) //{ - // ShowMessage("查询产品结果合格!"); + // iFlag = await SelectPrintStation(Data.Replace("\r", "")); //} + //581工位合格查询 + if (System.Configuration.ConfigurationManager.AppSettings["SqlString"].ToString().Contains("581")) + { + //新增查询是否存在绑定信息 + bool _bindFlag = await SelectBindInfo(Data.Replace("\r", "")); + if (_bindFlag) + { + return; + } + //ShowMessage("正在查询产品是否合格..."); + iFlag = GetStationNGByProductCode(Data.Replace("\r", "")); + } + if (!iFlag) + { + ShowMessage("查询产品结果合格."); + } + else + { + return; + } + + //ShowMessage("正在查询产品结果是否合格..."); //查询结果是否合格 @@ -224,17 +264,54 @@ namespace FrmPrint List TBDProductInfo = await geTbdProductInfos(cb_machine.Text); pt.Machine =int.Parse(TBDProductInfo[0].ProductID); - if (radioButton1.Checked) - { - pt.Shift = "A"; + int num = 4; + if (!string.IsNullOrEmpty(TBDProductInfo[0].ToolCarNo.Trim())) + { + num = int.Parse(TBDProductInfo[0].ToolCarNo.Trim()); } else { - pt.Shift = "B"; + ShowMessage("序列号位数有误,请检查机种信息..."); } + //add by 2024-09-02 新增手动切换班次业务逻辑 + pt.Shift = comboBox3.Text; + //if (radioButton1.Checked) + //{ + // pt.Shift = "A"; + //pt.starttime = time1.Text + " " + time3.Text; + //int datetime = Convert.ToInt32(DateTime.Now.Hour.ToString()); + //if (datetime >= 8 && datetime < 20) + //{ + // pt.endtime = time2.Text + " " + DateTime.Now.ToString("HH:mm:ss"); + //} + //else + //{ + // pt.endtime = DateTime.Now.ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss"); - pt.starttime = time1.Text + " " + time3.Text; - pt.endtime = time2.Text + " " + time4.Text; + //} + + //} + //else if (radioButton2.Checked) + //{ + //pt.Shift = "B"; + //pt.starttime = time1.Text + " " + time3.Text; + //int datetime = Convert.ToInt32(DateTime.Now.Hour.ToString()); + //if (datetime >= 0 && datetime < 8) + //{ + // pt.endtime = time2.Text + " " + DateTime.Now.ToString("HH:mm:ss"); + + //} + //else + //{ + // pt.endtime = DateTime.Now.ToString("yyyy-MM-dd") + " " + DateTime.Now.ToString("HH:mm:ss"); + //} + //} + //else + //{ + // pt.Shift = "C"; + //} + pt.starttime = dateTimePicker1.Text + " " + comboBox1.Text; + pt.endtime = dateTimePicker2.Text + " " + comboBox2.Text; if (iNIFile.IniReadValue("SystemConfig", "UserName") != "管理员") { LogHelper.Info("查询" + Data + "产品序列号是否存在相同记录!"); @@ -247,42 +324,58 @@ namespace FrmPrint else { //先根据班次时间查询最大序列号,如果不存在则从0001生成 - List baseBarcodePrintInfo = await printManager.SelectPrintInfoAsync("",pt.Shift, pt.Machine.ToString(), pt.starttime, pt.endtime); - if (baseBarcodePrintInfo != null && baseBarcodePrintInfo.Count > 0) + //List baseBarcodePrintInfo = await printManager.SelectPrintInfoAsync("",pt.Shift, pt.Machine.ToString(), pt.starttime, pt.endtime); + //改为存储过程查询 + var max = SelectSerialNo(pt.Shift,pt.Machine.ToString(), pt.starttime, pt.endtime); + if (!string.IsNullOrEmpty(max)) { //查询最大序列号生成 - var max = baseBarcodePrintInfo.Max(x => x.SerialNo); ShowMessage("查询当前最大序列号" + max); - pt.Serialnum = Convert.ToInt32(Convert.ToInt32(max.Substring(max.Length - 4, 4)) + 1).ToString().PadLeft(4, '0'); + pt.Serialnum = Convert.ToInt32(Convert.ToInt32(max.Substring(max.Length - num, num)) + 1).ToString().PadLeft(num, '0'); ShowMessage("生成新序列号" + pt.Serialnum); } else { //序列号0001 - pt.Serialnum = "0001"; + pt.Serialnum = "1".PadLeft(num, '0'); ShowMessage("生成新序列号" + pt.Serialnum); } + + //if (baseBarcodePrintInfo != null && baseBarcodePrintInfo.Count > 0) + //{ + // //查询最大序列号生成 + // var max = baseBarcodePrintInfo.Max(x => x.SerialNo); + // ShowMessage("查询当前最大序列号" + max); + // pt.Serialnum = Convert.ToInt32(Convert.ToInt32(max.Substring(max.Length - num, num)) + 1).ToString().PadLeft(num, '0'); + // ShowMessage("生成新序列号" + pt.Serialnum); + //} + //else + //{ + // //序列号0001 + // pt.Serialnum = "1".PadLeft(num, '0'); + // ShowMessage("生成新序列号" + pt.Serialnum); + //} } } //管理员补码 else { ShowMessage("补码功能开启,查询到当前用户名管理员"); - List baseBarcodePrintInfo =await printManager.SelectPrintInfoAsync("", pt.Shift, pt.Machine.ToString(), pt.starttime, + List baseBarcodePrintInfo = await printManager.SelectPrintInfoAsync("", pt.Shift, pt.Machine.ToString(), pt.starttime, pt.endtime); if (baseBarcodePrintInfo != null && baseBarcodePrintInfo.Count > 0) { //查询最大序列号生成 var max = baseBarcodePrintInfo.Max(x => x.SerialNo); ShowMessage("查询当前最大序列号" + max); - pt.Serialnum = Convert.ToInt32(Convert.ToInt32(max.Substring(max.Length - 4, 4)) + 1).ToString().PadLeft(4, '0'); + pt.Serialnum = Convert.ToInt32(Convert.ToInt32(max.Substring(max.Length - num, num)) + 1).ToString().PadLeft(num, '0'); pt.isRestart = 1; ShowMessage("生成新序列号" + pt.Serialnum); } else { //序列号0001 - pt.Serialnum = "0001"; + pt.Serialnum = "1".PadLeft(num, '0'); pt.isRestart = 1; ShowMessage("生成新序列号" + pt.Serialnum); } @@ -300,7 +393,53 @@ namespace FrmPrint #endregion } - + private async Task SelectBindInfo(string ProductBarcode) + { + bool iFlag = false; + try + { + Expression> exp = s1 => true; + exp = exp.And(s1 => s1.ProductBarcode == ProductBarcode); + Expression> order = (x) => x.BeginTime; + List MaterialInfoList = await new BaseServices().Query(exp, order, true); + if (MaterialInfoList != null && MaterialInfoList.Count > 0) + { + if (string.IsNullOrEmpty(MaterialInfoList[0].SemiBarcode2)) + { + ShowMessage(ProductBarcode + "未绑定控制器码!"); + iFlag = true; + return iFlag; + } + if (string.IsNullOrEmpty(MaterialInfoList[0].SemiBarcode_A)) + { + ShowMessage(ProductBarcode + "未绑定前盖码!"); + iFlag = true; + return iFlag; + } + if (string.IsNullOrEmpty(MaterialInfoList[0].SemiBarcode_B)) + { + ShowMessage(ProductBarcode + "未绑定静盘码!"); + iFlag = true; + return iFlag; + } + if (string.IsNullOrEmpty(MaterialInfoList[0].SemiBarcode_C)) + { + ShowMessage(ProductBarcode + "未绑定后盖码!"); + iFlag = true; + return iFlag; + } + } + return iFlag; + } + catch (Exception ex) + { + LogHelper.Error("空间名：" + ex.Source + "；" + '\n' + + "方法名：" + ex.TargetSite + '\n' + + "故障点：" + ex.StackTrace.Substring(ex.StackTrace.LastIndexOf("\\") + 1, ex.StackTrace.Length - ex.StackTrace.LastIndexOf("\\") - 1) + '\n' + + "错误提示：" + ex.Message); + return iFlag; + } + } private async Task SelectPrintStation(string ProductBarcode) { bool iFlag = false; @@ -315,13 +454,13 @@ namespace FrmPrint var TSYTraceState = MaterialInfoList.OrderByDescending(x => x.BeginTime).FirstOrDefault(); if (TSYTraceState.CurrentStationID == "33") { - iFlag = true; + iFlag = false; return iFlag; } else { ShowMessage(ProductBarcode + "上工位未完成,查询产品未到达条码打印工位!"); - iFlag = false; + iFlag = true; return iFlag; } @@ -329,7 +468,7 @@ namespace FrmPrint else { ShowMessage(ProductBarcode + "上工位未完成,查询产品未到达条码打印工位!"); - iFlag = false; + iFlag = true; return iFlag; } } @@ -373,23 +512,28 @@ namespace FrmPrint bool iFlag = false; try { + List selectAllStation = SaveBarCode(ProductBarcode); + foreach (var VARIABLE in selectAllStation) + { + if (VARIABLE.TableName == "T_RP_StationPara_B130_1" && VARIABLE.State == "1") + { + selectAllStation.RemoveAll(x => x.TableName == "T_RP_StationPara_B130_2"); + break; + } + else if (VARIABLE.TableName == "T_RP_StationPara_B130_2" && VARIABLE.State == "1") + { + selectAllStation.RemoveAll(x => x.TableName == "T_RP_StationPara_B130_1"); + break; + } + } if (selectAllStation != null || selectAllStation.Count > 0) { for (int i = 0; i < selectAllStation.Count; i++) { - if (selectAllStation[i].TableName == "T_RP_StationPara_B130_1" && selectAllStation[i].State =="1") + if (selectAllStation[i].State != "1") { - selectAllStation.RemoveAll(x => x.TableName == "T_RP_StationPara_B130_2"); - } - else if(selectAllStation[i].TableName == "T_RP_StationPara_B130_2" && selectAllStation[i].State == "1") - { - selectAllStation.RemoveAll(x => x.TableName == "T_RP_StationPara_B130_1"); - } - - if (selectAllStation[i].State == "2" || selectAllStation[i].State == "") - { - iFlag = false; + iFlag = true; ShowMessage(selectAllStation[i].StationName + "数据NG"); return iFlag; } @@ -405,13 +549,68 @@ namespace FrmPrint } + public bool GetStationNGByProductCode(string ProductBarcode) + { + bool iFlag = false; + try + { + + List selectAllStation = SaveBarCode(ProductBarcode,"270"); + if (selectAllStation != null || selectAllStation.Count > 0) + { + for (int i = 0; i < selectAllStation.Count; i++) + { + if (selectAllStation[i].State != "1") + { + iFlag = true; + ShowMessage(selectAllStation[i].StationName + "数据NG"); + return iFlag; + } + } + + } + return iFlag; + } + catch (Exception ex) + { + return iFlag; + } + + + } + + public string SelectSerialNo(string ShiftID, string MachineID,string starttime,string endtime) + { + try + { + string SerialNo = ""; + SugarParameter[] pars = new BaseServices().GetParameters(new { ShiftID = ShiftID, MachineID = MachineID, starttime= starttime,endtime = endtime }); + var dt2 = new BaseServices().UseStoredProcedure("SP_Pro_GetNewSerialNO ", pars); + if (dt2 != null && dt2.Rows.Count > 0) + { + SerialNo = RowValue(dt2.Rows[0], "SerialNo", String.Empty); + } + + return SerialNo; + } + catch (Exception ex) + { + LogHelper.Error("空间名：" + ex.Source + "；" + '\n' + + "方法名：" + ex.TargetSite + '\n' + + "故障点：" + ex.StackTrace.Substring(ex.StackTrace.LastIndexOf("\\") + 1, ex.StackTrace.Length - ex.StackTrace.LastIndexOf("\\") - 1) + '\n' + + "错误提示：" + ex.Message); + return null; + } + } + + public List SaveBarCode(string P_Bar_Code) { List stationQualityList = null; try { SugarParameter[] pars = new BaseServices().GetParameters(new { BarCode = P_Bar_Code }); - var dt2 = new BaseServices().UseStoredProcedure("pro_AllProductionQualityInfocopy ", pars); + var dt2 = new BaseServices().UseStoredProcedure("pro_AllProductionQualityInfocopy", pars); if (dt2 != null && dt2.Rows.Count > 0) { stationQualityList = new List(); @@ -437,7 +636,37 @@ namespace FrmPrint } } - + public List SaveBarCode(string P_Bar_Code,string StationCode) + { + List stationQualityList = null; + try + { + SugarParameter[] pars = new BaseServices().GetParameters(new { BarCode = P_Bar_Code, StationCode = StationCode }); + var dt2 = new BaseServices().UseStoredProcedure("pro_AllProductionQualityInfo", pars); + if (dt2 != null && dt2.Rows.Count > 0) + { + stationQualityList = new List(); + StationQualityInfo stationQualityInfo = null; + foreach (DataRow row in dt2.Rows) + { + stationQualityInfo = new StationQualityInfo(); + stationQualityInfo.StationName = RowValue(row, "StationName", String.Empty); + stationQualityInfo.TableName = RowValue(row, "TableName", String.Empty); + stationQualityInfo.State = RowValue(row, "State", String.Empty); + stationQualityList.Add(stationQualityInfo); + } + } + return stationQualityList; + } + catch (Exception ex) + { + LogHelper.Error("空间名：" + ex.Source + "；" + '\n' + + "方法名：" + ex.TargetSite + '\n' + + "故障点：" + ex.StackTrace.Substring(ex.StackTrace.LastIndexOf("\\") + 1, ex.StackTrace.Length - ex.StackTrace.LastIndexOf("\\") - 1) + '\n' + + "错误提示：" + ex.Message); + return stationQualityList; + } + } public static string RowValue(DataRow dr, string field, string defaultValue) { @@ -486,23 +715,7 @@ namespace FrmPrint } } - /// - /// 机种绑定 - /// - private void bindMachine() - { - try - { - cb_machine.DisplayMember = "ProductName"; - cb_machine.ValueMember = "ProductID"; - cb_machine.DataSource = GetProductList(""); - } - catch - { - MessageBox.Show("机种绑定失败"); - } - } private async Task> geTbdProductInfos(string ProductName) { @@ -626,51 +839,12 @@ namespace FrmPrint dr3[1] = "晚班"; dt.Rows.Add(dr3); - this.cb_shift.DataSource = dt; - this.cb_shift.DisplayMember = "value"; - this.cb_shift.ValueMember = "key"; + //this.cb_shift.DataSource = dt; + //this.cb_shift.DisplayMember = "value"; + //this.cb_shift.ValueMember = "key"; } - private string getShift(string shift) - { - string shiftA = "A"; - switch (shift) - { - case "01": - shiftA = "A"; - break; - case "02": - shiftA = "B"; - break; - case "03": - shiftA = "C"; - break; - default: - break; - } - return shiftA; - } - - private string getDateString(string semiBarcode) - { - string datestring = "20"; - if (string.IsNullOrEmpty(semiBarcode)) - { - datestring = DateTime.Now.ToString(); - } - else - { - string year = semiBarcode.Substring(1, 2); - string month = semiBarcode.Substring(3, 2); - string date = semiBarcode.Substring(5, 2); - - datestring += year + "-" + month + "-" + date; - } - return datestring; - - } - private void btn_close_Click(object sender, EventArgs e) { @@ -681,11 +855,20 @@ namespace FrmPrint private void btn_print_Click(object sender, EventArgs e) { //密码权限 - Login login = new Login(this); - login.ChangeText += new ChangeTextHandler(Change_Text); - login.ShowDialog(); + if (btn_print.Text == "补 印") + { + Login login = new Login(this); + login.ChangeText += new ChangeTextHandler(Change_Text); + login.ShowDialog(); + } + if (btn_print.Text == "取消补印") + { + btn_print.Text = "补 印"; + } + } + private void Change_Text(string str) { if (iNIFile.IniReadValue("SystemConfig", "UserName") != str) @@ -699,44 +882,48 @@ namespace FrmPrint private void LoadTime() { - int datetime = Convert.ToInt32(DateTime.Now.Hour.ToString()); - if (datetime >= 8 && datetime < 20) - { - time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); - time3.Text = "08:00:00"; - time2.Text = DateTime.Now.ToString("yyyy-MM-dd"); - time4.Text = "20:00:00"; - this.radioButton1.Checked = true; - } - else if (datetime >= 0 && datetime < 8) - { - time1.Text = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"); - time3.Text = "20:00:00"; - time2.Text = DateTime.Now.ToString("yyyy-MM-dd"); - time4.Text = "08:00:00"; - this.radioButton2.Checked = true; - } - else - { - time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); - time3.Text = "20:00:00"; - time2.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd"); - time4.Text = "08:00:00"; - this.radioButton2.Checked = true; - } + //int datetime = Convert.ToInt32(DateTime.Now.Hour.ToString()); + //if (datetime >= 8 && datetime < 20) + //{ + // time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); + // time3.Text = "08:00:00"; + // time2.Text = DateTime.Now.ToString("yyyy-MM-dd"); + // time4.Text = "20:00:00"; + // this.radioButton1.Checked = true; + //} + //else if (datetime >= 0 && datetime < 8) + //{ + // time1.Text = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"); + // time3.Text = "20:00:00"; + // time2.Text = DateTime.Now.ToString("yyyy-MM-dd"); + // time4.Text = "08:00:00"; + // this.radioButton2.Checked = true; + //} + //else + //{ + // time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); + // time3.Text = "20:00:00"; + // time2.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd"); + // time4.Text = "08:00:00"; + // this.radioButton2.Checked = true; + //} + + //this.radioButton1.Checked = true; + // 控件即将获得焦点时，将焦点转移到button1 + txt_barcode.Focus(); + + dateTimePicker1.Text = DateTime.Now.ToString("yyyy-MM-dd"); + dateTimePicker2.Text = DateTime.Now.ToString("yyyy-MM-dd"); + comboBox1.SelectedIndex = 7; + comboBox2.SelectedIndex = 19; } - private void cb_shift_SelectedIndexChanged(object sender, EventArgs e) - { - cb_shift.Visible = false; - //cb_shift.Visible = true; - } - private void Form1_FormClosed(object sender, FormClosedEventArgs e) { try { + LogHelper.Info("程序退出!"); this.Com.Comm.Close(); //System.Environment.Exit(System.Environment.ExitCode); } @@ -757,68 +944,80 @@ namespace FrmPrint private void radioButton2_CheckedChanged(object sender, EventArgs e) { - //夜班 - //time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); - //time3.Text = "20:00:00"; - //time2.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd"); - //time4.Text = "08:00:00"; - return; - int datetime = Convert.ToInt32(DateTime.Now.Hour.ToString()); - if (datetime >= 8 && datetime < 20) - { - time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); - time3.Text = "08:00:00"; - time2.Text = DateTime.Now.ToString("yyyy-MM-dd"); - time4.Text = "20:00:00"; - //this.radioButton1.Checked = true; - } - else if (datetime >= 0 && datetime < 8) - { - time1.Text = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"); - time3.Text = "08:00:00"; - time2.Text = DateTime.Now.ToString("yyyy-MM-dd"); - time4.Text = "20:00:00"; - //this.radioButton2.Checked = true; - } - else - { - time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); - time3.Text = "20:00:00"; - time2.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd"); - time4.Text = "08:00:00"; - //this.radioButton2.Checked = true; - } + //if (radioButton2.Checked == true) + //{ + // int datetime = Convert.ToInt32(DateTime.Now.Hour.ToString()); + // if (datetime >= 8 && datetime < 20) + // { + // time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); + // time3.Text = "08:00:00"; + // time2.Text = DateTime.Now.ToString("yyyy-MM-dd"); + // time4.Text = "20:00:00"; + // } + // else if (datetime >= 0 && datetime < 8) + // { + // time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); + // time3.Text = "20:00:00"; + // time2.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd"); + // time4.Text = "08:00:00"; + // } + // else + // { + // time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); + // time3.Text = "20:00:00"; + // time2.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd"); + // time4.Text = "08:00:00"; + // } + //} + //ShowMessage("》》》切换夜班班次！" + dateTimePicker1.Text + " " + comboBox1.Text + "至" + dateTimePicker2.Text + " " + comboBox2.Text); + } private void radioButton1_CheckedChanged(object sender, EventArgs e) { - //白班 - //time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); - //time3.Text = "08:00:00"; - //time2.Text = DateTime.Now.ToString("yyyy-MM-dd"); - //time4.Text = "20:00:00"; - return; - int datetime = Convert.ToInt32(DateTime.Now.Hour.ToString()); - if (datetime >= 8 && datetime < 20) + //if (radioButton1.Checked == true) + //{ + // int datetime = Convert.ToInt32(DateTime.Now.Hour.ToString()); + // if (datetime >= 8 && datetime < 20) + // { + // time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); + // time3.Text = "08:00:00"; + // time2.Text = DateTime.Now.ToString("yyyy-MM-dd"); + // time4.Text = "20:00:00"; + // } + // else if (datetime >= 0 && datetime < 8) + // { + // time1.Text = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"); + // time3.Text = "08:00:00"; + // time2.Text = DateTime.Now.ToString("yyyy-MM-dd"); + // time4.Text = "20:00:00"; + // } + // else + // { + // time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); + // time3.Text = "20:00:00"; + // time2.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd"); + // time4.Text = "08:00:00"; + + // } + //} + //ShowMessage("》》》切换白班班次！" + dateTimePicker1.Text + " " + comboBox1.Text + "至" + dateTimePicker2.Text + " " + comboBox2.Text); + + } + + private void CollectGC() + { + try { - time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); - time3.Text = "08:00:00"; - time2.Text = DateTime.Now.ToString("yyyy-MM-dd"); - time4.Text = "20:00:00"; + GC.Collect(); + GC.WaitForPendingFinalizers(); + if (Environment.OSVersion.Platform == PlatformID.Win32NT) + { + SetProcessWorkingSetSize(System.Diagnostics.Process.GetCurrentProcess().Handle, -1, -1); + } } - else if (datetime >= 0 && datetime < 8) + catch (Exception ex) { - time1.Text = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"); - time3.Text = "08:00:00"; - time2.Text = DateTime.Now.ToString("yyyy-MM-dd"); - time4.Text = "20:00:00"; - } - else - { - time1.Text = DateTime.Now.ToString("yyyy-MM-dd"); - time3.Text = "20:00:00"; - time2.Text = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd"); - time4.Text = "08:00:00"; } } @@ -827,6 +1026,7 @@ namespace FrmPrint { try { + CollectGC(); if (iNIFile.IniReadValue("SystemConfig", "UserName") != "用户名") { iNIFile.IniWriteValue("SystemConfig", "UserName", "用户名"); @@ -872,9 +1072,45 @@ namespace FrmPrint private void timer2_Tick(object sender, EventArgs e) { - LoadTime(); + //LoadTime(); //SetRadiobutton(); } + + private void cb_machine_SelectedIndexChanged(object sender, EventArgs e) + { + cb_machine.Visible = false; + cb_machine.Visible = true; + } + + private void dateTimePicker1_ValueChanged(object sender, EventArgs e) + { + // 控件即将获得焦点时，将焦点转移到button1 + txt_barcode.Focus(); + } + + //private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) + //{ + // comboBox1.Visible = false; + // comboBox1.Visible = true; + //} + + //private void dateTimePicker1_ValueChanged(object sender, EventArgs e) + //{ + // dateTimePicker1.Visible = false; + // dateTimePicker1.Visible = true; + //} + + //private void dateTimePicker2_ValueChanged(object sender, EventArgs e) + //{ + // dateTimePicker2.Visible = false; + // dateTimePicker2.Visible = true; + //} + + //private void comboBox2_SelectedIndexChanged(object sender, EventArgs e) + //{ + // comboBox2.Visible = false; + // comboBox2.Visible = true; + //} } diff --git a/Comprosser/FrmPrint/Login.cs b/Comprosser/FrmPrint/Login.cs index 1bfbe02..8c2d2a6 100644 --- a/Comprosser/FrmPrint/Login.cs +++ b/Comprosser/FrmPrint/Login.cs @@ -12,6 +12,8 @@ namespace FrmPrint { public partial class Login : Form { + public delegate void SetTextValue(); + public event SetTextValue SetFormTextValue; Form1 f1; public delegate void ChangeTextHandler(string str); //定义委托 public event ChangeTextHandler ChangeText; //定义事件 diff --git a/Comprosser/FrmPrint/Properties/AssemblyInfo.cs b/Comprosser/FrmPrint/Properties/AssemblyInfo.cs index 7addc2f..de93499 100644 --- a/Comprosser/FrmPrint/Properties/AssemblyInfo.cs +++ b/Comprosser/FrmPrint/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.7.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Comprosser/FrmPrint/SerialEquip.cs b/Comprosser/FrmPrint/SerialEquip.cs index 66432c7..2ed1b7d 100644 --- a/Comprosser/FrmPrint/SerialEquip.cs +++ b/Comprosser/FrmPrint/SerialEquip.cs @@ -27,7 +27,7 @@ namespace FrmPrint //string EquipCom = "COM3"; Comm.serialPort.PortName = EquipCom; //波特率 - Comm.serialPort.BaudRate = 9600; + Comm.serialPort.BaudRate = 115200; //数据位 Comm.serialPort.DataBits = 8; //两个停止位 @@ -43,11 +43,14 @@ namespace FrmPrint { string Data = System.Text.Encoding.Default.GetString(readBuffer); - if (SerialData != null) + if (!string.IsNullOrEmpty(Data.Trim())) { - SerialData(Data); + if (SerialData != null) + { + SerialData(Data.Trim()); + } } - barcode = Data; + //是否需要判断条码的完整性 //绑定内部条码和当前条码 } diff --git a/Comprosser/FrmPrint/SerialHelper.cs b/Comprosser/FrmPrint/SerialHelper.cs index dd3fdcd..441e259 100644 --- a/Comprosser/FrmPrint/SerialHelper.cs +++ b/Comprosser/FrmPrint/SerialHelper.cs @@ -78,6 +78,7 @@ namespace FrmPrint } } } + Thread.Sleep(1); } } diff --git a/Comprosser/Mesnac.Compressor.Unity/Mesnac.Compressor.Unity.csproj b/Comprosser/Mesnac.Compressor.Unity/Mesnac.Compressor.Unity.csproj index 894b02e..3569e90 100644 --- a/Comprosser/Mesnac.Compressor.Unity/Mesnac.Compressor.Unity.csproj +++ b/Comprosser/Mesnac.Compressor.Unity/Mesnac.Compressor.Unity.csproj @@ -9,8 +9,9 @@ Properties Mesnac.Compressor.Unity Mesnac.Compressor.Unity - v4.0 + v4.5.2 512 + true @@ -20,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -28,6 +30,7 @@ TRACE prompt 4 + false diff --git a/Comprosser/Mesnac.Compressor.Unity/Properties/Resources.Designer.cs b/Comprosser/Mesnac.Compressor.Unity/Properties/Resources.Designer.cs index 9f5a7d5..f6c89d1 100644 --- a/Comprosser/Mesnac.Compressor.Unity/Properties/Resources.Designer.cs +++ b/Comprosser/Mesnac.Compressor.Unity/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 此代码由工具生成。 -// 运行时版本:4.0.30319.34209 +// 运行时版本:4.0.30319.42000 // // 对此文件的更改可能会导致不正确的行为，并且如果 // 重新生成代码，这些更改将会丢失。 @@ -19,7 +19,7 @@ namespace Mesnac.Compressor.Unity.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ namespace Mesnac.Compressor.Unity.Properties { } /// - /// 使用此强类型资源类，为所有资源查找 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Comprosser/Mesnac.HighWay.ATC.SqlSugar/serviceImpl/BaseServices.cs b/Comprosser/Mesnac.HighWay.ATC.SqlSugar/serviceImpl/BaseServices.cs index 25389ce..35bd355 100644 --- a/Comprosser/Mesnac.HighWay.ATC.SqlSugar/serviceImpl/BaseServices.cs +++ b/Comprosser/Mesnac.HighWay.ATC.SqlSugar/serviceImpl/BaseServices.cs @@ -21,9 +21,12 @@ namespace Mesnac.HighWay.ATC.SqlSugar.serviceImpl { _dbBase = new SqlSugarClient(new ConnectionConfig { - //ConnectionString = "server = 127.0.0.1; uid = sa; pwd = 123456; database = JYD_shengjie", - ConnectionString = "server = 192.168.0.254; uid = sa; pwd = 123456; database = ATJ_HS_DB", - // ConnectionString = "server = 127.0.0.1; uid = sa; pwd = 123456; database = ATJ_HS_DB", + //ConnectionString = "server = 119.45.202.115; uid = sa; pwd = haiwei@123; database = ATJ_581_DB", + + ConnectionString = "server = 192.168.1.120; uid = sa; pwd = 123456; database = ATJ_581_DB", + //ConnectionString = "server = 192.168.3.110; uid = sa; pwd = 123456; database = JYD_shengjie", + // ConnectionString = "server = 192.168.0.254; uid = sa; pwd = 123456; database = ATJ_HS_DB", + //ConnectionString = "server = 127.0.0.1; uid = sa; pwd = 123456; database = ATJ_HS_DB", DbType = DbType.SqlServer, InitKeyType = InitKeyType.Attribute, IsAutoCloseConnection = true diff --git a/Comprosser/PLCManager/PLCManager.csproj b/Comprosser/PLCManager/PLCManager.csproj index e08f48e..a9d7aba 100644 --- a/Comprosser/PLCManager/PLCManager.csproj +++ b/Comprosser/PLCManager/PLCManager.csproj @@ -9,8 +9,9 @@ Properties PLCManager PLCManager - v4.0 + v4.5.2 512 + true @@ -20,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -28,6 +30,7 @@ TRACE prompt 4 + false diff --git a/Comprosser/PLCManager/PlcHandler.cs b/Comprosser/PLCManager/PlcHandler.cs index 894a724..2d7bfcf 100644 --- a/Comprosser/PLCManager/PlcHandler.cs +++ b/Comprosser/PLCManager/PlcHandler.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Mesnac.Equips; + using Mesnac.Compressor.Entity; namespace PLCManager diff --git a/Comprosser/SocketProcess/SocketProcess.csproj b/Comprosser/SocketProcess/SocketProcess.csproj index ba2b04f..e8d4e1b 100644 --- a/Comprosser/SocketProcess/SocketProcess.csproj +++ b/Comprosser/SocketProcess/SocketProcess.csproj @@ -9,8 +9,9 @@ Properties SocketProcess SocketProcess - v4.0 + v4.5.2 512 + true @@ -20,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -28,6 +30,7 @@ TRACE prompt 4 + false diff --git a/Controls/Mesnac.Controls.Base/Mesnac.Controls.Base.csproj b/Controls/Mesnac.Controls.Base/Mesnac.Controls.Base.csproj index 9d13e7f..cde197c 100644 --- a/Controls/Mesnac.Controls.Base/Mesnac.Controls.Base.csproj +++ b/Controls/Mesnac.Controls.Base/Mesnac.Controls.Base.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.Controls.Base Mesnac.Controls.Base - v4.0 + v4.5.2 512 @@ -30,6 +30,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -38,6 +39,7 @@ TRACE prompt 4 + false diff --git a/Controls/Mesnac.Controls.Compressor/Mesnac.Controls.Compressor.csproj b/Controls/Mesnac.Controls.Compressor/Mesnac.Controls.Compressor.csproj index 773b7f4..553f382 100644 --- a/Controls/Mesnac.Controls.Compressor/Mesnac.Controls.Compressor.csproj +++ b/Controls/Mesnac.Controls.Compressor/Mesnac.Controls.Compressor.csproj @@ -9,8 +9,9 @@ Properties Mesnac.Controls.Compressor Mesnac.Controls.Compressor - v4.0 + v4.5.2 512 + true @@ -20,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -28,8 +30,13 @@ TRACE prompt 4 + false + + False + ..\..\Libraries\MXComponent\HslCommunication.dll + ..\..\Libraries\ICSharpCode.Core.dll diff --git a/Controls/Mesnac.Controls.Compressor/Properties/Resources.Designer.cs b/Controls/Mesnac.Controls.Compressor/Properties/Resources.Designer.cs index cbdc8d8..7295894 100644 --- a/Controls/Mesnac.Controls.Compressor/Properties/Resources.Designer.cs +++ b/Controls/Mesnac.Controls.Compressor/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Mesnac.Controls.Compressor.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Controls/Mesnac.Controls.Compressor/StationButton.cs b/Controls/Mesnac.Controls.Compressor/StationButton.cs index ac555ee..b7b308d 100644 --- a/Controls/Mesnac.Controls.Compressor/StationButton.cs +++ b/Controls/Mesnac.Controls.Compressor/StationButton.cs @@ -23,6 +23,9 @@ using Mesnac.Controls.Feeding; using System.Windows.Forms.Design; using Mesnac.Gui.Edit.Dialog; using System.Runtime.Serialization.Formatters.Binary; +using HslCommunication.Core; +using System.Linq; +using System.Runtime.Serialization; namespace Mesnac.Controls.Compressor { @@ -49,6 +52,7 @@ namespace Mesnac.Controls.Compressor private int dataIndex = -1; private bool FirstRead = true; + IByteTransform ByteTransform = new ReverseBytesTransform(); public StationButton() { @@ -420,8 +424,21 @@ namespace Mesnac.Controls.Compressor return; } _mcValue = value; - - StationInfo.Data = ParaFormart(objectarray, StationInfo.ParaCount); + if (StationInfo.StationName.Contains("性能测试")) + { + try + { + StationInfo.Data = SiemensParaFormart(objectarray, StationInfo.ParaCount); + } + catch (Exception ex) + { + ICSharpCode.Core.LoggingService.Debug("接收数据失败" + ex.ToString()); + } + } + else + { + StationInfo.Data = ParaFormart(objectarray, StationInfo.ParaCount); + } SetText(); if (StationInfo.Data.AskWork) { @@ -501,6 +518,115 @@ namespace Mesnac.Controls.Compressor } #region 数据解析 + public stationPara SiemensParaFormart(object[] obj, int paraCount) + { + byte[] bytes = obj.Select(o => Convert.ToByte(o)).ToArray(); + string str = Convert.ToString(Convert.ToInt32(bytes[2]), 2).PadLeft(8, '0'); + string[] items = new string[8]; + for (int i = 0; i < items.Length; i++) + { + items[i] = str[i].ToString(); + } + Array.Reverse(items); + //byte[] bools = ByteTransform.TransByte(bytes, 2,1); + isConnect = Convert.ToInt32(items[0]) == 1; + State = stateString(Convert.ToInt32(items[1])); + stationPara sinfo = new stationPara(); + int index = 0; + //ArrayList array = ConvertToBit(obj, index); + //Array(array); + //sinfo.Restart = Convert.ToInt32(bools[2]) == 1; + //sinfo.QGCT = Convert.ToInt32(bools[5]) == 1; + //NG放行 + //sinfo.ReWork = Convert.ToInt32(bools[6]) == 1; + //OK放行 + + //sinfo.DP_OpenFlag = Convert.ToInt32(bools[7]) == 1; + //是否重投 + if (sinfo.Restart) + { + //ICSharpCode.Core.LoggingService.Info(StationInfo.StationCode + ",开始重投"); + } + //是否有主线二维码 + sinfo.BarcodeUpdate = Convert.ToInt32(items[3]) == 1; + //是否有支线二维码 + sinfo.MaterialBarcodeUpdate = Convert.ToInt32(items[4]) == 1; + index++; + //自动模式 + + //重构，收到作业或放行请求才进行解析 + //PLC工作请求信号 + sinfo.AskWork = ByteTransform.TransInt16(bytes,5) > 0; + index++; + //放行请求 + sinfo.MaskID = ByteTransform.TransInt16(bytes, 7); + //Console.WriteLine(sinfo.BarcodeUpdate); + sinfo.NewFlag = newData(sinfo.MaskID); + + index += 3; + //当前机种号 + sinfo.machineID = ByteTransform.TransByte(bytes, 13); + NewMachineID = sinfo.machineID.ToString(); + + + index++; + //托盘号 + int intNum = ByteTransform.TransByte(bytes, 15); + + //支线条码状态 + index++; + bool[] bools2 = ByteTransform.TransBool(bytes, 16, 1); + ArrayList array2 = ConvertToList(bools2); + + + //数据保存区 + index++; + sinfo.ProductOkNg = ByteTransform.TransByte(bytes, 19); + + index++; + //线体代号ABC' + int gongxu = ByteTransform.TransByte(bytes, 21); + + sinfo.RFIDNo = string.Format("{0:X}", gongxu) + intNum.ToString().PadLeft(2, '0'); + + + index += 1; + //sinfo.productDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");//这里不用日期了 + if (sinfo.BarcodeUpdate || sinfo.MaterialBarcodeUpdate) + { + GetBarcodeList(bytes, index, ref sinfo); + } + + index = 180; + + for (int i = 0; i < paraCount; i++) + { + dataUnite du = new dataUnite(); + du.actValue = ByteTransform.TransSingle(bytes, index).ToString(); + + du.MaxValue = ByteTransform.TransSingle(bytes, index + 4).ToString(); + + du.MinValue = ByteTransform.TransSingle(bytes, index + 8).ToString(); + + du.result = ByteTransform.TransInt32(bytes,index + 12); + + du.Remark = ByteTransform.TransInt32(bytes, index + 16).ToString(); + + index += 20; + + sinfo.SavedataList.Add(du); + } + if (sinfo.MaskID == 1) + { + foreach (var row in sinfo.SavedataList) + { + ICSharpCode.Core.LoggingService.Debug("------------------------"); + ICSharpCode.Core.LoggingService.Debug("|生产值：" + row.actValue + "|"); + ICSharpCode.Core.LoggingService.Debug("------------------------"); + } + } + return sinfo; + } /// /// 单工位数据解析 @@ -512,7 +638,7 @@ namespace Mesnac.Controls.Compressor stationPara sinfo = new stationPara(); int index = 0; ArrayList array = ConvertToBit(obj, index); - Array(array); + Arraylist(array); sinfo.Restart = Convert.ToInt32(array[2]) == 1; sinfo.QGCT = Convert.ToInt32(array[5]) == 1; //NG放行 @@ -523,7 +649,7 @@ namespace Mesnac.Controls.Compressor //是否重投 if (sinfo.Restart) { - ICSharpCode.Core.LoggingService.Info(StationInfo.StationCode + ",开始重投"); + //ICSharpCode.Core.LoggingService.Info(StationInfo.StationCode + ",开始重投"); } //是否有主线二维码 sinfo.BarcodeUpdate = Convert.ToInt32(array[3]) == 1; @@ -543,8 +669,6 @@ namespace Mesnac.Controls.Compressor sinfo.MaskID = SingleConvertToInt(obj, index); sinfo.NewFlag = newData(sinfo.MaskID); - - index += 3; //当前机种号 sinfo.machineID = SingleConvertToInt(obj, index); @@ -598,7 +722,7 @@ namespace Mesnac.Controls.Compressor sinfo.SavedataList.Add(du); } - if (sinfo.MaskID == 1) + if (sinfo.MaskID > 0) { foreach (var row in sinfo.SavedataList) { @@ -620,6 +744,7 @@ namespace Mesnac.Controls.Compressor try { //目前只有4个支线 + sinfo.subLineList.Clear(); for (int i = 0; i <= 5; i++) { subLine sl = new subLine(); @@ -631,7 +756,7 @@ namespace Mesnac.Controls.Compressor int barcodeLegth = 10;//设置单个条码长度 if (sinfo.BarcodeUpdate) { - sinfo.ProductBarcode = Getbarcode(buffer, index, barcodeLegth); + sinfo.ProductBarcode = Getbarcode(buffer, index, barcodeLegth).Trim(); } index = index + 10; @@ -645,33 +770,33 @@ namespace Mesnac.Controls.Compressor if (i == 0)//控制器 { sinfo.subLineList[i].barcode = Getbarcode(buffer, index, barcodeLegth); - sinfo.MaterialBarcode = sinfo.subLineList[i].barcode; + sinfo.MaterialBarcode = sinfo.subLineList[i].barcode.Trim(); } if (i == 1)//壳体 { sinfo.subLineList[i].barcode = Getbarcode(buffer, 30, barcodeLegth); - sinfo.MaterialBarcode = sinfo.subLineList[i].barcode; + sinfo.MaterialBarcode = sinfo.subLineList[i].barcode.Trim(); } if (i == 2)//前盖 { sinfo.subLineList[i].barcode = Getbarcode(buffer, 40, barcodeLegth); - sinfo.MaterialBarcode = sinfo.subLineList[i].barcode; + sinfo.MaterialBarcode = sinfo.subLineList[i].barcode.Trim(); } if (i == 3)//动盘 { sinfo.subLineList[i].barcode = Getbarcode(buffer, 50, barcodeLegth); - sinfo.MaterialBarcode = sinfo.subLineList[i].barcode; + sinfo.MaterialBarcode = sinfo.subLineList[i].barcode.Trim(); } if (i == 4)//静盘 { sinfo.subLineList[i].barcode = Getbarcode(buffer, 60, barcodeLegth); - sinfo.MaterialBarcode = sinfo.subLineList[i].barcode; + sinfo.MaterialBarcode = sinfo.subLineList[i].barcode.Trim(); } if (i == 5)//后盖 { sinfo.subLineList[i].barcode = Getbarcode(buffer, 70, barcodeLegth); - sinfo.MaterialBarcode = sinfo.subLineList[i].barcode; + sinfo.MaterialBarcode = sinfo.subLineList[i].barcode.Trim(); } } @@ -687,34 +812,34 @@ namespace Mesnac.Controls.Compressor } - private void GetBarcodeList(object[] buffer, int index, ref stationPara sinfo) + private void GetBarcodeList(byte[] buffer, int index, ref stationPara sinfo) { try { - //条码个数 - int count = Convert.ToInt32(buffer[index]); - if (count <= 0) - { - return; - } - //支线条码个数 - int subcount = count - 1; //获取条码支线信息 - for (int i = 1; i <= subcount; i++) - { - subLine sl = new subLine(); - sl.lineID = buffer[index + i].ToString(); - sl.barcode = ""; - sinfo.subLineList.Add(sl); - } - int barcodeLegth = 10;//设置单个条码长度 - //获取主条码 - sinfo.ProductBarcode = Getbarcode(buffer, index + 4, barcodeLegth); + //for (int i = 1; i <= 5; i++) + //{ + // subLine sl = new subLine(); + // sl.lineID = buffer[index + i].ToString(); + // sl.barcode = ""; + // sinfo.subLineList.Add(sl); + //} + //int barcodeLegth = 10;//设置单个条码长度 - for (int i = 1; i <= subcount; i++) + //获取主条码 + byte[] bytes = new byte[20]; + Array.Copy(buffer,22,bytes,0,20); + //ByteTransform.DataFormat = HslCommunication.Core.DataFormat.DCBA; + //ByteTransform.IsStringReverseByteWord = true; + if (BitConverter.IsLittleEndian) { - sinfo.subLineList[i - 1].barcode = Getbarcode(buffer, index + 4 + i * barcodeLegth, barcodeLegth); + Array.Reverse(bytes, 0, 4); + Array.Reverse(bytes, 4, 4); + Array.Reverse(bytes, 8, 4); + Array.Reverse(bytes, 12, 4); + Array.Reverse(bytes, 16, 4); } + sinfo.ProductBarcode = ByteTransform.TransString(bytes, 0, 20, Encoding.ASCII); } catch (Exception ex) { @@ -757,25 +882,12 @@ namespace Mesnac.Controls.Compressor } return false; } - /// - /// 获取条码号 - /// - /// 数组 - /// 起始 - /// 长度 - /// - //private string Getbarcode(object[] obj, int index, int length) - //{ - // StringBuilder sb=new StringBuilder(); - // for (int i = 0; i < length; i++) - // { - // string code = SingleConvertToInt(obj , index+i).ToString(); - // code = "0000"+code; - // code = code.Substring(code.Length-4, 4); - // sb.Append(code); - // } - // return sb.ToString(); - //} + + public virtual string Getbarcode(object[] buffer, int index) + { + + return ""; + } //南京方法 private string Getbarcode(object[] buffer, int index, int len) @@ -833,7 +945,7 @@ namespace Mesnac.Controls.Compressor /// 将数据里的数据解析出来 /// /// - private void Array(ArrayList array) + private void Arraylist(ArrayList array) { try { @@ -877,7 +989,15 @@ namespace Mesnac.Controls.Compressor return 0; } } - + public ArrayList ConvertToList(bool[] obj) + { + ArrayList al = new ArrayList(); + foreach (bool b in obj) + { + al.Add(Convert.ToInt16(b)); + } + return al; + } public ArrayList ConvertToBit(object[] obj, int index) { ArrayList al = new ArrayList(); diff --git a/Controls/Mesnac.Controls.Default/Mesnac.Controls.Default.csproj b/Controls/Mesnac.Controls.Default/Mesnac.Controls.Default.csproj index 38248e1..7279759 100644 --- a/Controls/Mesnac.Controls.Default/Mesnac.Controls.Default.csproj +++ b/Controls/Mesnac.Controls.Default/Mesnac.Controls.Default.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Mesnac.Controls.Default Mesnac.Controls.Default - v4.0 + v4.5.2 512 @@ -19,6 +19,7 @@ + true @@ -28,6 +29,7 @@ DEBUG;TRACE prompt 4 + false none @@ -36,6 +38,7 @@ TRACE prompt 4 + false diff --git a/Controls/Mesnac.Controls.Feeding/Mesnac.Controls.Feeding.csproj b/Controls/Mesnac.Controls.Feeding/Mesnac.Controls.Feeding.csproj index e9d6a22..964cfec 100644 --- a/Controls/Mesnac.Controls.Feeding/Mesnac.Controls.Feeding.csproj +++ b/Controls/Mesnac.Controls.Feeding/Mesnac.Controls.Feeding.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,9 +10,10 @@ Properties Mesnac.Controls.Feeding Mesnac.Controls.Feeding - v4.0 + v4.5.2 512 - Client + + @@ -30,6 +31,7 @@ DEBUG;TRACE prompt 4 + false none @@ -38,6 +40,7 @@ TRACE prompt 4 + false diff --git a/Controls/Mesnac.Controls.Feeding/Properties/Resources.Designer.cs b/Controls/Mesnac.Controls.Feeding/Properties/Resources.Designer.cs index 01542a1..167d7e6 100644 --- a/Controls/Mesnac.Controls.Feeding/Properties/Resources.Designer.cs +++ b/Controls/Mesnac.Controls.Feeding/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 此代码由工具生成。 -// 运行时版本:4.0.30319.34209 +// 运行时版本:4.0.30319.42000 // // 对此文件的更改可能会导致不正确的行为，并且如果 // 重新生成代码，这些更改将会丢失。 @@ -19,7 +19,7 @@ namespace Mesnac.Controls.Feeding.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ namespace Mesnac.Controls.Feeding.Properties { } /// - /// 使用此强类型资源类，为所有资源查找 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Controls/Mesnac.Controls.Intake/Mesnac.Controls.Intake.csproj b/Controls/Mesnac.Controls.Intake/Mesnac.Controls.Intake.csproj index 4cfa098..e45feea 100644 --- a/Controls/Mesnac.Controls.Intake/Mesnac.Controls.Intake.csproj +++ b/Controls/Mesnac.Controls.Intake/Mesnac.Controls.Intake.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.Controls.Intake Mesnac.Controls.Intake - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +39,7 @@ TRACE prompt 4 + false diff --git a/Controls/Mesnac.Controls.Sulf/Mesnac.Controls.Sulf.csproj b/Controls/Mesnac.Controls.Sulf/Mesnac.Controls.Sulf.csproj index 41d0579..b3e6f2f 100644 --- a/Controls/Mesnac.Controls.Sulf/Mesnac.Controls.Sulf.csproj +++ b/Controls/Mesnac.Controls.Sulf/Mesnac.Controls.Sulf.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.Controls.Sulf Mesnac.Controls.Sulf - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +39,10 @@ TRACE prompt 4 + false + + + true diff --git a/Controls/Mesnac.Controls.Sulf/Properties/Resources.Designer.cs b/Controls/Mesnac.Controls.Sulf/Properties/Resources.Designer.cs index 3c391f3..55a4f76 100644 --- a/Controls/Mesnac.Controls.Sulf/Properties/Resources.Designer.cs +++ b/Controls/Mesnac.Controls.Sulf/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 此代码由工具生成。 -// 运行时版本:4.0.30319.235 +// 运行时版本:4.0.30319.42000 // // 对此文件的更改可能会导致不正确的行为，并且如果 // 重新生成代码，这些更改将会丢失。 @@ -19,7 +19,7 @@ namespace Mesnac.Controls.Sulf.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ namespace Mesnac.Controls.Sulf.Properties { } /// - /// 使用此强类型资源类，为所有资源查找 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -60,6 +60,9 @@ namespace Mesnac.Controls.Sulf.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap valveclose { get { object obj = ResourceManager.GetObject("valveclose", resourceCulture); @@ -67,6 +70,9 @@ namespace Mesnac.Controls.Sulf.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// internal static System.Drawing.Bitmap valveopen { get { object obj = ResourceManager.GetObject("valveopen", resourceCulture); diff --git a/Equips/Mesnac.Equips.Connection/Mesnac.Equips.Connection.csproj b/Equips/Mesnac.Equips.Connection/Mesnac.Equips.Connection.csproj index 8035ff5..4e642ce 100644 --- a/Equips/Mesnac.Equips.Connection/Mesnac.Equips.Connection.csproj +++ b/Equips/Mesnac.Equips.Connection/Mesnac.Equips.Connection.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Mesnac.Equips.Connection Mesnac.Equips.Connection - v4.0 + v4.5.2 512 @@ -19,6 +19,7 @@ + true @@ -28,6 +29,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -36,6 +38,7 @@ TRACE prompt 4 + false diff --git a/Equips/Mesnac.Equips/Mesnac.Equips.csproj b/Equips/Mesnac.Equips/Mesnac.Equips.csproj index 13eb63a..72a3b40 100644 --- a/Equips/Mesnac.Equips/Mesnac.Equips.csproj +++ b/Equips/Mesnac.Equips/Mesnac.Equips.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Mesnac.Equips Mesnac.Equips - v4.0 + v4.5.2 512 @@ -29,6 +29,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +38,7 @@ TRACE prompt 4 + false diff --git a/Equips/Mesnac.Maths/Mesnac.Maths.csproj b/Equips/Mesnac.Maths/Mesnac.Maths.csproj index cbdd806..5725cb0 100644 --- a/Equips/Mesnac.Maths/Mesnac.Maths.csproj +++ b/Equips/Mesnac.Maths/Mesnac.Maths.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Mesnac.Maths Mesnac.Maths - v4.0 + v4.5.2 512 @@ -19,6 +19,7 @@ + true @@ -28,6 +29,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -36,6 +38,7 @@ TRACE prompt 4 + false diff --git a/Libraries/Host/Host.csproj b/Libraries/Host/Host.csproj index 752916a..1de5cf9 100644 --- a/Libraries/Host/Host.csproj +++ b/Libraries/Host/Host.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Host Host - v4.0 + v4.5.2 512 publish\ true @@ -46,6 +46,7 @@ prompt 4 AllRules.ruleset + false none @@ -55,6 +56,7 @@ prompt 4 AllRules.ruleset + false diff --git a/Libraries/Loder/Loder.csproj b/Libraries/Loder/Loder.csproj index cb3ebbe..f3f95c9 100644 --- a/Libraries/Loder/Loder.csproj +++ b/Libraries/Loder/Loder.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Loder Loder - v4.0 + v4.5.2 512 publish\ true @@ -46,6 +46,7 @@ prompt 4 AllRules.ruleset + false none @@ -55,6 +56,7 @@ prompt 4 AllRules.ruleset + false diff --git a/Libraries/MXComponent/HslCommunication.dll b/Libraries/MXComponent/HslCommunication.dll new file mode 100644 index 0000000..9d08332 Binary files /dev/null and b/Libraries/MXComponent/HslCommunication.dll differ diff --git a/Libraries/MXComponent/Newtonsoft.Json.dll b/Libraries/MXComponent/Newtonsoft.Json.dll new file mode 100644 index 0000000..55d537f Binary files /dev/null and b/Libraries/MXComponent/Newtonsoft.Json.dll differ diff --git a/Libraries/Mesnac.Codd/Mesnac.Codd.csproj b/Libraries/Mesnac.Codd/Mesnac.Codd.csproj index aa30a92..d6cc239 100644 --- a/Libraries/Mesnac.Codd/Mesnac.Codd.csproj +++ b/Libraries/Mesnac.Codd/Mesnac.Codd.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Mesnac.Codd Mesnac.Codd - v4.0 + v4.5.2 512 @@ -29,6 +29,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +38,7 @@ TRACE prompt 4 + false diff --git a/Libraries/Mesnac.Communication/Mesnac.Communication.csproj b/Libraries/Mesnac.Communication/Mesnac.Communication.csproj index 0ada363..35f2c85 100644 --- a/Libraries/Mesnac.Communication/Mesnac.Communication.csproj +++ b/Libraries/Mesnac.Communication/Mesnac.Communication.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.Communication Mesnac.Communication - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +39,7 @@ TRACE prompt 4 + false diff --git a/Libraries/Mesnac.Docking/Mesnac.Docking.csproj b/Libraries/Mesnac.Docking/Mesnac.Docking.csproj index 5118be7..d3b2656 100644 --- a/Libraries/Mesnac.Docking/Mesnac.Docking.csproj +++ b/Libraries/Mesnac.Docking/Mesnac.Docking.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.Docking Mesnac.Docking - v4.0 + v4.5.2 512 @@ -30,6 +30,7 @@ DEBUG;TRACE prompt 4 + false none @@ -38,6 +39,7 @@ TRACE prompt 4 + false diff --git a/Libraries/Mesnac.UI.ToolBox/Mesnac.UI.ToolBox.csproj b/Libraries/Mesnac.UI.ToolBox/Mesnac.UI.ToolBox.csproj index 311a5f8..6ad81dc 100644 --- a/Libraries/Mesnac.UI.ToolBox/Mesnac.UI.ToolBox.csproj +++ b/Libraries/Mesnac.UI.ToolBox/Mesnac.UI.ToolBox.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.UI.ToolBox Mesnac.UI.ToolBox - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +39,7 @@ TRACE prompt 4 + false diff --git a/Libraries/OpcDaNet/OpcDaNet.csproj b/Libraries/OpcDaNet/OpcDaNet.csproj index db23e60..0f48e19 100644 --- a/Libraries/OpcDaNet/OpcDaNet.csproj +++ b/Libraries/OpcDaNet/OpcDaNet.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties OpcDaNet OpcDaNet - v2.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false none @@ -37,6 +39,7 @@ TRACE prompt 4 + false diff --git a/Libraries/PropertyGridEx/PropertyGridEx.csproj b/Libraries/PropertyGridEx/PropertyGridEx.csproj index 91ec401..1e4c8f8 100644 --- a/Libraries/PropertyGridEx/PropertyGridEx.csproj +++ b/Libraries/PropertyGridEx/PropertyGridEx.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties PropertyGridEx PropertyGridEx - v4.0 + v4.5.2 512 @@ -30,6 +30,7 @@ DEBUG;TRACE prompt 4 + false none @@ -38,6 +39,7 @@ TRACE prompt 4 + false diff --git a/Main/MCBackView/App.config b/Main/MCBackView/App.config index f1e68ce..053bf70 100644 --- a/Main/MCBackView/App.config +++ b/Main/MCBackView/App.config @@ -1,80 +1,80 @@ - + -
+
- + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - + + + - + - - + + - + - + - + - \ No newline at end of file + diff --git a/Main/MCBackView/MCBackView.csproj b/Main/MCBackView/MCBackView.csproj index 51a6bb9..123df14 100644 --- a/Main/MCBackView/MCBackView.csproj +++ b/Main/MCBackView/MCBackView.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties MCBackView MCBackView - v4.0 + v4.5.2 512 @@ -32,6 +32,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -41,6 +42,7 @@ TRACE prompt 4 + false diff --git a/Main/MCBackView/Properties/Resources.Designer.cs b/Main/MCBackView/Properties/Resources.Designer.cs index ff6ace2..81def41 100644 --- a/Main/MCBackView/Properties/Resources.Designer.cs +++ b/Main/MCBackView/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 此代码由工具生成。 -// 运行时版本:4.0.30319.34014 +// 运行时版本:4.0.30319.42000 // // 对此文件的更改可能会导致不正确的行为，并且如果 // 重新生成代码，这些更改将会丢失。 @@ -19,7 +19,7 @@ namespace MCBackView.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ namespace MCBackView.Properties { } /// - /// 使用此强类型资源类，为所有资源查找 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Main/MCBackView/Properties/Settings.Designer.cs b/Main/MCBackView/Properties/Settings.Designer.cs index d74d7a6..3c51c7c 100644 --- a/Main/MCBackView/Properties/Settings.Designer.cs +++ b/Main/MCBackView/Properties/Settings.Designer.cs @@ -1,18 +1,18 @@ //------------------------------------------------------------------------------ // // 此代码由工具生成。 -// 运行时版本:4.0.30319.34014 +// 运行时版本:4.0.30319.42000 // // 对此文件的更改可能会导致不正确的行为，并且如果 // 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ -namespace MCRun.Properties { +namespace MCBackView.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Main/MCEdit/App.config b/Main/MCEdit/App.config index cb0431d..0667711 100644 --- a/Main/MCEdit/App.config +++ b/Main/MCEdit/App.config @@ -31,13 +31,25 @@ - + - + + + + + + + + + + diff --git a/Main/MCEdit/Data/MCProject/Project1.mprj b/Main/MCEdit/Data/MCProject/Project1.mprj index dc76f01..aa2e9a0 100644 --- a/Main/MCEdit/Data/MCProject/Project1.mprj +++ b/Main/MCEdit/Data/MCProject/Project1.mprj @@ -7,54 +7,30 @@ - - + + - - - + + + - - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/Main/MCEdit/Data/MCProject/nodeDataSource.xml b/Main/MCEdit/Data/MCProject/nodeDataSource.xml index 43631e7..b6186df 100644 --- a/Main/MCEdit/Data/MCProject/nodeDataSource.xml +++ b/Main/MCEdit/Data/MCProject/nodeDataSource.xml @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/nodeDevice.xml b/Main/MCEdit/Data/MCProject/nodeDevice.xml index 76d61f5..ad27371 100644 --- a/Main/MCEdit/Data/MCProject/nodeDevice.xml +++ b/Main/MCEdit/Data/MCProject/nodeDevice.xml @@ -1,20 +1,19 @@  - +
- +
- - + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/100静盘排气阀片安装.xml b/Main/MCEdit/Data/MCProject/nodeForm/100静盘排气阀片安装.xml new file mode 100644 index 0000000..87f1516 --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/100静盘排气阀片安装.xml @@ -0,0 +1,37 @@ + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59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 + + 56:静盘排气阀片安装 + A13.B1.D1 + False + False + 12, 12 + StationButton1 + 133, 105 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + True + False + Control + Sizable + 600, 401 + WindowsDefaultLocation + 100静盘排气阀片安装 + Normal + + Tile + 宋体, 9pt + ControlText + 100静盘排气阀片安装 + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/B10动静盘配对.xml b/Main/MCEdit/Data/MCProject/nodeForm/120_1动静盘拍照.xml similarity index 97% rename from Main/MCEdit/Data/MCProject/nodeForm/B10动静盘配对.xml rename to Main/MCEdit/Data/MCProject/nodeForm/120_1动静盘拍照.xml index 9622723..6d5bb42 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/B10动静盘配对.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/120_1动静盘拍照.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,8 +7,8 @@ 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 - 41:静盘组件安装 - A1.B1.D1 + 60:动静盘拍照 + A16.B1.D1 True True 12, 12 @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - B10动静盘配对 + 120_1动静盘拍照 Normal Tile 宋体, 9pt ControlText - B10动静盘配对 + 120_1动静盘拍照 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/B140控制器装配.xml b/Main/MCEdit/Data/MCProject/nodeForm/160后盖螺栓紧固.xml similarity index 97% rename from Main/MCEdit/Data/MCProject/nodeForm/B140控制器装配.xml rename to Main/MCEdit/Data/MCProject/nodeForm/160后盖螺栓紧固.xml index bd1f155..b1ea56c 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/B140控制器装配.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/160后盖螺栓紧固.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,8 +7,8 @@ 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 - 60:控制器装配 - A21.B1.D1 + 64:后盖螺栓紧固 + A20.B1.D1 False False 12, 12 @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - B140控制器装配 + 160后盖螺栓紧固 Normal Tile 宋体, 9pt ControlText - B140控制器装配 + 160后盖螺栓紧固 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/B150控制器拧紧螺丝机.xml b/Main/MCEdit/Data/MCProject/nodeForm/180接线柱螺栓紧固.xml similarity index 97% rename from Main/MCEdit/Data/MCProject/nodeForm/B150控制器拧紧螺丝机.xml rename to Main/MCEdit/Data/MCProject/nodeForm/180接线柱螺栓紧固.xml index baca94a..2a2d9dd 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/B150控制器拧紧螺丝机.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/180接线柱螺栓紧固.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,7 +7,7 @@ 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 - 61: 控制器装配螺丝机 + 66:接线柱螺栓紧固 A22.B1.D1 False False @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - B150控制器拧紧螺丝机 + 180接线柱螺栓紧固 Normal Tile 宋体, 9pt ControlText - B150控制器拧紧螺丝机 + 180接线柱螺栓紧固 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/190_1氦气检漏.xml b/Main/MCEdit/Data/MCProject/nodeForm/190_1氦气检漏.xml new file mode 100644 index 0000000..1045084 --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/190_1氦气检漏.xml @@ -0,0 +1,37 @@ + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59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 + + 67:氦气检漏1 + A23.B1.D1 + False + False + 12, 12 + StationButton12 + 133, 105 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEZFMUNDRDMxRThFOTQwQjRCMEEzQzM2RUFCMkVEQUNEBgYAAAAM5p2h56CB5omr5o+PBgcAAAAM5p2h56CB5omr5o+PCw== + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + True + False + Control + Sizable + 600, 401 + WindowsDefaultLocation + 190_1氦气检漏 + Normal + + Tile + 宋体, 9pt + ControlText + 190_1氦气检漏 + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/190控制器检漏.xml b/Main/MCEdit/Data/MCProject/nodeForm/190控制器检漏.xml deleted file mode 100644 index bde2e20..0000000 --- a/Main/MCEdit/Data/MCProject/nodeForm/190控制器检漏.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - 0 - 0 - True - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - - False - - - - None - True - True - - 172, 69 - MCTextBox1 - 295, 21 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59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 - - 26:190控制器检漏 - B25.B1.D1 - False - False - 12, 12 - StationButton25 - 133, 105 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEZFMUNDRDMxRThFOTQwQjRCMEEzQzM2RUFCMkVEQUNEBgYAAAAM5p2h56CB5omr5o+PBgcAAAAM5p2h56CB5omr5o+PCw== - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - True - False - Control - Sizable - 600, 401 - WindowsDefaultLocation - 190控制器检漏 - Normal - - Tile - 宋体, 9pt - ControlText - 190控制器检漏 - diff --git a/Main/MCEdit/Data/MCProject/nodeForm/B160性能测试2.xml b/Main/MCEdit/Data/MCProject/nodeForm/20电机壳组件绝缘测试.xml similarity index 97% rename from Main/MCEdit/Data/MCProject/nodeForm/B160性能测试2.xml rename to Main/MCEdit/Data/MCProject/nodeForm/20电机壳组件绝缘测试.xml index 987f10a..45cb2d0 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/B160性能测试2.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/20电机壳组件绝缘测试.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,8 +7,8 @@ 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 - 63:在线性能测试2 - A24.B1.D1 + 41:电机壳组件绝缘测试 + A2.B1.D1 False False 12, 12 @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - B160性能测试1 + 20 电机壳组件绝缘测试 Normal Tile 宋体, 9pt ControlText - B160性能测试2 + 20 电机壳组件绝缘测试 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/180控制器螺栓禁固.xml b/Main/MCEdit/Data/MCProject/nodeForm/210控制器螺栓禁固.xml similarity index 97% rename from Main/MCEdit/Data/MCProject/nodeForm/180控制器螺栓禁固.xml rename to Main/MCEdit/Data/MCProject/nodeForm/210控制器螺栓禁固.xml index dfbb233..4b3ade6 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/180控制器螺栓禁固.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/210控制器螺栓禁固.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,8 +7,8 @@ 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 - 25:180控制器螺栓禁固 - B24.B1.D1 + 69:控制器螺栓紧固 + A25.B1.D1 False False 12, 12 @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - 180控制器螺栓禁固 + 210控制器螺栓禁固 Normal Tile 宋体, 9pt ControlText - 180控制器螺栓禁固 + 210控制器螺栓禁固 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/B160性能测试1.xml b/Main/MCEdit/Data/MCProject/nodeForm/220_1整机称重.xml similarity index 97% rename from Main/MCEdit/Data/MCProject/nodeForm/B160性能测试1.xml rename to Main/MCEdit/Data/MCProject/nodeForm/220_1整机称重.xml index 5a5ab12..44b3bf4 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/B160性能测试1.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/220_1整机称重.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,8 +7,8 @@ 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 - 62:在线性能测试1 - A23.B1.D1 + 71:整机称重 + A26.B1.D1 False False 12, 12 @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - B160性能测试1 + 220_1整机称重 Normal Tile 宋体, 9pt ControlText - B160性能测试1 + 220_1整机称重 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/220控制器检漏.xml b/Main/MCEdit/Data/MCProject/nodeForm/220控制器检漏.xml new file mode 100644 index 0000000..d4c3bea --- /dev/null +++ b/Main/MCEdit/Data/MCProject/nodeForm/220控制器检漏.xml @@ -0,0 +1,37 @@ + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + + iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59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 + + 70:控制器腔体检漏，称重 + A26.B1.D1 + False + False + 12, 12 + StationButton25 + 133, 105 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAADAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL + + True + False + Control + Sizable + 600, 401 + WindowsDefaultLocation + 220控制器检漏 + Normal + + Tile + 宋体, 9pt + ControlText + 220控制器检漏 + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/200整机翻转.xml b/Main/MCEdit/Data/MCProject/nodeForm/230_1性能测试1.xml similarity index 97% rename from Main/MCEdit/Data/MCProject/nodeForm/200整机翻转.xml rename to Main/MCEdit/Data/MCProject/nodeForm/230_1性能测试1.xml index 71499aa..5dc03c8 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/200整机翻转.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/230_1性能测试1.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,8 +7,8 @@ iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59eYLT6Kp3DH7BRqgErVX4ZnSBXeaZdtezIYp8aqLYNXivDb8dqNvpfS8Ql5gAr3estRHyaNqzhP8bnbOE77PRFLUMBEVfy+/tHuFv2Ug9mMFl2uCdV+Iwtd20r0pk5hAj0TdkWkLgycL/cvYFvtNGqAD94qe6VLtAnghPsLufBVHm8xPlrsEv2vDbgbrN3vfyf0Lcb+bJ3nF+UPniNP0x3m+yHplucG1caGpdPJnA19qojLt5DEJd/1xK9wvC84VnC98pzLn319pofUwzYHjVGBnI98y+z9kIHdTtDwYab47pAzESAv1vFJLCv1UYjx2zPybxHV9ujC+zETaEBjh2eUqR40fsE8yCKPMaRVL9J+aa0OrUnKJ8yWRQSO84fP2ejAcNxHnnQAxDPyCnwTBPFmLEH22SHZZmMTTG4Z33LpPoQMzBnyL9QvhMk1JoZW9QeI941ecIj7czOIfAIHG6021PH3hQTfsa4aNsTw/msVwm9K7HPXYxE4rcfLlAvA68xidF8hjK4Xc/G8wX/YseBOJqliPADkSZr0uUuwbPseHXR9P+afQdpLzAZChky00zvrYnkwLF8eUh3sLDTLKP8px7aIyWGAjN2KA46Tm3ZCtv9WmdysNLTUKh0X9PDpJ1cLMUG6OchepiEeMG4k9MsjI0IONdcA3eJsTtJaiCO8eT5xIh874vC6eWZaecXXsgynxnotw1+EQbfn007VeS7yCQAGGXbsxPM+DTTapD2RvQlJqHpv39RDbm0KVfZiByv9W3msQQ6hl453zZJJDBG8sV/eEBdV7DUmiQkfu/Svh14Q+ETLNKFbDd5yobiO+aVGVo/tW7YC3yY2VeiKs7nmLCShNhb9obhN54OfJFP9JGGYUo8omJYtfgt2349dG0vyP0nqRQpxcB6uJ6crD/FAVN+6lEJqYb3DuCfFzhBybRYZmByE19iKkQM/GYU8DbbVTGLQV7l08btYYCo3C7jTWX3d+nbCA+aFIVoYpYmnNtQgwD+enZrv8RNO0LhaXViSknZzREmc9JlLsGt1dBqXUJ3ncA+095TVnnUp63D1xzfbp5sj8ziTzy2a8HTKLDMgNRCurNZVcfoIFNTwa+xqTmQadqc36/HruVrWUDcaFJVYKmMufmkKfyFuEpdqXNoK7fVG9ishUVZV4jQNnY8OtjuAIykHjMsBdFeX79EpNS5JX8pyaRB2s9/HNrGQjccu+cJfyRjcq4b06OxTzXpKZDM0hjBVJMp/EsiOvkpjdTDcR5JlUBuOLjqamlJLbgB7GWQqcdN9v4JX7dzhiFKPOtiXJvyp8Lqy8mc6FRc+/zwxtMqo9yTv5Kk1LkYxvwMSblI+9K32kSHZYZiJq/227eToDPl4FvM6np0DiDNxYkC4R33FWz5g3fVANRMTiu9eneRTYh6dE32hXqQ921UmUg/LFJFyGKTAXlL0yxa/ErNvz60Kmb9/mhH0QsTzOYo3epsPL4fskzKOfp+3ERkDcQnzeJIbQmwjuH+oLQfGgquzYCZaN7azZD4kEzR7kirg+bVB87YyC0PNW7wKYcTbHwJYsinS78C+FVKJXwRuGVwj8TlrtK6Y/Au3bM0UClXOePhZ6Sb8LtLNBS7y9XyEY6s1T8VJpmvM6kkCsFNT9hUkOUsx8Xm1QHLRzyZL9lEkNont87h+zY8kyDeqmlDNr0v6+Wp3tjwGG9hLZPyBnvLRoInc/n6vY3YdEFE+U5TniR8D9MmXK8V5ifS01btTjaMUmucXV0zRp8SFiO7tdCWXmH1XwxytOMOOWHt5GLT5E5GQaDWYdQNlxavBOjnC0ZrkUAWkWZC6wzNRoPiucKh3T1ozcuxEPmAeVX7fbTyqWMyKtMqgPGx5eFWzUQLMn1Bt+EV9voLkRxnia82RRpKku5dp4U3n0EFg2EjP0oYe0VnP9kw68PTRl7nxt2Jc2gaZ8ifHlE1lbkKmXZ3xk5LQf25CAZKn5LLxEylyaNVwp4dz/yGFoK7ckH8rcmo8K/neLrcmlPHmI88EwuFbLMmyXWVAhTCEhZOEFU3H/PYDGNHVugxXEMEfeAQSGATn+UzutRI+adCwlcUo1JmprvjtWiperlLRkItfBLF7fkSCQ9G7QSxXmu8O5IkabyQaG/IrJc9AOL1W4y7nnRdWpRqxbXhjZ2zT09+eH2pxflWILHS+xMzsXtLRmjqWQJ8sNt1D60cbF3jseuoIun+OZNi/7IRusjX3U5Rv4unS7US8d2bQ1WNhCl2volxNXsp8ciiNI8WTilUpGGLZ8V0hvyGuE3hOz/gA3VRzk63KWtMpBxb7DxaxFvZPMquynIz79hv2O1FujMTWP3q/HmpZg98iQvZ3bycYiU/YpPfQLnUr1TmG+aox5R6ame40ttBMZ4qRBPy5PzmLteV1uzmoEoR2iX8gob3YUozZgiflH4XBPvQfafIvy4bfZR9iC+alIuZEyMFulI736W0r/PNVAuuunPbXU64cmNse8RqifBdGOOsUGWc8ab0mi9wJTWAl5JOF2kLhcu8YyHWZUYGmic2/Kg3+lM40WlZdiBBI/pNOUd66bwKxqIqVZ6KkmLDedwBlGaMxIlSnnZWNpIZPypQrlQpthKTcZ8d3QPtfh7Nvy60Pmq95khEfB+4G1Zs5J8Pb+m7mg7yEpKr3s5c2sWNDHfn/eOE83MUKiEW54+SZk6ETfIt7LTqRcZFGIDOUPGfsYnDkEX9tEXG+39RrWLE+uE6KrmTe9Y8s11WVc07PWpcQ3iDGnRFPdDkFYb92g8Jz4e2C2oW8VArOM9+EEngyhNqREsAcvjTHQexj/LC01yALkmwcl77B5qcZu1DzwtvVw+HGZQ2OfLlji9wE2VmmtAdynzIjCWTh/gPEMToClLjAafiUBtvSmgvrls2biq4Jw7nHZpv8/wd4gZB47x5jwZuPAz5tfOLyXeQzZTIEpzUqJEKc9QyXkwa85Ldbx7gt8xURdy3TVesXeWDX+IQxxAqGVZEmwp8TIb3YUoTelVdv8pHM5Lc1HuGOrCefcTmK2fkGueIKztPdxswx/iEAcU69Q9FFtoi+KUmrD49QJa+n2abfXRtL8rHPOCbirFNOS6H0juowYPvYdDHGBomosAiqdQS3mTjZ6FKE6pWvI6E+ujK5ghSv9pIfl7Al5TFub8SJitnpNrPl9YO3NRzJYc4hC7j8066uY4uhhLlIciJ0+pYM6DYJHPkka5RIJ9z0Mg13uEMNRV1CKLvF5glziEBw3GMSUMHKYol0CbDoUxS/00KcDqrr8EvMO0G+PNtrePpn1OJAPrBWtXx3jF4VySax7tHp0oU8q7TWwI0jTz4iV4F8+xs13I9f42uX4Nbq/u4aBCY1/x3yq/AnQO+is5/X6aQEusu+vPxbDvpd9RSn+z3XUKwfvdgqZiapdV55fgRnAUKmX+6Uv56/jbm+hQTKVbMbAp17kguW4NUjY+mj8/qqHeHsVJgcSIyOGz9iHsS1vxE0OKz4nJQiU/nanrKIIcKe6hgdD98XgwzXalx2G+03M/dsdDC4PhjZFWmVIvkcpUe01kPZTbZy2l72YlEAUqTTFgsQJTrsNKQro1sxiGJrYUoVD0Q4s1foij1XlyjUbICkvv+ptwWeuxowlD76DGaxkphPKyW7FBoCrRMxB9b2E6/ae9To8oPAty2my3f+4c5peu7xvq1z7AZ9joRYgS3ZEoVUoChm6JdQ3I2CzGqh2UhPkuR79KGBoIyHJuypJpADOFXsn4sEWhPhzCcbxLz0Ccuff/PtM1GulxmPNa8ITic3W9kT9GahxZeZrK9Lt17TvGG18s4fdt9FGIIk1ZDPVvwqoLnGS8Y4VrlFJDMjPLqvqONgwNBGsIcMEJDEKewPwGwzakTJuFX2Gb5dBpcxnv3Ztxm0HWRqwbg9B7j0u1f2JHfBzIGISu+49vugY/ZqOPQhTpryLFKvGrwirzeRnn2cJSefcmZLXmdtZbHAR4AUh9iodt5u+eDIu3wjZLqmma3JdJ0e9veZowXn7O0zrnBSw1EOmCqfvtiI8DaiBIt8Q3XYP5lFICUSZaynmK5pEn84vt1NmQc3m3xeXCsbjHJtxep+qDAF/5WUcQgsss5CJwmcqElZF0bw5rEvoyKcabt+DC460wXsy0Q3V6/PGDwjpdW5GuvDwqDQQNOuKbrsFiOjGGKBSu/l2Rgk0hfSnPEo7mkUXmCcJXC6nY/B+hN14tvt0ue4iAnGL3I/9pC7V4W/tWjBkIFjT1j3vEQNQJUvrt7zoDERmXiGknbKZOqcxjbYQdgM7zaqc37x9bmp1CFGtpLABPgEa2Vwj/UsgCK8b6kPBaIbGL2t2oc8wW2MgxemxSY0Hj3SM5cvn/qbavxKeZOPJMjficNMphyoXRoyz8ySaye/A9iDg2MIXUsIwZCGIV4RhL/LlO/EIfxkBmcwPRnyLFjA2Ed3wKdyiLoWvXvZvchPlgUAbyA8f1X9PtX5vFV63J8bdEskdeCMN50X6PZFdYdo4X1AqDsWMh2beFdOC6T7idDlVLsD0DcW50TN/14WcxeGrj6udIRTFP+kC22d/V0egYIYAae0JHnYEotSRbyo/a6LMgP/I13ly1DQ7bs0eQ47xTAyUmfhLKuAf9M2Vf+Pwfsl17kO3HCfGEOPYvwlPt0B5ke4dcUge+gaBYKW5Q88no/+k2tS08yMYMBD1U8Q7gi2zftCxGjL4nMrxOCi3CC7KxgeBzLmG2R8n2UX7vwVIuet+D/NCPF47VROwSyVa82m4/C5Fh+oM87/EIKd0/sMNHIPtCVqU3pmzTe5P9NM5Z53XyayKn2F2TVqa46Vu+eQds6EJFZ6XQHCWWKSsu6BsIainIjHh1EDHT5rF4L+zPZUB8A+FBC/fia+14KnzzTr8etSXWAogCvFi4RkVjbdI4d7R4S2ReIGRagOdAMDas9bjIRPYg28QoQmv9I96F/J+pRSjiWpy92Vf4HsTJ0TZFep4Mr2QM2yj1pgYCopR1gpQB8wwEU5XxMXcC06K+S/hMu8IiiCLwwpygiLtIPIJRt55ArcgxJeCcPY9B/g3NcdJpBIaE/XfZrj3IdujV+eDcwO/OwFd+GNYeMN3w1mswZQjbxAHmGQgqLYeVixgIby1GzHS6E9aF5F6ek5ti4HmkTPuj4tWkMp+2EfYZ5aamS8mKtvFuTyMQheBVeyjGLpEYwmBqkIPIhtf14QEQUAxBRfZdb2J7kO0QxPys7dqDbJOeZf+9tuvggb6VqtyBw9S09pNEeQK9180Nqy1TaMdriqq81D1FVFr+r7U/wSC8cm9fQL0YRDzGHO5IkFIXOHk3uAl/aKNvDFEKlGaNNRJzyYpM7mXy/F9kiaeE2g48DoqzIOlJ9t1monuQ7X+w/b1XEso27fzDffSCkwcC6gWkT0iP3xPGv6PwivsxvsKuxLWYOsRLrlN2QcqmfU+0n9W+3d+2noGI+z4EpjE/Xs2XyrzJRthn9L+kWvymjV4FohTEJEodp9YkT3s8mdmBJDknZCR6L6eRbV4ryH4M35FO3fL/8BkHcQbZF6Yp3M9ecZiQeAZjPdvEdhNDZavNrnV7X1FplEy7+luifbGBYEqDTDjWZaJqGQgPBywGseQ9CGOs3tZdlICnMcVPtd+P6RHF5QU9LP9e1GpfzqNLNxWbsLeiVbbpWBVqGfZ6dcq/vJwnXHvgpcg+akSCkUi5Yyv/Emgr+fQJGZMn6P1C77dEiTVTAO+8wK5iVz0I4ge8w0JjRKU0Z3+tB8u1tQ3hoYEw8Fap/s3W4GoBFlEG6gmoIpzyer45pOiIqsvzhRsvBpMxCDiS0nTb9ct+YhMc36t+5F/bzqZMLeCJN4VHc5kQg0mDm2JD4J0Gc//hMmtWY8bTBNZrMBUef+OWh7KB4J0R8fLwG23/GdE++CtrINZIcS4qkpoLUQyUEGPB037qOg4qNSk4ul6IkmEQDq6CHQRopzKUAlKVSGEejX3S3x41Dzpd0HdUpsephWiFlwhpbhTGfMreOTlMLZTS+gTGu1CYXrtcuJQzEN09xsRjisfmO0llurjKviL/yrFNWHyV3VoQRWcawpwcEtijMzXE3cdFX1yKbOefs+M80W53tzAeg2D1JUrTf3OUvoWL1++PNSYuvz5uuoEg/RmPG0icovzbyRuIeJw53Jkshndzm3JZR+Adhimg55HsEjd4EeuK6BsIukiRMWABFQFE+keOvcmb1+qxxoKiKZT4DmG8xHpNA8G9nm0SeRyVBuKYY/4fUOFTtlVpoggAAAAASUVORK5CYII= - 27:200整机翻转 - C30.B1.D1 + 72:性能测试 + A27.B1.D1 False False 12, 12 @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - 200整机翻转 + 230_1性能测试1 Normal Tile 宋体, 9pt ControlText - 200整机翻转 + 230_1性能测试1 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/210整机称重、注油.xml b/Main/MCEdit/Data/MCProject/nodeForm/240整机称重、注油.xml similarity index 97% rename from Main/MCEdit/Data/MCProject/nodeForm/210整机称重、注油.xml rename to Main/MCEdit/Data/MCProject/nodeForm/240整机称重、注油.xml index 062f53a..8c0a1a2 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/210整机称重、注油.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/240整机称重、注油.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,8 +7,8 @@ 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 - 28:210整机称重、注油 - C31.B1.D1 + 73:整机注油、称重 + A28.B1.D1 False False 12, 12 @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - 210整机称重、注油 + 240整机称重、注油 Normal Tile 宋体, 9pt ControlText - 210整机称重、注油 + 240整机称重、注油 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/220整机绝缘测试和法兰安装.xml b/Main/MCEdit/Data/MCProject/nodeForm/250_1螺栓紧固.xml similarity index 96% rename from Main/MCEdit/Data/MCProject/nodeForm/220整机绝缘测试和法兰安装.xml rename to Main/MCEdit/Data/MCProject/nodeForm/250_1螺栓紧固.xml index d6cf8a4..ce622e5 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/220整机绝缘测试和法兰安装.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/250_1螺栓紧固.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,8 +7,8 @@ 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 - 29:220整机绝缘测试和法兰安装 - C32.B1.D1 + 73:螺栓紧固 + A29.B1.D1 False False 12, 12 @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - 220整机绝缘测试和法兰安装 + 250_1螺栓紧固 Normal Tile 宋体, 9pt ControlText - 220整机绝缘测试和法兰安装 + 250_1螺栓紧固 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/230性能测试.xml b/Main/MCEdit/Data/MCProject/nodeForm/270绝缘测试.xml similarity index 97% rename from Main/MCEdit/Data/MCProject/nodeForm/230性能测试.xml rename to Main/MCEdit/Data/MCProject/nodeForm/270绝缘测试.xml index 15819e7..d049458 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/230性能测试.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/270绝缘测试.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,8 +7,8 @@ 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 - 55:性能检测1 - A21.B1.D1 + 75:绝缘测试 + A31.B1.D1 False False 9, 12 @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - 230性能测试 + 270绝缘测试 Normal Tile 宋体, 9pt ControlText - 230性能测试 + 270绝缘测试 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/B70定子热套.xml b/Main/MCEdit/Data/MCProject/nodeForm/80_1前盖轴封检漏.xml similarity index 97% rename from Main/MCEdit/Data/MCProject/nodeForm/B70定子热套.xml rename to Main/MCEdit/Data/MCProject/nodeForm/80_1前盖轴封检漏.xml index e0d6892..09a9308 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/B70定子热套.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/80_1前盖轴封检漏.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,8 +7,8 @@ iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59eYLT6Kp3DH7BRqgErVX4ZnSBXeaZdtezIYp8aqLYNXivDb8dqNvpfS8Ql5gAr3estRHyaNqzhP8bnbOE77PRFLUMBEVfy+/tHuFv2Ug9mMFl2uCdV+Iwtd20r0pk5hAj0TdkWkLgycL/cvYFvtNGqAD94qe6VLtAnghPsLufBVHm8xPlrsEv2vDbgbrN3vfyf0Lcb+bJ3nF+UPniNP0x3m+yHplucG1caGpdPJnA19qojLt5DEJd/1xK9wvC84VnC98pzLn319pofUwzYHjVGBnI98y+z9kIHdTtDwYab47pAzESAv1vFJLCv1UYjx2zPybxHV9ujC+zETaEBjh2eUqR40fsE8yCKPMaRVL9J+aa0OrUnKJ8yWRQSO84fP2ejAcNxHnnQAxDPyCnwTBPFmLEH22SHZZmMTTG4Z33LpPoQMzBnyL9QvhMk1JoZW9QeI941ecIj7czOIfAIHG6021PH3hQTfsa4aNsTw/msVwm9K7HPXYxE4rcfLlAvA68xidF8hjK4Xc/G8wX/YseBOJqliPADkSZr0uUuwbPseHXR9P+afQdpLzAZChky00zvrYnkwLF8eUh3sLDTLKP8px7aIyWGAjN2KA46Tm3ZCtv9WmdysNLTUKh0X9PDpJ1cLMUG6OchepiEeMG4k9MsjI0IONdcA3eJsTtJaiCO8eT5xIh874vC6eWZaecXXsgynxnotw1+EQbfn007VeS7yCQAGGXbsxPM+DTTapD2RvQlJqHpv39RDbm0KVfZiByv9W3msQQ6hl453zZJJDBG8sV/eEBdV7DUmiQkfu/Svh14Q+ETLNKFbDd5yobiO+aVGVo/tW7YC3yY2VeiKs7nmLCShNhb9obhN54OfJFP9JGGYUo8omJYtfgt2349dG0vyP0nqRQpxcB6uJ6crD/FAVN+6lEJqYb3DuCfFzhBybRYZmByE19iKkQM/GYU8DbbVTGLQV7l08btYYCo3C7jTWX3d+nbCA+aFIVoYpYmnNtQgwD+enZrv8RNO0LhaXViSknZzREmc9JlLsGt1dBqXUJ3ncA+095TVnnUp63D1xzfbp5sj8ziTzy2a8HTKLDMgNRCurNZVcfoIFNTwa+xqTmQadqc36/HruVrWUDcaFJVYKmMufmkKfyFuEpdqXNoK7fVG9ishUVZV4jQNnY8OtjuAIykHjMsBdFeX79EpNS5JX8pyaRB2s9/HNrGQjccu+cJfyRjcq4b06OxTzXpKZDM0hjBVJMp/EsiOvkpjdTDcR5JlUBuOLjqamlJLbgB7GWQqcdN9v4JX7dzhiFKPOtiXJvyp8Lqy8mc6FRc+/zwxtMqo9yTv5Kk1LkYxvwMSblI+9K32kSHZYZiJq/227eToDPl4FvM6np0DiDNxYkC4R33FWz5g3fVANRMTiu9eneRTYh6dE32hXqQ921UmUg/LFJFyGKTAXlL0yxa/ErNvz60Kmb9/mhH0QsTzOYo3epsPL4fskzKOfp+3ERkDcQnzeJIbQmwjuH+oLQfGgquzYCZaN7azZD4kEzR7kirg+bVB87YyC0PNW7wKYcTbHwJYsinS78C+FVKJXwRuGVwj8TlrtK6Y/Au3bM0UClXOePhZ6Sb8LtLNBS7y9XyEY6s1T8VJpmvM6kkCsFNT9hUkOUsx8Xm1QHLRzyZL9lEkNont87h+zY8kyDeqmlDNr0v6+Wp3tjwGG9hLZPyBnvLRoInc/n6vY3YdEFE+U5TniR8D9MmXK8V5ifS01btTjaMUmucXV0zRp8SFiO7tdCWXmH1XwxytOMOOWHt5GLT5E5GQaDWYdQNlxavBOjnC0ZrkUAWkWZC6wzNRoPiucKh3T1ozcuxEPmAeVX7fbTyqWMyKtMqgPGx5eFWzUQLMn1Bt+EV9voLkRxnia82RRpKku5dp4U3n0EFg2EjP0oYe0VnP9kw68PTRl7nxt2Jc2gaZ8ifHlE1lbkKmXZ3xk5LQf25CAZKn5LLxEylyaNVwp4dz/yGFoK7ckH8rcmo8K/neLrcmlPHmI88EwuFbLMmyXWVAhTCEhZOEFU3H/PYDGNHVugxXEMEfeAQSGATn+UzutRI+adCwlcUo1JmprvjtWiperlLRkItfBLF7fkSCQ9G7QSxXmu8O5IkabyQaG/IrJc9AOL1W4y7nnRdWpRqxbXhjZ2zT09+eH2pxflWILHS+xMzsXtLRmjqWQJ8sNt1D60cbF3jseuoIun+OZNi/7IRusjX3U5Rv4unS7US8d2bQ1WNhCl2volxNXsp8ciiNI8WTilUpGGLZ8V0hvyGuE3hOz/gA3VRzk63KWtMpBxb7DxaxFvZPMquynIz79hv2O1FujMTWP3q/HmpZg98iQvZ3bycYiU/YpPfQLnUr1TmG+aox5R6ame40ttBMZ4qRBPy5PzmLteV1uzmoEoR2iX8gob3YUozZgiflH4XBPvQfafIvy4bfZR9iC+alIuZEyMFulI736W0r/PNVAuuunPbXU64cmNse8RqifBdGOOsUGWc8ab0mi9wJTWAl5JOF2kLhcu8YyHWZUYGmic2/Kg3+lM40WlZdiBBI/pNOUd66bwKxqIqVZ6KkmLDedwBlGaMxIlSnnZWNpIZPypQrlQpthKTcZ8d3QPtfh7Nvy60Pmq95khEfB+4G1Zs5J8Pb+m7mg7yEpKr3s5c2sWNDHfn/eOE83MUKiEW54+SZk6ETfIt7LTqRcZFGIDOUPGfsYnDkEX9tEXG+39RrWLE+uE6KrmTe9Y8s11WVc07PWpcQ3iDGnRFPdDkFYb92g8Jz4e2C2oW8VArOM9+EEngyhNqREsAcvjTHQexj/LC01yALkmwcl77B5qcZu1DzwtvVw+HGZQ2OfLlji9wE2VmmtAdynzIjCWTh/gPEMToClLjAafiUBtvSmgvrls2biq4Jw7nHZpv8/wd4gZB47x5jwZuPAz5tfOLyXeQzZTIEpzUqJEKc9QyXkwa85Ldbx7gt8xURdy3TVesXeWDX+IQxxAqGVZEmwp8TIb3YUoTelVdv8pHM5Lc1HuGOrCefcTmK2fkGueIKztPdxswx/iEAcU69Q9FFtoi+KUmrD49QJa+n2abfXRtL8rHPOCbirFNOS6H0juowYPvYdDHGBomosAiqdQS3mTjZ6FKE6pWvI6E+ujK5ghSv9pIfl7Al5TFub8SJitnpNrPl9YO3NRzJYc4hC7j8066uY4uhhLlIciJ0+pYM6DYJHPkka5RIJ9z0Mg13uEMNRV1CKLvF5glziEBw3GMSUMHKYol0CbDoUxS/00KcDqrr8EvMO0G+PNtrePpn1OJAPrBWtXx3jF4VySax7tHp0oU8q7TWwI0jTz4iV4F8+xs13I9f42uX4Nbq/u4aBCY1/x3yq/AnQO+is5/X6aQEusu+vPxbDvpd9RSn+z3XUKwfvdgqZiapdV55fgRnAUKmX+6Uv56/jbm+hQTKVbMbAp17kguW4NUjY+mj8/qqHeHsVJgcSIyOGz9iHsS1vxE0OKz4nJQiU/nanrKIIcKe6hgdD98XgwzXalx2G+03M/dsdDC4PhjZFWmVIvkcpUe01kPZTbZy2l72YlEAUqTTFgsQJTrsNKQro1sxiGJrYUoVD0Q4s1foij1XlyjUbICkvv+ptwWeuxowlD76DGaxkphPKyW7FBoCrRMxB9b2E6/ae9To8oPAty2my3f+4c5peu7xvq1z7AZ9joRYgS3ZEoVUoChm6JdQ3I2CzGqh2UhPkuR79KGBoIyHJuypJpADOFXsn4sEWhPhzCcbxLz0Ccuff/PtM1GulxmPNa8ITic3W9kT9GahxZeZrK9Lt17TvGG18s4fdt9FGIIk1ZDPVvwqoLnGS8Y4VrlFJDMjPLqvqONgwNBGsIcMEJDEKewPwGwzakTJuFX2Gb5dBpcxnv3Ztxm0HWRqwbg9B7j0u1f2JHfBzIGISu+49vugY/ZqOPQhTpryLFKvGrwirzeRnn2cJSefcmZLXmdtZbHAR4AUh9iodt5u+eDIu3wjZLqmma3JdJ0e9veZowXn7O0zrnBSw1EOmCqfvtiI8DaiBIt8Q3XYP5lFICUSZaynmK5pEn84vt1NmQc3m3xeXCsbjHJtxep+qDAF/5WUcQgsss5CJwmcqElZF0bw5rEvoyKcabt+DC460wXsy0Q3V6/PGDwjpdW5GuvDwqDQQNOuKbrsFiOjGGKBSu/l2Rgk0hfSnPEo7mkUXmCcJXC6nY/B+hN14tvt0ue4iAnGL3I/9pC7V4W/tWjBkIFjT1j3vEQNQJUvrt7zoDERmXiGknbKZOqcxjbYQdgM7zaqc37x9bmp1CFGtpLABPgEa2Vwj/UsgCK8b6kPBaIbGL2t2oc8wW2MgxemxSY0Hj3SM5cvn/qbavxKeZOPJMjficNMphyoXRoyz8ySaye/A9iDg2MIXUsIwZCGIV4RhL/LlO/EIfxkBmcwPRnyLFjA2Ed3wKdyiLoWvXvZvchPlgUAbyA8f1X9PtX5vFV63J8bdEskdeCMN50X6PZFdYdo4X1AqDsWMh2beFdOC6T7idDlVLsD0DcW50TN/14WcxeGrj6udIRTFP+kC22d/V0egYIYAae0JHnYEotSRbyo/a6LMgP/I13ly1DQ7bs0eQ47xTAyUmfhLKuAf9M2Vf+Pwfsl17kO3HCfGEOPYvwlPt0B5ke4dcUge+gaBYKW5Q88no/+k2tS08yMYMBD1U8Q7gi2zftCxGjL4nMrxOCi3CC7KxgeBzLmG2R8n2UX7vwVIuet+D/NCPF47VROwSyVa82m4/C5Fh+oM87/EIKd0/sMNHIPtCVqU3pmzTe5P9NM5Z53XyayKn2F2TVqa46Vu+eQds6EJFZ6XQHCWWKSsu6BsIainIjHh1EDHT5rF4L+zPZUB8A+FBC/fia+14KnzzTr8etSXWAogCvFi4RkVjbdI4d7R4S2ReIGRagOdAMDas9bjIRPYg28QoQmv9I96F/J+pRSjiWpy92Vf4HsTJ0TZFep4Mr2QM2yj1pgYCopR1gpQB8wwEU5XxMXcC06K+S/hMu8IiiCLwwpygiLtIPIJRt55ArcgxJeCcPY9B/g3NcdJpBIaE/XfZrj3IdujV+eDcwO/OwFd+GNYeMN3w1mswZQjbxAHmGQgqLYeVixgIby1GzHS6E9aF5F6ek5ti4HmkTPuj4tWkMp+2EfYZ5aamS8mKtvFuTyMQheBVeyjGLpEYwmBqkIPIhtf14QEQUAxBRfZdb2J7kO0QxPys7dqDbJOeZf+9tuvggb6VqtyBw9S09pNEeQK9180Nqy1TaMdriqq81D1FVFr+r7U/wSC8cm9fQL0YRDzGHO5IkFIXOHk3uAl/aKNvDFEKlGaNNRJzyYpM7mXy/F9kiaeE2g48DoqzIOlJ9t1monuQ7X+w/b1XEso27fzDffSCkwcC6gWkT0iP3xPGv6PwivsxvsKuxLWYOsRLrlN2QcqmfU+0n9W+3d+2noGI+z4EpjE/Xs2XyrzJRthn9L+kWvymjV4FohTEJEodp9YkT3s8mdmBJDknZCR6L6eRbV4ryH4M35FO3fL/8BkHcQbZF6Yp3M9ecZiQeAZjPdvEdhNDZavNrnV7X1FplEy7+luifbGBYEqDTDjWZaJqGQgPBywGseQ9CGOs3tZdlICnMcVPtd+P6RHF5QU9LP9e1GpfzqNLNxWbsLeiVbbpWBVqGfZ6dcq/vJwnXHvgpcg+akSCkUi5Yyv/Emgr+fQJGZMn6P1C77dEiTVTAO+8wK5iVz0I4ge8w0JjRKU0Z3+tB8u1tQ3hoYEw8Fap/s3W4GoBFlEG6gmoIpzyer45pOiIqsvzhRsvBpMxCDiS0nTb9ct+YhMc36t+5F/bzqZMLeCJN4VHc5kQg0mDm2JD4J0Gc//hMmtWY8bTBNZrMBUef+OWh7KB4J0R8fLwG23/GdE++CtrINZIcS4qkpoLUQyUEGPB037qOg4qNSk4ul6IkmEQDq6CHQRopzKUAlKVSGEejX3S3x41Dzpd0HdUpsephWiFlwhpbhTGfMreOTlMLZTS+gTGu1CYXrtcuJQzEN09xsRjisfmO0llurjKviL/yrFNWHyV3VoQRWcawpwcEtijMzXE3cdFX1yKbOefs+M80W53tzAeg2D1JUrTf3OUvoWL1++PNSYuvz5uuoEg/RmPG0icovzbyRuIeJw53Jkshndzm3JZR+Adhimg55HsEjd4EeuK6BsIukiRMWABFQFE+keOvcmb1+qxxoKiKZT4DmG8xHpNA8G9nm0SeRyVBuKYY/4fUOFTtlVpoggAAAAASUVORK5CYII= - 52:定子热套 - A6.B1.D1 + 52:前盖轴封检漏 + A9.B1.D1 False False 12, 12 @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - B70定子热套 + 80_1前盖轴封检漏 Normal Tile 宋体, 9pt ControlText - B70定子热套 + 80_1前盖轴封检漏 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/B90机壳轴承压装.xml b/Main/MCEdit/Data/MCProject/nodeForm/80_2转子充磁.xml similarity index 97% rename from Main/MCEdit/Data/MCProject/nodeForm/B90机壳轴承压装.xml rename to Main/MCEdit/Data/MCProject/nodeForm/80_2转子充磁.xml index 4fd6806..a7b0a9e 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/B90机壳轴承压装.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/80_2转子充磁.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,8 +7,8 @@ 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 - 54:机壳轴承压装 - A7.B1.D1 + 54:转子充磁 + A10.B1.D1 False False 12, 12 @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - B90机壳轴承压装 + 80_2转子充磁 Normal Tile 宋体, 9pt ControlText - B90机壳轴承压装 + 80_2转子充磁 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/B100后盖螺丝机.xml b/Main/MCEdit/Data/MCProject/nodeForm/80_2转子充磁1.xml similarity index 97% rename from Main/MCEdit/Data/MCProject/nodeForm/B100后盖螺丝机.xml rename to Main/MCEdit/Data/MCProject/nodeForm/80_2转子充磁1.xml index 20c1c7e..75b6125 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/B100后盖螺丝机.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/80_2转子充磁1.xml @@ -1,5 +1,5 @@ - + AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -7,8 +7,8 @@ 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 - 55:后盖螺丝机 - A8.B1.D1 + 54:转子充磁 + A10.B1.D1 False False 12, 12 @@ -27,11 +27,11 @@ Sizable 600, 401 WindowsDefaultLocation - B100后盖螺丝机 + 80_2转子充磁1 Normal Tile 宋体, 9pt ControlText - B100后盖螺丝机 + 80_2转子充磁1 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/B130氦气检漏.xml b/Main/MCEdit/Data/MCProject/nodeForm/B130氦气检漏.xml deleted file mode 100644 index 93767a9..0000000 --- a/Main/MCEdit/Data/MCProject/nodeForm/B130氦气检漏.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59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 - - 59:氦气检漏2 - A20.B2.D1 - False - False - 161, 12 - StationButton2 - 133, 105 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59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 - - 58:氦气检漏1 - A20.B1.D1 - False - False - 12, 12 - StationButton1 - 133, 105 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAACAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIEZFMUNDRDMxRThFOTQwQjRCMEEzQzM2RUFCMkVEQUNEBgYAAAAM5p2h56CB5omr5o+PBgcAAAAM5p2h56CB5omr5o+PCw== - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - True - False - Control - Sizable - 600, 401 - WindowsDefaultLocation - B130氦气检漏 - Normal - - Tile - 宋体, 9pt - ControlText - B130氦气检漏 - diff --git a/Main/MCEdit/Data/MCProject/nodeForm/B170整机补油.xml b/Main/MCEdit/Data/MCProject/nodeForm/B170整机补油.xml deleted file mode 100644 index 9843945..0000000 --- a/Main/MCEdit/Data/MCProject/nodeForm/B170整机补油.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59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 - - 65:绝缘测试 - A25.B2.D1 - True - True - 171, 12 - StationButton9 - 127, 103 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59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 - - 64:注油 - A25.B1.D1 - True - True - 24, 12 - StationButton10 - 127, 103 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAGAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAHAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAANBAs= - - True - False - Control - Sizable - 600, 401 - WindowsDefaultLocation - B170整机补油 - Normal - - Tile - 宋体, 9pt - ControlText - B170整机补油 - diff --git a/Main/MCEdit/Data/MCProject/nodeForm/B30排气阀拧紧螺丝机.xml b/Main/MCEdit/Data/MCProject/nodeForm/B30排气阀拧紧螺丝机.xml index 479ef13..aa4b4f6 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/B30排气阀拧紧螺丝机.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/B30排气阀拧紧螺丝机.xml @@ -7,8 +7,8 @@ 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 - 42:排气阀拧紧螺丝机 - A2.B1.D1 + 71:性能测试1 + A27.B1.D1 False False 12, 12 diff --git a/Main/MCEdit/Data/MCProject/nodeForm/B40前盖组件装配.xml b/Main/MCEdit/Data/MCProject/nodeForm/B40前盖组件装配.xml deleted file mode 100644 index 5815157..0000000 --- a/Main/MCEdit/Data/MCProject/nodeForm/B40前盖组件装配.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59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 - - 43:前盖组件装配1 - A3.B1.D1 - False - False - 12, 12 - StationButton12 - 133, 105 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59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 - - 44:前盖组件装配2 - A3.B2.D1 - False - False - 162, 12 - StationButton13 - 133, 105 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - True - False - Control - Sizable - 600, 401 - WindowsDefaultLocation - B40前盖组件装配 - Normal - - Tile - 宋体, 9pt - ControlText - B40前盖组件装配 - diff --git a/Main/MCEdit/Data/MCProject/nodeForm/TEST.xml b/Main/MCEdit/Data/MCProject/nodeForm/TEST.xml index 973e462..325ae24 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/TEST.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/TEST.xml @@ -1,35 +1,5 @@ - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59eYLT6Kp3DH7BRqgErVX4ZnSBXeaZdtezIYp8aqLYNXivDb8dqNvpfS8Ql5gAr3estRHyaNqzhP8bnbOE77PRFLUMBEVfy+/tHuFv2Ug9mMFl2uCdV+Iwtd20r0pk5hAj0TdkWkLgycL/cvYFvtNGqAD94qe6VLtAnghPsLufBVHm8xPlrsEv2vDbgbrN3vfyf0Lcb+bJ3nF+UPniNP0x3m+yHplucG1caGpdPJnA19qojLt5DEJd/1xK9wvC84VnC98pzLn319pofUwzYHjVGBnI98y+z9kIHdTtDwYab47pAzESAv1vFJLCv1UYjx2zPybxHV9ujC+zETaEBjh2eUqR40fsE8yCKPMaRVL9J+aa0OrUnKJ8yWRQSO84fP2ejAcNxHnnQAxDPyCnwTBPFmLEH22SHZZmMTTG4Z33LpPoQMzBnyL9QvhMk1JoZW9QeI941ecIj7czOIfAIHG6021PH3hQTfsa4aNsTw/msVwm9K7HPXYxE4rcfLlAvA68xidF8hjK4Xc/G8wX/YseBOJqliPADkSZr0uUuwbPseHXR9P+afQdpLzAZChky00zvrYnkwLF8eUh3sLDTLKP8px7aIyWGAjN2KA46Tm3ZCtv9WmdysNLTUKh0X9PDpJ1cLMUG6OchepiEeMG4k9MsjI0IONdcA3eJsTtJaiCO8eT5xIh874vC6eWZaecXXsgynxnotw1+EQbfn007VeS7yCQAGGXbsxPM+DTTapD2RvQlJqHpv39RDbm0KVfZiByv9W3msQQ6hl453zZJJDBG8sV/eEBdV7DUmiQkfu/Svh14Q+ETLNKFbDd5yobiO+aVGVo/tW7YC3yY2VeiKs7nmLCShNhb9obhN54OfJFP9JGGYUo8omJYtfgt2349dG0vyP0nqRQpxcB6uJ6crD/FAVN+6lEJqYb3DuCfFzhBybRYZmByE19iKkQM/GYU8DbbVTGLQV7l08btYYCo3C7jTWX3d+nbCA+aFIVoYpYmnNtQgwD+enZrv8RNO0LhaXViSknZzREmc9JlLsGt1dBqXUJ3ncA+095TVnnUp63D1xzfbp5sj8ziTzy2a8HTKLDMgNRCurNZVcfoIFNTwa+xqTmQadqc36/HruVrWUDcaFJVYKmMufmkKfyFuEpdqXNoK7fVG9ishUVZV4jQNnY8OtjuAIykHjMsBdFeX79EpNS5JX8pyaRB2s9/HNrGQjccu+cJfyRjcq4b06OxTzXpKZDM0hjBVJMp/EsiOvkpjdTDcR5JlUBuOLjqamlJLbgB7GWQqcdN9v4JX7dzhiFKPOtiXJvyp8Lqy8mc6FRc+/zwxtMqo9yTv5Kk1LkYxvwMSblI+9K32kSHZYZiJq/227eToDPl4FvM6np0DiDNxYkC4R33FWz5g3fVANRMTiu9eneRTYh6dE32hXqQ921UmUg/LFJFyGKTAXlL0yxa/ErNvz60Kmb9/mhH0QsTzOYo3epsPL4fskzKOfp+3ERkDcQnzeJIbQmwjuH+oLQfGgquzYCZaN7azZD4kEzR7kirg+bVB87YyC0PNW7wKYcTbHwJYsinS78C+FVKJXwRuGVwj8TlrtK6Y/Au3bM0UClXOePhZ6Sb8LtLNBS7y9XyEY6s1T8VJpmvM6kkCsFNT9hUkOUsx8Xm1QHLRzyZL9lEkNont87h+zY8kyDeqmlDNr0v6+Wp3tjwGG9hLZPyBnvLRoInc/n6vY3YdEFE+U5TniR8D9MmXK8V5ifS01btTjaMUmucXV0zRp8SFiO7tdCWXmH1XwxytOMOOWHt5GLT5E5GQaDWYdQNlxavBOjnC0ZrkUAWkWZC6wzNRoPiucKh3T1ozcuxEPmAeVX7fbTyqWMyKtMqgPGx5eFWzUQLMn1Bt+EV9voLkRxnia82RRpKku5dp4U3n0EFg2EjP0oYe0VnP9kw68PTRl7nxt2Jc2gaZ8ifHlE1lbkKmXZ3xk5LQf25CAZKn5LLxEylyaNVwp4dz/yGFoK7ckH8rcmo8K/neLrcmlPHmI88EwuFbLMmyXWVAhTCEhZOEFU3H/PYDGNHVugxXEMEfeAQSGATn+UzutRI+adCwlcUo1JmprvjtWiperlLRkItfBLF7fkSCQ9G7QSxXmu8O5IkabyQaG/IrJc9AOL1W4y7nnRdWpRqxbXhjZ2zT09+eH2pxflWILHS+xMzsXtLRmjqWQJ8sNt1D60cbF3jseuoIun+OZNi/7IRusjX3U5Rv4unS7US8d2bQ1WNhCl2volxNXsp8ciiNI8WTilUpGGLZ8V0hvyGuE3hOz/gA3VRzk63KWtMpBxb7DxaxFvZPMquynIz79hv2O1FujMTWP3q/HmpZg98iQvZ3bycYiU/YpPfQLnUr1TmG+aox5R6ame40ttBMZ4qRBPy5PzmLteV1uzmoEoR2iX8gob3YUozZgiflH4XBPvQfafIvy4bfZR9iC+alIuZEyMFulI736W0r/PNVAuuunPbXU64cmNse8RqifBdGOOsUGWc8ab0mi9wJTWAl5JOF2kLhcu8YyHWZUYGmic2/Kg3+lM40WlZdiBBI/pNOUd66bwKxqIqVZ6KkmLDedwBlGaMxIlSnnZWNpIZPypQrlQpthKTcZ8d3QPtfh7Nvy60Pmq95khEfB+4G1Zs5J8Pb+m7mg7yEpKr3s5c2sWNDHfn/eOE83MUKiEW54+SZk6ETfIt7LTqRcZFGIDOUPGfsYnDkEX9tEXG+39RrWLE+uE6KrmTe9Y8s11WVc07PWpcQ3iDGnRFPdDkFYb92g8Jz4e2C2oW8VArOM9+EEngyhNqREsAcvjTHQexj/LC01yALkmwcl77B5qcZu1DzwtvVw+HGZQ2OfLlji9wE2VmmtAdynzIjCWTh/gPEMToClLjAafiUBtvSmgvrls2biq4Jw7nHZpv8/wd4gZB47x5jwZuPAz5tfOLyXeQzZTIEpzUqJEKc9QyXkwa85Ldbx7gt8xURdy3TVesXeWDX+IQxxAqGVZEmwp8TIb3YUoTelVdv8pHM5Lc1HuGOrCefcTmK2fkGueIKztPdxswx/iEAcU69Q9FFtoi+KUmrD49QJa+n2abfXRtL8rHPOCbirFNOS6H0juowYPvYdDHGBomosAiqdQS3mTjZ6FKE6pWvI6E+ujK5ghSv9pIfl7Al5TFub8SJitnpNrPl9YO3NRzJYc4hC7j8066uY4uhhLlIciJ0+pYM6DYJHPkka5RIJ9z0Mg13uEMNRV1CKLvF5glziEBw3GMSUMHKYol0CbDoUxS/00KcDqrr8EvMO0G+PNtrePpn1OJAPrBWtXx3jF4VySax7tHp0oU8q7TWwI0jTz4iV4F8+xs13I9f42uX4Nbq/u4aBCY1/x3yq/AnQO+is5/X6aQEusu+vPxbDvpd9RSn+z3XUKwfvdgqZiapdV55fgRnAUKmX+6Uv56/jbm+hQTKVbMbAp17kguW4NUjY+mj8/qqHeHsVJgcSIyOGz9iHsS1vxE0OKz4nJQiU/nanrKIIcKe6hgdD98XgwzXalx2G+03M/dsdDC4PhjZFWmVIvkcpUe01kPZTbZy2l72YlEAUqTTFgsQJTrsNKQro1sxiGJrYUoVD0Q4s1foij1XlyjUbICkvv+ptwWeuxowlD76DGaxkphPKyW7FBoCrRMxB9b2E6/ae9To8oPAty2my3f+4c5peu7xvq1z7AZ9joRYgS3ZEoVUoChm6JdQ3I2CzGqh2UhPkuR79KGBoIyHJuypJpADOFXsn4sEWhPhzCcbxLz0Ccuff/PtM1GulxmPNa8ITic3W9kT9GahxZeZrK9Lt17TvGG18s4fdt9FGIIk1ZDPVvwqoLnGS8Y4VrlFJDMjPLqvqONgwNBGsIcMEJDEKewPwGwzakTJuFX2Gb5dBpcxnv3Ztxm0HWRqwbg9B7j0u1f2JHfBzIGISu+49vugY/ZqOPQhTpryLFKvGrwirzeRnn2cJSefcmZLXmdtZbHAR4AUh9iodt5u+eDIu3wjZLqmma3JdJ0e9veZowXn7O0zrnBSw1EOmCqfvtiI8DaiBIt8Q3XYP5lFICUSZaynmK5pEn84vt1NmQc3m3xeXCsbjHJtxep+qDAF/5WUcQgsss5CJwmcqElZF0bw5rEvoyKcabt+DC460wXsy0Q3V6/PGDwjpdW5GuvDwqDQQNOuKbrsFiOjGGKBSu/l2Rgk0hfSnPEo7mkUXmCcJXC6nY/B+hN14tvt0ue4iAnGL3I/9pC7V4W/tWjBkIFjT1j3vEQNQJUvrt7zoDERmXiGknbKZOqcxjbYQdgM7zaqc37x9bmp1CFGtpLABPgEa2Vwj/UsgCK8b6kPBaIbGL2t2oc8wW2MgxemxSY0Hj3SM5cvn/qbavxKeZOPJMjficNMphyoXRoyz8ySaye/A9iDg2MIXUsIwZCGIV4RhL/LlO/EIfxkBmcwPRnyLFjA2Ed3wKdyiLoWvXvZvchPlgUAbyA8f1X9PtX5vFV63J8bdEskdeCMN50X6PZFdYdo4X1AqDsWMh2beFdOC6T7idDlVLsD0DcW50TN/14WcxeGrj6udIRTFP+kC22d/V0egYIYAae0JHnYEotSRbyo/a6LMgP/I13ly1DQ7bs0eQ47xTAyUmfhLKuAf9M2Vf+Pwfsl17kO3HCfGEOPYvwlPt0B5ke4dcUge+gaBYKW5Q88no/+k2tS08yMYMBD1U8Q7gi2zftCxGjL4nMrxOCi3CC7KxgeBzLmG2R8n2UX7vwVIuet+D/NCPF47VROwSyVa82m4/C5Fh+oM87/EIKd0/sMNHIPtCVqU3pmzTe5P9NM5Z53XyayKn2F2TVqa46Vu+eQds6EJFZ6XQHCWWKSsu6BsIainIjHh1EDHT5rF4L+zPZUB8A+FBC/fia+14KnzzTr8etSXWAogCvFi4RkVjbdI4d7R4S2ReIGRagOdAMDas9bjIRPYg28QoQmv9I96F/J+pRSjiWpy92Vf4HsTJ0TZFep4Mr2QM2yj1pgYCopR1gpQB8wwEU5XxMXcC06K+S/hMu8IiiCLwwpygiLtIPIJRt55ArcgxJeCcPY9B/g3NcdJpBIaE/XfZrj3IdujV+eDcwO/OwFd+GNYeMN3w1mswZQjbxAHmGQgqLYeVixgIby1GzHS6E9aF5F6ek5ti4HmkTPuj4tWkMp+2EfYZ5aamS8mKtvFuTyMQheBVeyjGLpEYwmBqkIPIhtf14QEQUAxBRfZdb2J7kO0QxPys7dqDbJOeZf+9tuvggb6VqtyBw9S09pNEeQK9180Nqy1TaMdriqq81D1FVFr+r7U/wSC8cm9fQL0YRDzGHO5IkFIXOHk3uAl/aKNvDFEKlGaNNRJzyYpM7mXy/F9kiaeE2g48DoqzIOlJ9t1monuQ7X+w/b1XEso27fzDffSCkwcC6gWkT0iP3xPGv6PwivsxvsKuxLWYOsRLrlN2QcqmfU+0n9W+3d+2noGI+z4EpjE/Xs2XyrzJRthn9L+kWvymjV4FohTEJEodp9YkT3s8mdmBJDknZCR6L6eRbV4ryH4M35FO3fL/8BkHcQbZF6Yp3M9ecZiQeAZjPdvEdhNDZavNrnV7X1FplEy7+luifbGBYEqDTDjWZaJqGQgPBywGseQ9CGOs3tZdlICnMcVPtd+P6RHF5QU9LP9e1GpfzqNLNxWbsLeiVbbpWBVqGfZ6dcq/vJwnXHvgpcg+akSCkUi5Yyv/Emgr+fQJGZMn6P1C77dEiTVTAO+8wK5iVz0I4ge8w0JjRKU0Z3+tB8u1tQ3hoYEw8Fap/s3W4GoBFlEG6gmoIpzyer45pOiIqsvzhRsvBpMxCDiS0nTb9ct+YhMc36t+5F/bzqZMLeCJN4VHc5kQg0mDm2JD4J0Gc//hMmtWY8bTBNZrMBUef+OWh7KB4J0R8fLwG23/GdE++CtrINZIcS4qkpoLUQyUEGPB037qOg4qNSk4ul6IkmEQDq6CHQRopzKUAlKVSGEejX3S3x41Dzpd0HdUpsephWiFlwhpbhTGfMreOTlMLZTS+gTGu1CYXrtcuJQzEN09xsRjisfmO0llurjKviL/yrFNWHyV3VoQRWcawpwcEtijMzXE3cdFX1yKbOefs+M80W53tzAeg2D1JUrTf3OUvoWL1++PNSYuvz5uuoEg/RmPG0icovzbyRuIeJw53Jkshndzm3JZR+Adhimg55HsEjd4EeuK6BsIukiRMWABFQFE+keOvcmb1+qxxoKiKZT4DmG8xHpNA8G9nm0SeRyVBuKYY/4fUOFTtlVpoggAAAAASUVORK5CYII= - - 50:氦气检漏2 - A21.B2.D1 - True - True - 301, 12 - StationButton9 - 127, 103 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - iVBORw0KGgoAAAANSUhEUgAAAQgAAAA2CAYAAAA78QeWAAAABGdBTUEAALGPC/xhBQAAFaZJREFUeF7tnQ3INVdxx9PEz1iNUquxLX6lqEQbrCYEFa1SCIklS6JItG2okhhBQYJoGysNCmIVpYlYNFiC6aZo1GATiajBog2WJgT8wGooNkECkRBjEzRtbG2083tmzrtnz845+3HP3uc+r88f/rzv7s6e3XufO7NzZubMHnOIZXjq3592sfCXK/AEu8R20bQnCP9GeKfwlwlfaVKHOMSOoWmPFz5JeJLw+cZThE83/rpJbhWiyG9PFLsGH7Lht4umfazwO8LUMAReY5K7h6Y9Ufha4RXCd9veQxx1UGV/nfCDws8JvyX8qdD7waa8S3ij8FLh6cdf9L5fs1FXgyjzXyfKXYP32PDbRdO+X+h9r4E/Ez7epPcfTXumEIPw78L4Pq8yiUMcePDkb9rzhJ8U3i2M/9CbEjf5PcIT7WrVIcr88US5a/AbNvz2oN7DT4Te9xjzTXbG/qNpv5bcW+ChgTjQaNpjhVj/zwt5Knl/5Jp8UMjT8XF2B9Ugynxtotw1eL0Nvz007Rvsuxrjv9oZ+49DA3GUoWkfLXyr8Pv2h9w28Sj+0O6mCkSZ/zlR7hq83IbfHpr2puh7GuOz7Kz9xaGBOErQtA8TXiD0IuPb5kPCd9idbQxR5tsS5a7Bt9jw20HTPiP6fqbwvXbmPDTtccIXCd8hJHZwnfEzQmJOxJ5+w6R9aCAynPdjoXd//M6CTODzbAQfOsU6V4ineY2Qc4iBfVj4euFvmuR8NO3DhS8Ths/9j8Iw/seEbxNy/BF2Rg97sbSmPVnI9/Ne4d8J+c4YoxWSdbpQ+FQ7xYdeI3wfMc+34+gpnmT4/FcKubeT9o6vgqY9XfhdofeH3E++3+5wI4gyP5Aodw1W9XJGQdTf/45yRAGPtbPH0bSPEb5L+EOhN17MnwuvFZ5sZ/cx/14DX24j9KGZMZT2v00uR+7rE8LphgKFbdqPCO8TemOmfIOdqVCj8FEhwXdP3uOXhLnv7hWRXEy8R/5GOS/yPhuhInQ6gWXjie1ddBf453a3iyCK/MREsWvxt+0Sq8OeTnck30vgA86+wGlGTD2GJZ4jCjn8+9Q0EE17hjDnheRIIL3sjYCmvVg4ZnRS9qduTXt1cnwqieudbaN04L59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 - - 49:氦气检漏1 - A21.B1.D1 - True - True - 154, 12 - StationButton10 - 127, 103 - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAABAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -40,10 +10,10 @@ False Control Sizable - 600, 401 + 1094, 734 WindowsDefaultLocation TEST - Normal + Maximized Tile 宋体, 9pt diff --git a/Main/MCEdit/Data/MCProject/nodeForm/一键换型.xml b/Main/MCEdit/Data/MCProject/nodeForm/一键换型.xml index b39d730..e743151 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/一键换型.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/一键换型.xml @@ -71,7 +71,7 @@ MCButton3 125, 44 - 豪森型号切换 + 型号切换 Top 宋体, 12pt, style=Bold 0, 0 @@ -90,7 +90,7 @@ Sizable 799, 507 WindowsDefaultLocation - 豪森线一键换型 + 一键换型 Normal Tile diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj index bed176d..9512761 100644 --- a/Main/MCEdit/MCEdit.csproj +++ b/Main/MCEdit/MCEdit.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties MCEdit MCEdit - v4.0 + v4.5.2 512 @@ -32,6 +32,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -41,6 +42,7 @@ TRACE prompt 4 + false images\designer.ico diff --git a/Main/MCEdit/Properties/Settings.Designer.cs b/Main/MCEdit/Properties/Settings.Designer.cs index df58e97..6e5c035 100644 --- a/Main/MCEdit/Properties/Settings.Designer.cs +++ b/Main/MCEdit/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace MCEdit.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Main/MCRun/MCRun.csproj b/Main/MCRun/MCRun.csproj index fcca1cc..41efb0a 100644 --- a/Main/MCRun/MCRun.csproj +++ b/Main/MCRun/MCRun.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,7 +10,7 @@ Properties MCRun MCRun - v4.0 + v4.5.2 512 @@ -47,6 +47,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -56,6 +57,7 @@ TRACE prompt 4 + false diff --git a/Main/MCRun/Properties/Resources.Designer.cs b/Main/MCRun/Properties/Resources.Designer.cs index aeadc1f..66d13d7 100644 --- a/Main/MCRun/Properties/Resources.Designer.cs +++ b/Main/MCRun/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 此代码由工具生成。 -// 运行时版本:4.0.30319.34209 +// 运行时版本:4.0.30319.42000 // // 对此文件的更改可能会导致不正确的行为，并且如果 // 重新生成代码，这些更改将会丢失。 @@ -19,7 +19,7 @@ namespace MCRun.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ namespace MCRun.Properties { } /// - /// 使用此强类型资源类，为所有资源查找 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Main/MCRun/Properties/Settings.Designer.cs b/Main/MCRun/Properties/Settings.Designer.cs index 9df7c25..22e0f62 100644 --- a/Main/MCRun/Properties/Settings.Designer.cs +++ b/Main/MCRun/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace MCRun.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Main/Mensac.Gui.Run.Global/Mesnac.Gui.Run.Global.csproj b/Main/Mensac.Gui.Run.Global/Mesnac.Gui.Run.Global.csproj index 8de950a..538c5e7 100644 --- a/Main/Mensac.Gui.Run.Global/Mesnac.Gui.Run.Global.csproj +++ b/Main/Mensac.Gui.Run.Global/Mesnac.Gui.Run.Global.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.Gui.Run.Global Mesnac.Gui.Run.Global - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +39,7 @@ TRACE prompt 4 + false diff --git a/Main/Mesnac.Basic/Mesnac.Basic.csproj b/Main/Mesnac.Basic/Mesnac.Basic.csproj index f026292..75eaf57 100644 --- a/Main/Mesnac.Basic/Mesnac.Basic.csproj +++ b/Main/Mesnac.Basic/Mesnac.Basic.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.Basic Mesnac.Basic - v4.0 + v4.5.2 512 @@ -30,6 +30,7 @@ DEBUG;TRACE prompt 4 + false none @@ -38,6 +39,7 @@ TRACE prompt 4 + false diff --git a/Main/Mesnac.Gui.Common/Mesnac.Gui.Common.csproj b/Main/Mesnac.Gui.Common/Mesnac.Gui.Common.csproj index 00d4b08..64c9f44 100644 --- a/Main/Mesnac.Gui.Common/Mesnac.Gui.Common.csproj +++ b/Main/Mesnac.Gui.Common/Mesnac.Gui.Common.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.Gui.Common Mesnac.Gui.Common - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +39,7 @@ TRACE prompt 4 + false diff --git a/Main/Mesnac.Gui.Edit/Mesnac.Gui.Edit.csproj b/Main/Mesnac.Gui.Edit/Mesnac.Gui.Edit.csproj index ffcbeb9..c5c494a 100644 --- a/Main/Mesnac.Gui.Edit/Mesnac.Gui.Edit.csproj +++ b/Main/Mesnac.Gui.Edit/Mesnac.Gui.Edit.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.Gui.Edit Mesnac.Gui.Edit - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +39,7 @@ TRACE prompt 4 + false diff --git a/Main/Mesnac.Gui.Run/Mesnac.Gui.Run.csproj b/Main/Mesnac.Gui.Run/Mesnac.Gui.Run.csproj index 6c13e7d..612a72d 100644 --- a/Main/Mesnac.Gui.Run/Mesnac.Gui.Run.csproj +++ b/Main/Mesnac.Gui.Run/Mesnac.Gui.Run.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.Gui.Run Mesnac.Gui.Run - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +39,7 @@ TRACE prompt 4 + false diff --git a/Manager/BarTenderPrint/Entity/TBDProductInfo.cs b/Manager/BarTenderPrint/Entity/TBDProductInfo.cs index f25efcf..d4ff2b7 100644 --- a/Manager/BarTenderPrint/Entity/TBDProductInfo.cs +++ b/Manager/BarTenderPrint/Entity/TBDProductInfo.cs @@ -23,7 +23,9 @@ namespace FrmPrint [SugarColumn(ColumnName = "ProductType")] public string ProductType { get; set; } - + + [SugarColumn(ColumnName = "ToolCarNo")] + public string ToolCarNo { get; set; } [SugarColumn(ColumnName = "ShopID")] public string ShopID { get; set; } diff --git a/Manager/BarTenderPrint/PrintManager.cs b/Manager/BarTenderPrint/PrintManager.cs index 71b139f..e9c6c82 100644 --- a/Manager/BarTenderPrint/PrintManager.cs +++ b/Manager/BarTenderPrint/PrintManager.cs @@ -86,12 +86,12 @@ namespace BarTenderPrint barcodelb.SerialNum = Serialnum; barcodelb.ShiftNo = ShiftNo; //barcodelb.Date = DateTime.Now; - barcodelb.Date = Convert.ToDateTime(Print.starttime); + //barcodelb.Date = Convert.ToDateTime(Print.starttime); mlb.PrintType = printType; mlb.serialNum = Serialnum; mlb.ShiftNO = getShift(ShiftNo); //mlb.Date = DateTime.Now; - mlb.Date = Convert.ToDateTime(Print.starttime); + //mlb.Date = Convert.ToDateTime(Print.starttime); int itype = 0; if (!string.IsNullOrEmpty(printType)) { @@ -104,10 +104,10 @@ namespace BarTenderPrint try { //这些每个机种应该都谁确定的，在数据库里保存，以后可以一个存储过程去获取 - //RefreshShowMessageEvent?.Invoke(Print.barcode + "开始打印铭牌"); //if (true) //{ - // iNIFile.IniWriteValue("SystemConfig", "PrintState", "2"); + // ExitRePrint(); + // RefreshShowMessageEvent?.Invoke(Print.barcode + "铭牌打印成功!"); // LogHelper.Info(Print.barcode + "铭牌打印成功!"); // //插库存储条码及序列号 @@ -115,13 +115,15 @@ namespace BarTenderPrint // BarcodePrintInfo.ID = Guid.NewGuid().ToString("N"); // BarcodePrintInfo.ProductBarcode = Print.barcode; // BarcodePrintInfo.ProductID = Print.Machine.ToString(); - // BarcodePrintInfo.SerialNo = DateTime.Now.ToString("yyMMdd") + Serialnum; + // BarcodePrintInfo.SerialNo = DateTime.Parse(Print.starttime.ToString()).ToString("yyMMdd") + "D" + Print.Shift + Serialnum; // BarcodePrintInfo.IsRestart = Print.isRestart.ToString(); // BarcodePrintInfo.ShiftID = ShiftNo; // BarcodePrintInfo.InsertTime = DateTime.Now; // await new BaseServices().Add(BarcodePrintInfo); // RefreshShowMessageEvent?.Invoke(Print.barcode + "铭牌打印记录存储完成!"); // LogHelper.Info(Print.barcode + "铭牌打印记录存储完成!"); + // iNIFile.IniWriteValue("SystemConfig", "PrintState", "2"); + // return; //} LogHelper.Info(Print.barcode + "开始打印铭牌"); PrintEquip Smallequip = new NamePlatePrintEquip(); @@ -132,7 +134,6 @@ namespace BarTenderPrint if (bflag) { ExitRePrint(); - iNIFile.IniWriteValue("SystemConfig", "PrintState", "2"); RefreshShowMessageEvent?.Invoke(Print.barcode + "铭牌打印成功!"); LogHelper.Info(Print.barcode + "铭牌打印成功!"); //插库存储条码及序列号 @@ -140,15 +141,19 @@ namespace BarTenderPrint BarcodePrintInfo.ID = Guid.NewGuid().ToString("N"); BarcodePrintInfo.ProductBarcode = Print.barcode; BarcodePrintInfo.ProductID = Print.Machine.ToString(); - BarcodePrintInfo.SerialNo = DateTime.Now.ToString("yyMMdd") + Serialnum; + BarcodePrintInfo.SerialNo = DateTime.Parse(Print.starttime.ToString()).ToString("yyMMdd") + "D"+ Print.Shift + Serialnum; BarcodePrintInfo.IsRestart = Print.isRestart.ToString(); BarcodePrintInfo.ShiftID = ShiftNo; BarcodePrintInfo.InsertTime = DateTime.Now; await new BaseServices().Add(BarcodePrintInfo); RefreshShowMessageEvent?.Invoke(Print.barcode + "铭牌打印记录存储完成!"); LogHelper.Info(Print.barcode + "铭牌打印记录存储完成!"); + iNIFile.IniWriteValue("SystemConfig", "PrintState", "2"); + } + else + { + iNIFile.IniWriteValue("SystemConfig", "PrintState", "2"); } - Smallequip.Colse(); } catch (Exception ex) @@ -194,11 +199,47 @@ namespace BarTenderPrint try { Console.WriteLine("开始打印条码标签"); + //if (true) + //{ + // iNIFile.IniWriteValue("SystemConfig", "PrintState", "2"); + // RefreshShowMessageEvent?.Invoke(Print.barcode + "条码标签打印成功!"); + // LogHelper.Info(Print.barcode + "条码标签打印成功!"); + // //插库存储条码及序列号 + // baseBarcodePrintInfo BarcodePrintInfo = new baseBarcodePrintInfo(); + // BarcodePrintInfo.ID = Guid.NewGuid().ToString("N"); + // BarcodePrintInfo.ProductBarcode = Print.barcode; + // BarcodePrintInfo.ProductID = Print.Machine.ToString(); + // BarcodePrintInfo.SerialNo = DateTime.Now.ToString("yyMMdd") + Serialnum; + // BarcodePrintInfo.IsRestart = Print.isRestart.ToString(); + // BarcodePrintInfo.ShiftID = ShiftNo; + // BarcodePrintInfo.InsertTime = DateTime.Now; + // await new BaseServices().Add(BarcodePrintInfo); + // RefreshShowMessageEvent?.Invoke(Print.barcode + "条码打印记录存储完成!"); + // LogHelper.Info(Print.barcode + "条码打印记录存储完成!"); + //} PrintEquip equip = new barcodePrintEquip(); equip.tempPath = barcodelb.TempName; equip.ParaClass = barcodelb; equip.Open(); - equip.print(); + bool bflag = equip.print(); + if (bflag) + { + RefreshShowMessageEvent?.Invoke(Print.barcode + "条码标签打印成功!"); + LogHelper.Info(Print.barcode + "条码标签打印成功!"); + //插库存储条码及序列号 + baseBarcodePrintInfo BarcodePrintInfo = new baseBarcodePrintInfo(); + BarcodePrintInfo.ID = Guid.NewGuid().ToString("N"); + BarcodePrintInfo.ProductBarcode = Print.barcode; + BarcodePrintInfo.ProductID = Print.Machine.ToString(); + BarcodePrintInfo.SerialNo = DateTime.Parse(Print.starttime.ToString()).ToString("yyMMdd") + "D" + Print.Shift + Serialnum; + BarcodePrintInfo.IsRestart = Print.isRestart.ToString(); + BarcodePrintInfo.ShiftID = ShiftNo; + BarcodePrintInfo.InsertTime = DateTime.Now; + await new BaseServices().Add(BarcodePrintInfo); + RefreshShowMessageEvent?.Invoke(Print.barcode + "条码打印记录存储完成!"); + LogHelper.Info(Print.barcode + "条码打印记录存储完成!"); + iNIFile.IniWriteValue("SystemConfig", "PrintState", "2"); + } equip.Colse(); } @@ -217,6 +258,24 @@ namespace BarTenderPrint #region 二维码标签 try { + //if (true) + //{ + // iNIFile.IniWriteValue("SystemConfig", "PrintState", "2"); + // RefreshShowMessageEvent?.Invoke(Print.barcode + "二维码标签打印成功!"); + // LogHelper.Info(Print.barcode + "二维码标签打印成功!"); + // //插库存储条码及序列号 + // baseBarcodePrintInfo BarcodePrintInfo = new baseBarcodePrintInfo(); + // BarcodePrintInfo.ID = Guid.NewGuid().ToString("N"); + // BarcodePrintInfo.ProductBarcode = Print.barcode; + // BarcodePrintInfo.ProductID = Print.Machine.ToString(); + // BarcodePrintInfo.SerialNo = DateTime.Parse(Print.starttime.ToString()).ToString("yyMMdd") + Serialnum; + // BarcodePrintInfo.IsRestart = Print.isRestart.ToString(); + // BarcodePrintInfo.ShiftID = ShiftNo; + // BarcodePrintInfo.InsertTime = DateTime.Now; + // await new BaseServices().Add(BarcodePrintInfo); + // RefreshShowMessageEvent?.Invoke(Print.barcode + "二维码打印记录存储完成!"); + // LogHelper.Info(Print.barcode + "二维码打印记录存储完成!"); + //} RefreshShowMessageEvent?.Invoke(Print.barcode + "开始打印二维码标签"); LogHelper.Info(Print.barcode + "开始打印二维码标签"); PrintEquip equip = new QRCodePrintEquip(); @@ -226,7 +285,6 @@ namespace BarTenderPrint bool bflag = equip.print(); if (bflag) { - iNIFile.IniWriteValue("SystemConfig", "PrintState", "2"); RefreshShowMessageEvent?.Invoke(Print.barcode + "二维码标签打印成功!"); LogHelper.Info(Print.barcode + "二维码标签打印成功!"); //插库存储条码及序列号 @@ -234,13 +292,14 @@ namespace BarTenderPrint BarcodePrintInfo.ID = Guid.NewGuid().ToString("N"); BarcodePrintInfo.ProductBarcode = Print.barcode; BarcodePrintInfo.ProductID = Print.Machine.ToString(); - BarcodePrintInfo.SerialNo = DateTime.Now.ToString("yyMMdd") + Serialnum; + BarcodePrintInfo.SerialNo = DateTime.Parse(Print.starttime.ToString()).ToString("yyMMdd") + "D" + Print.Shift + Serialnum; BarcodePrintInfo.IsRestart = Print.isRestart.ToString(); BarcodePrintInfo.ShiftID = ShiftNo; BarcodePrintInfo.InsertTime = DateTime.Now; await new BaseServices().Add(BarcodePrintInfo); RefreshShowMessageEvent?.Invoke(Print.barcode +"二维码打印记录存储完成!"); LogHelper.Info(Print.barcode + "二维码打印记录存储完成!"); + iNIFile.IniWriteValue("SystemConfig", "PrintState", "2"); } equip.Colse(); @@ -552,7 +611,23 @@ namespace BarTenderPrint equip.tempPath = barcodelb.TempName; equip.ParaClass = barcodelb; equip.Open(); - equip.print(); + bool bflag = equip.print(); + if (bflag) + { + iNIFile.IniWriteValue("SystemConfig", "PrintState", "2"); + RefreshShowMessageEvent?.Invoke("二维码标签打印成功!"); + //插库存储条码及序列号 + baseBarcodePrintInfo BarcodePrintInfo = new baseBarcodePrintInfo(); + BarcodePrintInfo.ID = Guid.NewGuid().ToString("N"); + BarcodePrintInfo.ProductBarcode = barcode; + BarcodePrintInfo.ProductID = machine; + BarcodePrintInfo.SerialNo = DateTime.Now.ToString("yyMMdd") + Serialnum; + BarcodePrintInfo.IsRestart = "0"; + BarcodePrintInfo.ShiftID = ShiftNo; + BarcodePrintInfo.InsertTime = DateTime.Now; + await new BaseServices().Add(BarcodePrintInfo); + RefreshShowMessageEvent?.Invoke("打印记录存储完成!"); + } equip.Colse(); } @@ -685,7 +760,8 @@ namespace BarTenderPrint } else { - exp = ExpressionExtensions.And>(exp, (Expression>)((baseBarcodePrintInfo s1) => s1.ShiftID == ShiftID && s1.ProductID == ProductID && s1.InsertTime > start && s1.InsertTime < end)); + //exp = ExpressionExtensions.And>(exp, (Expression>)((baseBarcodePrintInfo s1) => s1.ShiftID == ShiftID && s1.ProductID == ProductID && s1.InsertTime > start && s1.InsertTime <= end)); + exp = ExpressionExtensions.And>(exp, (Expression>)((baseBarcodePrintInfo s1) => s1.ShiftID == ShiftID && s1.ProductID == ProductID)); } return await new BaseServices().Query(exp); } diff --git a/Manager/BarTenderPrint/equip/QRCodePrintEquip.cs b/Manager/BarTenderPrint/equip/QRCodePrintEquip.cs index ac69fe9..23f11f1 100644 --- a/Manager/BarTenderPrint/equip/QRCodePrintEquip.cs +++ b/Manager/BarTenderPrint/equip/QRCodePrintEquip.cs @@ -12,43 +12,17 @@ namespace BarTenderPrint public override bool AddPara() { var para = base.ParaClass as barcodLable; + string SerialNum = para.SerialNum; if (para != null) { try { - ICodeType equip = DynamicClass(para.codeType); - if (equip == null) + if (base.EngineFormat.SubStrings.Count == 0) { - Console.WriteLine("未找到动态生成类"); - return false; - } - string barcode = equip.GetBarcode(para);//返回字符串用，隔开 - Console.WriteLine($"条码:{barcode}"); - string[] barcodeList = barcode.Split(','); - if (barcodeList.Length < 1) - { - Console.WriteLine("字符串返回为空"); - return false ; - } - if (para.codeType == "126") - { - base.EngineFormat.SubStrings["code0"].Value = barcodeList[0]; return true; } - base.EngineFormat.SubStrings["code0"].Value = barcodeList[0]; - if (barcodeList.Length > 1) - { - for (int i = 1; i < barcodeList.Length; i++) - { - string code = "code" + i.ToString(); - base.EngineFormat.SubStrings[code].Value = barcodeList[i]; - } - } - if (para.codeType == "102") - { - base.EngineFormat.SubStrings["code5"].Value = para.ZJWeight; - } - + base.EngineFormat.SubStrings["code0"].Value = SerialNum; + base.EngineFormat.SubStrings["code1"].Value = SerialNum; return true; } catch (Exception e) diff --git a/Manager/BarTenderPrint/equip/barcodePrintEquip.cs b/Manager/BarTenderPrint/equip/barcodePrintEquip.cs index 4a8ad23..4e2f934 100644 --- a/Manager/BarTenderPrint/equip/barcodePrintEquip.cs +++ b/Manager/BarTenderPrint/equip/barcodePrintEquip.cs @@ -12,18 +12,18 @@ namespace BarTenderPrint public override bool AddPara() { var para = base.ParaClass as barcodLable; + string SerialNum = para.SerialNum; + if (para != null) { try { - ICodeType equip = DynamicClass(para.codeType); - if (equip == null) + if (base.EngineFormat.SubStrings.Count == 0) { - Console.WriteLine("未找到动态生成类"); return false; } - string barcode = equip.GetBarcode(para); - base.EngineFormat.SubStrings["code0"].Value = barcode; + base.EngineFormat.SubStrings["code0"].Value = SerialNum; + base.EngineFormat.SubStrings["code1"].Value = SerialNum; return true; } catch(Exception e) diff --git a/Mesnac.Compressor.Station/BasePLC.cs b/Mesnac.Compressor.Station/BasePLC.cs index ef03003..990eb5d 100644 --- a/Mesnac.Compressor.Station/BasePLC.cs +++ b/Mesnac.Compressor.Station/BasePLC.cs @@ -79,18 +79,24 @@ namespace Mesnac.Compressor.Station message = "下发直接放行指令"; break; case 6: - message = "扫码超时"; + message = "190工位氦检不合格"; + break; + case 7: + message = "210控制器螺栓紧固不合格"; + break; + case 8: + message = "220控制器腔体检漏不合格"; break; default: break; } int address = (int)PLCAddressList.AskWorkResult; - bool result1 = _equip.Write(sta.PLCBlock, address, data); - ICSharpCode.Core.LoggingService.Debug(sta.StationCode + sta.StationName + ":" + message +","+ sta.PLCBlock+" 偏移量 "+ address+"写入结果："+ result1); + bool result1 = _equip.Write(int.Parse(_equip.Group["B1"].Block), address, data); + ICSharpCode.Core.LoggingService.Debug(sta.StationCode + sta.StationName + ":" + message +","+ int.Parse(_equip.Group["B1"].Block) + " 偏移量 "+ address+"写入结果："+ result1); if (reslut == 5) { - _equip.Write(sta.PLCBlock, (int)2, new object[] { 0 }); - ICSharpCode.Core.LoggingService.Debug(sta.StationCode + sta.StationName + "块号" + sta.PLCBlock + "偏移" + (int)2 + ",置位放行请求信号"); + _equip.Write(int.Parse(_equip.Group["B1"].Block), (int)2, new object[] { 0 }); + ICSharpCode.Core.LoggingService.Debug(sta.StationCode + sta.StationName + "块号" + int.Parse(_equip.Group["B1"].Block) + "偏移" + (int)2 + ",置位放行请求信号"); } } catch (Exception ex) @@ -129,10 +135,10 @@ namespace Mesnac.Compressor.Station object[] data = new object[1]; data[0] = 1;//对照与PLC定义的点位信息 - _equip.Write(sta.PLCBlock, (int)PLCAddressList.SavaDataResult, data); - ICSharpCode.Core.LoggingService.Debug(sta.StationCode + sta.StationName + "块号"+ sta.PLCBlock+ "偏移"+(int)PLCAddressList.SavaDataResult + ":下发保存数据成功放行信号"); - _equip.Write(sta.PLCBlock, (int)2, new object[] { 0 }); - ICSharpCode.Core.LoggingService.Debug(sta.StationCode + sta.StationName + "块号" + sta.PLCBlock + "偏移" + (int)2 + ",置位放行请求信号"); + _equip.Write(int.Parse(_equip.Group["B1"].Block), (int)PLCAddressList.SavaDataResult, data); + ICSharpCode.Core.LoggingService.Debug(sta.StationCode + sta.StationName + "块号"+ int.Parse(_equip.Group["B1"].Block) + "偏移"+(int)PLCAddressList.SavaDataResult + ":下发保存数据成功放行信号"); + _equip.Write(int.Parse(_equip.Group["B1"].Block), (int)2, new object[] { 0 }); + ICSharpCode.Core.LoggingService.Debug(sta.StationCode + sta.StationName + "块号" + int.Parse(_equip.Group["B1"].Block) + "偏移" + (int)2 + ",置位放行请求信号"); //ICSharpCode.Core.LoggingService.Debug(sta.StationName + ":下发保存数据成功放行信号"); } catch (Exception ex) diff --git a/Mesnac.Compressor.Station/Common.cs b/Mesnac.Compressor.Station/Common.cs index 5ffc582..84ac1a4 100644 --- a/Mesnac.Compressor.Station/Common.cs +++ b/Mesnac.Compressor.Station/Common.cs @@ -164,7 +164,7 @@ namespace Mesnac.Compressor.Station try { sb.Append("select top(1)barcode from T_SY_TraceState "); - sb.Append(" where SemiBarcode_A='").Append(semibarcode).Append("' order by BeginTime desc"); + sb.Append(" where ProductBarcode='").Append(semibarcode).Append("' order by BeginTime desc"); DbHandler db = new DbHandler(); db.dbHelper.ClearParameter(); db.dbHelper.CommandType = CommandType.Text; @@ -788,14 +788,39 @@ namespace Mesnac.Compressor.Station } return semibarcode; } - public string GetZhuYouByKTBarCode(string productbarcode) + public void DeleteStationData(string tablename, string ProductBarCode) + { + try + { + DbHandler db = new DbHandler(); + db.dbHelper.ClearParameter(); + db.dbHelper.CommandType = CommandType.Text; + db.dbHelper.CommandText = "DELETE FROM " + tablename + " WHERE ScanBarcode=@ProductBarCode "; + db.dbHelper.AddParameter("@ProductBarCode", ProductBarCode); + + db.dbHelper.ExecuteNonQuery(); + } + catch (Exception ex) + { + ICSharpCode.Core.LoggingService.Error(ex.ToString()); + } + } + public string GetZhuYouByKTBarCode(string productbarcode,string paratype) { StringBuilder sb = new StringBuilder(); try { if (productbarcode != "") { - sb.Append(" SELECT TOP(1) Para2 FROM T_RP_StationPara_B140 WHERE ScanBarcode='").Append(productbarcode).Append("' order by InsertTime desc"); + if (paratype == "预加油重量") + { + sb.Append(" SELECT TOP(1) Para1 FROM T_RP_StationPara_220_1 WHERE ScanBarcode='").Append(productbarcode).Append("' order by InsertTime desc"); + } + else + { + sb.Append(" SELECT TOP(1) Para2 FROM T_RP_StationPara_220_1 WHERE ScanBarcode='").Append(productbarcode).Append("' order by InsertTime desc"); + } + } DbHandler db = new DbHandler(); @@ -885,6 +910,40 @@ namespace Mesnac.Compressor.Station return ""; } } + public bool Get90Quality(string barcode) + { + bool iflag = false; + StringBuilder sb = new StringBuilder(); + try + { + sb.Append(" SELECT TOP(1) State FROM dbo.T_RP_StationPara_B90 WHERE SemiBarcode= '").Append(barcode).Append("' ").Append(" order by InsertTime desc"); + DbHandler db = new DbHandler(); + db.dbHelper.ClearParameter(); + db.dbHelper.CommandType = CommandType.Text; + db.dbHelper.CommandText = ""; + + db.dbHelper.CommandText = sb.ToString(); + var obj = db.dbHelper.ToScalar(); + if (obj != null) + { + if (obj.ToString() == "1") + { + iflag = true; + } + return iflag; + } + else + { + return iflag; + } + } + catch (Exception e) + { + ICSharpCode.Core.LoggingService.Error("静盘工位信息查询错误:" + barcode + sb.ToString() + "/r/n" + e.ToString()); + return iflag; + } + + } public string getSemiBarcodeAByDongPanCode(string productbarcode) { StringBuilder sb = new StringBuilder(); @@ -922,8 +981,8 @@ namespace Mesnac.Compressor.Station StringBuilder sb = new StringBuilder(); try { - sb.Append(" UPDATE dbo.T_SY_TraceState SET FinishFlag=1,EndTime=GETDATE(),CurrentStationID='20',state=1 "); - sb.Append(" where SemiBarcode_A='").Append(SemiBarcode_A).Append("'"); + sb.Append(" UPDATE dbo.T_SY_TraceState SET FinishFlag=1,EndTime=GETDATE(),CurrentStationID='29',state=1 "); + sb.Append(" where ProductBarcode='").Append(SemiBarcode_A).Append("'"); DbHandler db = new DbHandler(); db.dbHelper.ClearParameter(); db.dbHelper.CommandType = CommandType.Text; @@ -1400,6 +1459,38 @@ namespace Mesnac.Compressor.Station return iflag; } } + public string GetABarCode(string barcode) + { + string iflag = ""; + try + { + StringBuilder sb = new StringBuilder(); + if (barcode != "") + { + sb.Append(" SELECT TOP(1) SemiBarcode FROM T_RP_BarcodeRelationShip WHERE ProductBarcode='").Append(barcode).Append("' order by InsertTime desc"); + } + DbHandler db = new DbHandler(); + db.dbHelper.ClearParameter(); + db.dbHelper.CommandType = CommandType.Text; + db.dbHelper.CommandText = ""; + //ICSharpCode.Core.LoggingService.InfoFormatted("查询上工位信息:{0},{1}：", sb.ToString(), barcode); + db.dbHelper.CommandText = sb.ToString(); + var obj = db.dbHelper.ToScalar(); + if (obj != null) + { + return obj.ToString(); + } + else + { + return ""; + } + } + catch (Exception ex) + { + ICSharpCode.Core.LoggingService.Error("Trace工位查询错误:" + ex.ToString()); + return iflag; + } + } public bool IsReStartProduction(string barcode) { bool iflag = false; @@ -1690,6 +1781,70 @@ namespace Mesnac.Compressor.Station } } + public string GetHCodeByProductBarCode(string ProductBarCode) + { + string SemiBarcode = ""; + StringBuilder sb = new StringBuilder(); + try + { + sb.Append(" SELECT TOP(1) SemiBarcode_C FROM dbo.T_SY_TraceState WHERE ProductBarcode= '").Append(ProductBarCode).Append("' ").Append(" order by BeginTime desc"); + DbHandler db = new DbHandler(); + db.dbHelper.ClearParameter(); + db.dbHelper.CommandType = CommandType.Text; + db.dbHelper.CommandText = ""; + + db.dbHelper.CommandText = sb.ToString(); + var obj = db.dbHelper.ToScalar(); + if (obj != null) + { + SemiBarcode = obj.ToString(); + return SemiBarcode; + } + else + { + return SemiBarcode; + } + } + catch (Exception e) + { + ICSharpCode.Core.LoggingService.Error("控制器绑定信息查询错误:" + ProductBarCode + sb.ToString() + "/r/n" + e.ToString()); + return SemiBarcode; + } + + } + + public string GetKCodeByProductBarCode(string ProductBarCode) + { + string SemiBarcode = ""; + StringBuilder sb = new StringBuilder(); + try + { + sb.Append(" SELECT TOP(1) SemiBarcode2 FROM dbo.T_SY_TraceState WHERE ProductBarcode= '").Append(ProductBarCode).Append("' ").Append(" order by BeginTime desc"); + DbHandler db = new DbHandler(); + db.dbHelper.ClearParameter(); + db.dbHelper.CommandType = CommandType.Text; + db.dbHelper.CommandText = ""; + + db.dbHelper.CommandText = sb.ToString(); + var obj = db.dbHelper.ToScalar(); + if (obj != null) + { + SemiBarcode = obj.ToString(); + return SemiBarcode; + } + else + { + return SemiBarcode; + } + } + catch (Exception e) + { + ICSharpCode.Core.LoggingService.Error("控制器绑定信息查询错误:" + ProductBarCode + sb.ToString() + "/r/n" + e.ToString()); + return SemiBarcode; + } + + } + public string GetMBarcodeByProductBarCode(string KT_BarCode) { string SemiBarcode = ""; @@ -1721,51 +1876,98 @@ namespace Mesnac.Compressor.Station } } - public bool GetStationNGBySemiBarCode(string SemiBarCode) + public bool GetStationNGBySemiBarCode(string BarCode,string StationCode) { bool iflag = false; + string sql = ""; try { DbHandler db = new DbHandler(); if (db.dbHelper == null) { - return iflag; + return false; } db.dbHelper.ClearParameter(); db.dbHelper.CommandType = CommandType.Text; db.dbHelper.CommandText = ""; - string sql = "Exec pro_AllProductionQualityInfo @BarCode"; - db.dbHelper.AddParameter("@BarCode", SemiBarCode); + sql = "Exec pro_AllProductionQualityInfo @barcode,@StationCode"; + db.dbHelper.AddParameter("@barcode", BarCode); + db.dbHelper.AddParameter("@StationCode", StationCode); db.dbHelper.CommandText = sql; DataSet ds = (DataSet)db.dbHelper.ToDataSet(); DataTable dt = ds.Tables[0]; if (dt != null && dt.Rows.Count > 0) { + for (int i = 0; i < dt.Rows.Count; i++) { //这里如果要判断最后一工位与倒数第二个工位互锁，取ID=16 string s = dt.Rows[i]["State"].ToString(); - if (dt.Rows[i]["State"].ToString() == "2") - { - iflag = true; - return iflag; - } - else if (dt.Rows[i]["State"].ToString() == null || dt.Rows[i]["State"].ToString() == "") + if (dt.Rows[i]["State"].ToString() != "1") { iflag = true; + ICSharpCode.Core.LoggingService.ErrorFormatted("{0}工位数据NG！", dt.Rows[i]["StationName"].ToString()); return iflag; } + } } return iflag; } catch (Exception ex) { - return iflag; + ICSharpCode.Core.LoggingService.Error("获取条码语句错误:" + sql.ToString() + "/r/n" + ex.ToString()); + return false; } } - + public DataTable GetXNByProductCode(string BarCode, string StationCode) + { + bool iflag = false; + string sql = ""; + DataTable dt; + try + { + DbHandler db = new DbHandler(); + if (db.dbHelper == null) + { + return null; + } + db.dbHelper.ClearParameter(); + db.dbHelper.CommandType = CommandType.Text; + db.dbHelper.CommandText = ""; + sql = "Exec pro_AllProductionQualityInfo @barcode,@StationCode"; + db.dbHelper.AddParameter("@barcode", BarCode); + db.dbHelper.AddParameter("@StationCode", StationCode); + db.dbHelper.CommandText = sql; + + DataSet ds = (DataSet)db.dbHelper.ToDataSet(); + dt = ds.Tables[0]; + if (dt != null && dt.Rows.Count > 0) + { + ICSharpCode.Core.LoggingService.Info("查询当前工位信息：" + sql); + //for (int i = 0; i < dt.Rows.Count; i++) + //{ + // //这里如果要判断最后一工位与倒数第二个工位互锁，取ID=16 + // string s = dt.Rows[i]["State"].ToString(); + // if (dt.Rows[i]["State"].ToString() != "1") + // { + // iflag = true; + // ICSharpCode.Core.LoggingService.ErrorFormatted("{0}工位数据NG！", dt.Rows[i]["StationName"].ToString()); + // return dt; + // } + + //} + return dt; + } + return dt; + } + catch (Exception ex) + { + ICSharpCode.Core.LoggingService.Error("获取条码语句错误:" + sql.ToString() + "/r/n" + ex.ToString()); + return null; + } + } /// /// 获取产品信息 /// @@ -1972,8 +2174,10 @@ namespace Mesnac.Compressor.Station PreNoWork = 3,//上一工位未工作 TakeNG = 4,//NG物料拿取 FangXing = 5,//直接放行 - NORFID = 6,//直接放行 - MaterialNoMatch = 7//物料不匹配 + HJNG = 6,//氦检NG + LSJGNG = 7,//控制器螺丝机NG + KZQQTNG = 8,//控制器腔体检漏NG + CZNG = 9 } } diff --git a/Mesnac.Compressor.Station/Mesnac.Compressor.Station.csproj b/Mesnac.Compressor.Station/Mesnac.Compressor.Station.csproj index 546243c..5abc130 100644 --- a/Mesnac.Compressor.Station/Mesnac.Compressor.Station.csproj +++ b/Mesnac.Compressor.Station/Mesnac.Compressor.Station.csproj @@ -9,7 +9,7 @@ Properties Mesnac.Compressor.Station Mesnac.Compressor.Station - v4.0 + v4.5.2 512 diff --git a/Mesnac.Compressor.Station/NoRFIDStation.cs b/Mesnac.Compressor.Station/NoRFIDStation.cs index 9822b13..4b8acaa 100644 --- a/Mesnac.Compressor.Station/NoRFIDStation.cs +++ b/Mesnac.Compressor.Station/NoRFIDStation.cs @@ -18,27 +18,20 @@ namespace Mesnac.Compressor.Station public bool PrepareWork(StationInfo station) { - + //if (station.Data.subLineList.Count == 0) + //{ + // ICSharpCode.Core.LoggingService.Error(station.StationCode + "未收到PLC传递的条码"); + // this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.NoBarCode); + // return false; + //} + //ICSharpCode.Core.LoggingService.DebugFormatted("查询{0}是否开启MES", station.stationID); //先判断后台开关是否打开在进行逻辑验证 bool iflag = IsOpen(station.stationID); if (iflag) { + //ICSharpCode.Core.LoggingService.Debug("查询已开启MES"); //主线产品码未扫描到条码下发PLC报警 - //大转盘壳体条码 - if (station.stationID == "1" || station.stationID == "9"|| station.stationID == "11" || station.stationID == "12"|| station.stationID == "15" || station.stationID == "16") - { - if (string.IsNullOrEmpty(station.Data.subLineList[1].barcode) || station.Data.subLineList[1].barcode.Equals("ERROR")) - { - ICSharpCode.Core.LoggingService.Error(station.StationCode + "未收到PLC传递的条码"); - this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.NoBarCode); - return false; - } - else - { - ICSharpCode.Core.LoggingService.DebugFormatted("{0}收到PLC条码:{1}", station.StationCode, station.Data.subLineList[1].barcode); - } - } - else if (station.stationID == "8") + if (station.stationID == "9" || station.stationID == "10") { if (string.IsNullOrEmpty(station.Data.subLineList[2].barcode) || station.Data.subLineList[2].barcode.Equals("ERROR")) { @@ -51,7 +44,7 @@ namespace Mesnac.Compressor.Station ICSharpCode.Core.LoggingService.DebugFormatted("{0}收到PLC条码:{1}", station.StationCode, station.Data.subLineList[2].barcode); } } - else if(station.stationID == "17" || station.stationID == "18") + else if(station.stationID == "2" || station.stationID == "20" || station.stationID == "22" || station.stationID == "25" || station.stationID == "26" || station.stationID == "27" || station.stationID == "28" || station.stationID == "29" || station.stationID == "30" || station.stationID == "31" || station.stationID == "32") { if (string.IsNullOrEmpty(station.Data.ProductBarcode) || station.Data.ProductBarcode.Equals("ERROR")) { @@ -62,62 +55,45 @@ namespace Mesnac.Compressor.Station else { ICSharpCode.Core.LoggingService.DebugFormatted("{0}收到PLC条码:{1}", station.StationCode, station.Data.ProductBarcode); - } - } - else if (station.stationID == "19") - { - if (string.IsNullOrEmpty(station.Data.subLineList[1].barcode) || station.Data.subLineList[1].barcode.Equals("ERROR")) - { - ICSharpCode.Core.LoggingService.Error(station.StationCode + "未收到PLC传递的条码"); - this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.NoBarCode); - return false; - } - //根据壳体条码查询注油量 - else - { - ICSharpCode.Core.LoggingService.DebugFormatted("{0}收到PLC条码:{1}", station.StationCode, station.Data.subLineList[1].barcode); - string ZhuYou = GetZhuYouByKTBarCode(station.Data.subLineList[1].barcode); - if (string.IsNullOrEmpty(ZhuYou)) + //240 + if (station.stationID == "29") { - ICSharpCode.Core.LoggingService.Error(station.StationCode + "未查询到注油量"); - this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.TakeNG); - return false; - } - ICSharpCode.Core.LoggingService.DebugFormatted("查询{0}裸机重量:{1}", station.Data.subLineList[1].barcode, ZhuYou); - float cc = float.Parse(ZhuYou); - //ICSharpCode.Core.LoggingService.DebugFormatted("查询{0}裸机重量-120后:{1}", station.Data.subLineList[1].barcode, cc); + string 预加油重量 = GetZhuYouByKTBarCode(station.Data.ProductBarcode.Trim(),"预加油重量"); + string 裸机重量 = GetZhuYouByKTBarCode(station.Data.ProductBarcode.Trim(), "裸机重量"); - object[] ZhuYouLiang = floatToObject(cc); - //向PLC写入裸机重量 - bool bflag = WritePLCByByte(station, 20, ZhuYouLiang); - if (bflag) - { - ICSharpCode.Core.LoggingService.DebugFormatted("写入{0}裸机重量:{1}", station.Data.subLineList[1].barcode, ZhuYou); + if (string.IsNullOrEmpty(预加油重量)) + { + ICSharpCode.Core.LoggingService.Error(station.StationCode + "未查询到预加油后重量"); + this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.TakeNG); + return false; + } + if (string.IsNullOrEmpty(裸机重量)) + { + ICSharpCode.Core.LoggingService.Error(station.StationCode + "未查询到裸机重量"); + this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.TakeNG); + return false; + } + ICSharpCode.Core.LoggingService.DebugFormatted("查询{0}预加油后重量:{1},裸机重量{2}", station.Data.ProductBarcode.Trim(), 预加油重量, 裸机重量); + float f_预加油后重量 = float.Parse(预加油重量); + float f_裸机重量 = float.Parse(裸机重量); + //ICSharpCode.Core.LoggingService.DebugFormatted("查询{0}裸机重量-120后:{1}", station.Data.subLineList[1].barcode, cc); + + object[] ZhuYouLiang = floatToObject(f_预加油后重量); + object[] luojizhongliang = floatToObject(f_裸机重量); + //向PLC写入裸机重量 + bool bflag = WritePLCByByte(station, 40, ZhuYouLiang); + bool bflag1 = WritePLCByByte(station, 50, luojizhongliang); + if (bflag && bflag1) + { + ICSharpCode.Core.LoggingService.DebugFormatted("写入{0}预加油后重量:{1},裸机重量{2}", station.Data.ProductBarcode.Trim(), 预加油重量, 裸机重量); + } } } } - //else if (station.stationID == "8") - //{ - // if (string.IsNullOrEmpty(station.Data.ProductBarcode) || station.Data.ProductBarcode.Equals("ERROR")) - // { - // ICSharpCode.Core.LoggingService.Error(station.StationCode + "未收到PLC传递的条码"); - // this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.NoBarCode); - // return false; - // } - //} - //前盖条码 - //else if (station.stationID == "5") - //{ - // if (string.IsNullOrEmpty(station.Data.subLineList[2].barcode) || station.Data.subLineList[2].barcode.Equals("ERROR")) - // { - // ICSharpCode.Core.LoggingService.Error(station.StationCode + "未收到PLC传递的条码"); - // this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.NoBarCode); - // return false; - // } - //} + //静盘条码 - else if (station.stationID == "3") + else if (station.stationID == "12" || station.stationID == "16") { if (string.IsNullOrEmpty(station.Data.subLineList[4].barcode) || station.Data.subLineList[4].barcode.Equals("ERROR")) { @@ -126,131 +102,161 @@ namespace Mesnac.Compressor.Station return false; } } - //动盘条码 - //else if (station.stationID == "12") - //{ - // if (!station.Data.DP_OpenFlag) - // { - // if (string.IsNullOrEmpty(station.Data.subLineList[3].barcode) || station.Data.subLineList[3].barcode.Equals("ERROR")) - // { - // ICSharpCode.Core.LoggingService.Error(station.StationCode + "未收到PLC传递的条码"); - // this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.NoBarCode); - // return false; - // } - // } - //} - //后盖条码 - //else if (station.stationID == "15") - //{ - // if (string.IsNullOrEmpty(station.Data.subLineList[5].barcode) || station.Data.subLineList[5].barcode.Equals("ERROR")) - // { - // ICSharpCode.Core.LoggingService.Error(station.StationCode + "未收到PLC传递的条码"); - // this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.NoBarCode); - // return false; - // } - //} - //判断上一工位开关是否打开 - string preStationID = GetFirstStationIDByStationID(station.stationID); - if (!string.IsNullOrEmpty(preStationID)) + else if (station.stationID == "23") { - bool iPreflag = IsOpen(preStationID); - if (iPreflag) + if (string.IsNullOrEmpty(station.Data.subLineList[1].barcode) || station.Data.subLineList[1].barcode.Equals("ERROR")) { - string LastWorkInfo = ""; - if (station.stationID == "3") + ICSharpCode.Core.LoggingService.Error(station.StationCode + "未收到PLC传递的条码"); + this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.NoBarCode); + return false; + } + } + //ICSharpCode.Core.LoggingService.DebugFormatted("查询{0}工位已开启MES", preStationID); + string LastWorkInfo = ""; + if (LastWorkInfo == "") + { + //后盖螺栓紧固工位新增查询壳体是否绑定后盖逻辑 + if (station.stationID == "20") + { + //根据壳体码查询控制器是否绑定 + string _hgCode = GetHCodeByProductBarCode(station.Data.ProductBarcode); + if (string.IsNullOrEmpty(_hgCode)) { - //通过静盘条码查询A码 - string Sem = getSemiBarcodeAByDongPanCode(station.Data.subLineList[4].barcode); - //通过A码查询上工位 - if (!string.IsNullOrEmpty(Sem)) - { - LastWorkInfo = LastWorkProductionInfo(Sem, station.PreTableName, "SemiBarcode"); - } - else - { - ICSharpCode.Core.LoggingService.Error(station.StationCode + "检测无上工位信息"); - this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.PreNoWork); - return false; - } + ICSharpCode.Core.LoggingService.Error(station.StationCode + "检测未存在后盖绑定信息"); + this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.PreNoWork); + return false; } else { - if (station.stationID != "8") + LastWorkInfo = "1"; + } + } + //检漏工位 + if (station.stationID == "23") + { + //启用绝缘工位互锁后检漏工位判断上工位是否合格业务逻辑 + if (station.Data.subLineList[1].barcode.Trim() == "LOU PING XIAO YAN" || station.Data.subLineList[1].barcode.Trim() == "KONGPINGXIAOYAN" || station.Data.subLineList[1].barcode.Trim() == "KONGJIANH" || station.Data.subLineList[1].barcode.Trim() == "FU WEI" || station.Data.subLineList[1].barcode.Trim() == "FUWEI" || station.Data.subLineList[1].barcode.Trim() == "KONGJIAN"|| station.Data.subLineList[1].barcode.Trim() == "LOUPINGXIAOYAN") + { + LastWorkInfo = "1"; + } + else + { + bool _NGflag = GetStationNGBySemiBarCode(station.Data.subLineList[1].barcode.Trim(), "190"); + if (!_NGflag) { - - if (station.stationID == "15") - { - string LastWorkInfo1 = LastWorkProductionInfo(station.Data.subLineList[1].barcode, "T_RP_StationPara_B130_1", "ScanBarcode"); - if (string.IsNullOrEmpty(LastWorkInfo1)) - { - string LastWorkInfo2 = LastWorkProductionInfo(station.Data.subLineList[1].barcode, "T_RP_StationPara_B130_2", "ScanBarcode"); - if (!string.IsNullOrEmpty(LastWorkInfo2)) - { - LastWorkInfo = LastWorkInfo2; - } - } - else - { - LastWorkInfo = LastWorkInfo1; - } - } - else if (station.stationID == "13" || station.stationID == "14") - { - //启用绝缘工位互锁后检漏工位判断上工位是否合格业务逻辑 - if (station.Data.subLineList[1].barcode == "00000000000000000000") - { - LastWorkInfo = "1"; - } - else - { - LastWorkInfo = LastWorkProductionInfo(station.Data.subLineList[1].barcode, station.PreTableName, "ScanBarcode"); - } - - } - else - { - if (station.stationID == "17"|| station.stationID == "18") - { - LastWorkInfo = LastWorkProductionInfo(station.Data.ProductBarcode, station.PreTableName, "ScanBarcode"); - } - else - { - LastWorkInfo = LastWorkProductionInfo(station.Data.subLineList[1].barcode, station.PreTableName, "ScanBarcode"); - } - } + LastWorkInfo = "1"; } } - - - //没有上工位信息 if (string.IsNullOrEmpty(LastWorkInfo)) { ICSharpCode.Core.LoggingService.Error(station.StationCode + "检测无上工位信息"); this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.PreNoWork); return false; } - else + + } + //控制器螺栓紧固 + if (station.stationID == "25") + { + //根据壳体码查询控制器是否绑定 + string _ktCode = GetKCodeByProductBarCode(station.Data.ProductBarcode); + if (string.IsNullOrEmpty(_ktCode)) { - //NG物料拿取 - if (LastWorkInfo != "1") + ICSharpCode.Core.LoggingService.Error(station.StationCode + "检测无上工位信息"); + this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.PreNoWork); + return false; + } + else + { + LastWorkInfo = "1"; + } + } + //性能测试 + if (station.stationID == "28") + { + //ICSharpCode.Core.LoggingService.Debug("性能检测互锁查询"); + DataTable _NGflag = GetXNByProductCode(station.Data.ProductBarcode.Trim(), "230_1"); + if (_NGflag != null && _NGflag.Rows.Count > 0) + { + for (int i = 0; i < _NGflag.Rows.Count; i++) { - if (LastWorkInfo == "0") + string s = _NGflag.Rows[i]["State"].ToString(); + if (_NGflag.Rows[i]["State"].ToString() != "1") { - this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.OK); - return false; - } - else - { - ICSharpCode.Core.LoggingService.Error(station.StationCode + "检测上工位信息不合格,NG物料拿取"); - this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.TakeNG); - return false; + //区分报警类型 + //控制器螺栓紧固 + if (_NGflag.Rows[i]["TableName"].ToString() == "T_RP_StationPara_210") + { + ICSharpCode.Core.LoggingService.Error(station.StationCode + "检测无上工位信息"); + this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.LSJGNG); + return false; + } + //氦检 + else if (_NGflag.Rows[i]["TableName"].ToString() == "T_RP_StationPara_190_1") + { + ICSharpCode.Core.LoggingService.Error(station.StationCode + "检测无上工位信息"); + this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.HJNG); + return false; + } + //控制器腔体检漏，称重 + else if (_NGflag.Rows[i]["TableName"].ToString() == "T_RP_StationPara_220") + { + ICSharpCode.Core.LoggingService.Error(station.StationCode + "检测无上工位信息"); + this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.KZQQTNG); + return false; + } + else if (_NGflag.Rows[i]["TableName"].ToString() == "T_RP_StationPara_220_1") + { + ICSharpCode.Core.LoggingService.Error(station.StationCode + "检测无上工位信息"); + this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.CZNG); + return false; + } + ICSharpCode.Core.LoggingService.ErrorFormatted("{0}工位数据NG！", _NGflag.Rows[i]["StationName"].ToString()); } } + LastWorkInfo = "1"; + } + else + { + LastWorkInfo = "1"; + } + } + //注油称重锁性能 + if (station.stationID == "29") + { + LastWorkInfo = LastWorkProductionInfo(station.Data.ProductBarcode.Trim(), "T_RP_StationPara_230_1", "ScanBarcode"); + } + //螺栓紧固锁称重注油 + if (station.stationID == "30") + { + LastWorkInfo = LastWorkProductionInfo(station.Data.ProductBarcode.Trim(), "T_RP_StationPara_240", "ScanBarcode"); + } + + if (station.stationID == "2" || station.stationID == "9" || station.stationID == "10" || station.stationID == "12" || station.stationID == "16" || station.stationID == "22" || station.stationID == "26" || station.stationID == "27" || station.stationID == "31" || station.stationID == "32") + { + LastWorkInfo = "1"; + } + //没有上工位信息 + if (string.IsNullOrEmpty(LastWorkInfo)) + { + ICSharpCode.Core.LoggingService.Error(station.StationCode + "检测无上工位信息"); + this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.PreNoWork); + return false; + } + else + { + //NG物料拿取 + if (LastWorkInfo != "1") + { + ICSharpCode.Core.LoggingService.Error(station.StationCode + "检测无上工位信息"); + this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.PreNoWork); + return false; } } } - //这里加一个物料是否匹配=======//还要加判断，当前工位是否需要判断 - //ICSharpCode.Core.LoggingService.Debug("》》》》》》开始写入PLC反馈信号！"); + + //这里加一个物料是否匹配=======//还要加判断，当前工位是否需要判断 + //ICSharpCode.Core.LoggingService.Debug("》》》》》》开始写入PLC反馈信号！"); } this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.OK); //ICSharpCode.Core.LoggingService.Debug("》》》》》》写入PLC反馈信号完成！"); @@ -262,31 +268,20 @@ namespace Mesnac.Compressor.Station { SqlHelper sh = new SqlHelper(); DbHandler db = new DbHandler(); - if (station.stationID == "3") + if ( station.stationID == "12" || station.stationID == "16") { station.Data.ProductBarcode = station.Data.subLineList[4].barcode; } - else if (station.stationID == "11" || station.stationID == "12" || station.stationID == "13" || station.stationID == "14" || station.stationID == "15" || station.stationID == "16" || station.stationID == "19" || station.stationID == "20") + else if (station.stationID == "23") { - station.Data.ProductBarcode = station.Data.subLineList[1].barcode; + station.Data.ProductBarcode = station.Data.subLineList[1].barcode.Trim(); } - else if (station.stationID == "8") + else if (station.stationID == "9" || station.stationID == "10") { - station.Data.ProductBarcode = station.Data.subLineList[2].barcode; + station.Data.ProductBarcode = station.Data.subLineList[2].barcode.Trim(); } - //判断动静盘工位 - //if (station.stationID == "12") - //{ - // if (!station.Data.DP_OpenFlag) - // { - // //保存绑定动静盘 - // //判断是否含有动静盘条码 - // string DPBarCode = station.Data.subLineList[3].barcode; - // string JPBarCode = station.Data.subLineList[4].barcode; - // string ProductBarCode = station.Data.ProductBarcode; - // db.InsertDJRelationShip(DPBarCode, JPBarCode); - // } - //} + DeleteStationData(station.TableName, station.Data.ProductBarcode); + foreach (subLine s in station.Data.subLineList) { if (!string.IsNullOrEmpty(s.barcode)) @@ -300,32 +295,36 @@ namespace Mesnac.Compressor.Station db.ExecSql(InsertSql); //更新工位 - if (station.stationID != "8") + if (station.stationID != "2" || station.stationID != "9" && station.stationID != "10" && station.stationID != "12" && station.stationID != "16") { - string ABarCode = getSemiBarcodeAByDongPanCode(station.Data.ProductBarcode); - //根据组件码查询A码 - if (!string.IsNullOrEmpty(ABarCode)) + if (!string.IsNullOrEmpty(station.Data.ProductBarcode)) { - if (station.stationID == "20") + if (station.stationID == "32") { /*UPDATE dbo.T_SY_TraceState SET FinishFlag = 1,EndTime = GETDATE(),CurrentStationID = '33',state = 1,NameplateInfo = @serialNum,MarkRecord = @bigCode WHERE SemiBarcode_A = @semibarcode*/ //结束工位 - UpdateCompleteStationInfo(ABarCode); + UpdateCompleteStationInfo(station.Data.ProductBarcode); ICSharpCode.Core.LoggingService.DebugFormatted("{0}工位,{1}条码工位数据更新成功。", station.stationID, station.Data.ProductBarcode); } else { //根据A码查询M码 //获取系统M码 - string Mainbarcode = GetMainBarcode(ABarCode); + string Mainbarcode = GetMainBarcode(station.Data.ProductBarcode); if (!string.IsNullOrEmpty(Mainbarcode)) { + if (station.Data.ProductOkNg != 1) + { + station.Data.MainBarcode = Mainbarcode; + UpdateTraceNgStation(station); + } UpdateTraceStation(station.stationID, Mainbarcode); ICSharpCode.Core.LoggingService.DebugFormatted("{0}工位,{1}条码工位数据更新成功。", station.stationID, station.Data.ProductBarcode); } + } - + } } ICSharpCode.Core.LoggingService.Debug("工位：" + station.StationCode + " 保存数据成功。托盘号：" + station.Data.RFIDNo); diff --git a/Mesnac.Compressor.Station/NormarlStation.cs b/Mesnac.Compressor.Station/NormarlStation.cs index 9e938a4..363b93a 100644 --- a/Mesnac.Compressor.Station/NormarlStation.cs +++ b/Mesnac.Compressor.Station/NormarlStation.cs @@ -388,6 +388,7 @@ namespace Mesnac.Compressor.Station string Abarcode = GetTraySemiBarcode(station.Data.RFIDNo); //判断是否存在物料关系，如果存在则更新，反之插入数据 + InsertBarcodeRelationShip(Abarcode, station.Data.subLineList[1].barcode, "", 1); //更新工位信息并放行 diff --git a/Mesnac.Compressor.Station/ScanBarCodeStation.cs b/Mesnac.Compressor.Station/ScanBarCodeStation.cs index d8c4392..b7317e4 100644 --- a/Mesnac.Compressor.Station/ScanBarCodeStation.cs +++ b/Mesnac.Compressor.Station/ScanBarCodeStation.cs @@ -43,7 +43,7 @@ namespace Mesnac.Compressor.Station //通过壳体码查询主线A码 string SemBarCode = GetSemiBarcodeByProductBarCode(KT_BarCode); //通过主线码查询所有工位质量 - bool isNG = GetStationNGBySemiBarCode(SemBarCode); + //bool isNG = GetStationNGBySemiBarCode(SemBarCode); //下发NG物料拿取 this.DaoWeiQingQiuHandle(station, (int)DaoWeiResult.TakeNG); return false; diff --git a/PlugInPlatform/ICSharpCode.Core/ICSharpCode.Core.csproj b/PlugInPlatform/ICSharpCode.Core/ICSharpCode.Core.csproj index b60bbdc..6f37877 100644 --- a/PlugInPlatform/ICSharpCode.Core/ICSharpCode.Core.csproj +++ b/PlugInPlatform/ICSharpCode.Core/ICSharpCode.Core.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ICSharpCode.Core ICSharpCode.Core - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -30,6 +31,7 @@ prompt 4 AnyCPU + false none @@ -38,6 +40,7 @@ TRACE prompt 4 + false diff --git a/PlugInPlatform/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj b/PlugInPlatform/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj index 3e51474..02cd39b 100644 --- a/PlugInPlatform/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj +++ b/PlugInPlatform/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ICSharpCode.Data.Core ICSharpCode.Data.Core - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -37,6 +39,7 @@ TRACE prompt 4 + false diff --git a/PlugInPlatform/Mesnac.Core/Mesnac.Core.csproj b/PlugInPlatform/Mesnac.Core/Mesnac.Core.csproj index 00e71ac..8f3f266 100644 --- a/PlugInPlatform/Mesnac.Core/Mesnac.Core.csproj +++ b/PlugInPlatform/Mesnac.Core/Mesnac.Core.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.Core Mesnac.Core - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false none @@ -37,6 +39,7 @@ TRACE prompt 4 + false diff --git a/PlugInPlatform/Mesnac.Gui/Mesnac.Gui.csproj b/PlugInPlatform/Mesnac.Gui/Mesnac.Gui.csproj index 813efe0..70035ce 100644 --- a/PlugInPlatform/Mesnac.Gui/Mesnac.Gui.csproj +++ b/PlugInPlatform/Mesnac.Gui/Mesnac.Gui.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.Gui Mesnac.Gui - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false none @@ -37,6 +39,7 @@ TRACE prompt 4 + false diff --git a/PlugInPlatform/Mesnac.PlugIn/Mesnac.PlugIn.csproj b/PlugInPlatform/Mesnac.PlugIn/Mesnac.PlugIn.csproj index f2194c5..07274e8 100644 --- a/PlugInPlatform/Mesnac.PlugIn/Mesnac.PlugIn.csproj +++ b/PlugInPlatform/Mesnac.PlugIn/Mesnac.PlugIn.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.PlugIn Mesnac.PlugIn - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false none @@ -37,6 +39,7 @@ TRACE prompt 4 + false diff --git a/PlugIns/Mesnac.PlugIn.MCProject/Mesnac.PlugIn.MCProject.csproj b/PlugIns/Mesnac.PlugIn.MCProject/Mesnac.PlugIn.MCProject.csproj index 324e161..7082142 100644 --- a/PlugIns/Mesnac.PlugIn.MCProject/Mesnac.PlugIn.MCProject.csproj +++ b/PlugIns/Mesnac.PlugIn.MCProject/Mesnac.PlugIn.MCProject.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Mesnac.PlugIn.MCProject Mesnac.PlugIn.MCProject - v4.0 + v4.5.2 512 @@ -20,6 +20,7 @@ + true @@ -29,6 +30,7 @@ DEBUG;TRACE prompt 4 + false none @@ -37,6 +39,7 @@ TRACE prompt 4 + false