Skip to content

李娜 / Line-Smart-Workstation

转到一个项目
切换导航栏
切换导航栏固定状态
Commit d10e5256 由 LN
选项

Merge branch '无轨道开发' of http://106.15.194.121:8083/lina/Line-Smart-Workstation into 无轨道开发

2 个父辈 75f52895 842be756
全部展开
内嵌 并排
正在显示 37 个修改的文件 包含 297 行增加 和 73 行删除
Common/Setting_Init.cs
......@@ -175,5 +175,15 @@ namespace TSA_V.Common
public static string OfflineMode = "OfflineMode";
public static string PointDisplayType = "PointDisplayType";
/// <summary>
/// 运行中断程序名称
/// </summary>
public static string ProcedureName = "ProcedureName";
/// <summary>
/// 位号
/// </summary>
public static string TagNumber = "TagNumber";
}
}
Common/util/ConfigAppSettings.cs
......@@ -242,5 +242,13 @@ namespace TSA_V.Common
LogUtil.error(LOGGER, "SetValue保存配置出错：AppKey=" + AppKey + "，AppValue=" + AppValue + "," + ex.StackTrace);
}
}
public static void UpdateAppSetting(string key, string value)
{
Configuration configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
configuration.AppSettings.Settings[key].Value = value;
configuration.Save(ConfigurationSaveMode.Modified);
ConfigurationManager.RefreshSection("appSettings");
}
}
}
DeviceLibrary/DeviceLibrary.csproj
......@@ -38,6 +38,9 @@
<Reference Include="Asa.IOModule.AIOBOX">
<HintPath>..\dll\Asa.IOModule.AIOBOX.dll</HintPath>
</Reference>
<Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
<HintPath>..\packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll</HintPath>
</Reference>
<Reference Include="halcondotnet">
<HintPath>..\dll\halcondotnet.dll</HintPath>
</Reference>
......@@ -65,6 +68,8 @@
<HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net46\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceModel.Web" />
<Reference Include="System.Windows.Forms" />
......@@ -103,6 +108,7 @@
<Compile Include="manager\LedManager.cs" />
<Compile Include="manager\LineWidthManager.cs" />
<Compile Include="manager\ResourceControl.cs" />
<Compile Include="manager\ScanRequestLabel.cs" />
<Compile Include="manager\StockInfo.cs" />
<Compile Include="manager\TSAVBean.cs" />
<Compile Include="manager\TSAVBean_Partial.cs" />
......
DeviceLibrary/csvLoad/CSVBomManager.cs
......@@ -181,18 +181,54 @@ namespace TSA_V.LoadCSVLibrary
Dictionary<string, string> pnposlist = new Dictionary<string, string>();
HashSet<string> usedposlist = new HashSet<string>();
List< ComponetInfo > componetlist = new List< ComponetInfo >();
foreach (var com in comList) {
if (string.IsNullOrWhiteSpace(com.PositionNum))
continue;
com.PositionNum = GetPositionNum(com.PositionNum);
if (!string.IsNullOrEmpty(com.PositionNum))
string[] strarr= GetPositionNum(com.PositionNum);
string[] intarr = com.ComCount.Split(';');
if (strarr.Length!=+intarr.Length)
{
MessageBox.Show($"{com.PN}的数量分组{intarr.Length}和位置分组{strarr.Length}，不统一！");
break;
}
int i = index;
int j = 0;
foreach (var item in strarr)
{
usedposlist.Add(com.PositionNum);
pnposlist[com.PN] = com.PositionNum;
ComponetInfo componet = new ComponetInfo();
componet.Id = comList.Count + i;
componet.PositionX=com.PositionX;
componet.PositionNum = item;
componet.PN=com.PN;
componet.Text=com.Text;
componet.ComCount= intarr[j];
componet.ComponentDes=com.ComponentDes;
componet.Notes=com.Notes;
componet.TagNo=com.TagNo;
componetlist.Add(componet);
i++;
j++;
if (!string.IsNullOrEmpty(com.PositionNum))
{
usedposlist.Add(com.PositionNum);
pnposlist[com.PN] = com.PositionNum;
}
}
//com.PositionNum = GetPositionNum(com.PositionNum);
//if (!string.IsNullOrEmpty(com.PositionNum))
//{
// usedposlist.Add(com.PositionNum);
// pnposlist[com.PN] = com.PositionNum;
//}
}
foreach (var com in comList) {
comList.AddRange(componetlist);
List<ComponetInfo> componedate = comList.Where(m => !m.PositionNum.Contains(";")).ToList();
foreach (var com in componedate)
{
if (string.IsNullOrWhiteSpace(com.PositionNum) && !string.IsNullOrWhiteSpace(com.PN))
{
......@@ -218,17 +254,28 @@ namespace TSA_V.LoadCSVLibrary
//}
}
return comList;
return componedate;
}
public static string GetPositionNum(string configPosition )
public static string[] GetPositionNum(string configPosition )
{
TSAVPosition p = CSVPositionReader<TSAVPosition>.GetPositonByNum(configPosition);
if (p != null)
string[] strings=configPosition.Split(';');
string[] strarr=new string[strings.Length];
int i = 0;
foreach (var item in strings)
{
return p.PositionNum;
TSAVPosition p = CSVPositionReader<TSAVPosition>.GetPositonByNum(item);
if (p != null)
{
// return p.PositionNum;
strarr[i] = p.PositionNum;
}
else
{
strarr[i] = "";
}
i++;
}
return "";
return strarr;
}
......@@ -495,7 +542,7 @@ namespace TSA_V.LoadCSVLibrary
{
if (comList[i].IsSameCom(smtPoint))
{
comList[i].ComCount = count;
comList[i].ComCount = count.ToString();
updateOk = true;
break;
}
......@@ -507,7 +554,7 @@ namespace TSA_V.LoadCSVLibrary
{
if (comList[i].PN.Equals(smtPoint.PN))
{
comList[i].ComCount = count;
comList[i].ComCount = count.ToString();
updateOk = true;
break;
}
......@@ -557,10 +604,10 @@ namespace TSA_V.LoadCSVLibrary
List<ComponetInfo> list = (from m in useComponets where m.Id.Equals(obj.Id) select m).ToList();
if (list.Count > 0)
{
obj.ComCount = obj.ComCount - list.Count;
if (obj.ComCount < 0)
obj.ComCount = (int.Parse(obj.ComCount) - list.Count).ToString();
if (int.Parse(obj.ComCount) < 0)
{
obj.ComCount = 0;
obj.ComCount = "0";
}
}
newList.Add(obj);
......
DeviceLibrary/csvLoad/position/ComponetInfo.cs
......@@ -24,48 +24,48 @@ namespace TSA_V.LoadCSVLibrary
/// <summary>
///位号/编号
/// </summary>
[CSVAttribute("Num", true,"位号", "编号")]
[CSVAttribute("Num", true,"位号", "编号", "Part Number")]
public string TagNo { get; set; }
/// <summary>
/// 物料编码/元器件名称
/// </summary>
[CSVAttribute("Code", true, "物料编码", "元器件名称", "Name")]
[CSVAttribute("Code", true, "物料编码", "元器件名称", "Name", "Material Code")]
public string PN { get; set; }
/// <summary>
///元器件描述
/// </summary>
[CSVAttribute("Describe", "元器件描述", false )]
[CSVAttribute("Describe", false, "元器件描述", "Description")]
public string ComponentDes { get; set; }
/// <summary>
///数量
/// </summary>
[CSVAttribute("Count", "数量", true)]
public int ComCount { get; set; }
[CSVAttribute("Count", true,"数量", "Quantity")]
public string ComCount { get; set; }
/// <summary>
///位置
/// </summary>
[CSVAttribute("PNum", true, "料盘位置", "位置", "PositionNum")]
[CSVAttribute("PNum", true, "料盘位置", "位置", "PositionNum", "Lot")]
public string PositionNum { get; set; }
/// <summary>
///X坐标
/// </summary>
[CSVAttribute("PositionX", "X坐标", false)]
[CSVAttribute("PositionX", false,"X坐标", "X")]
public double PositionX { get; set; }
/// <summary>
///Y坐标
/// </summary>
[CSVAttribute("PositionY", "Y坐标", false)]
[CSVAttribute("PositionY", false,"Y坐标", "Y")]
public double PositionY { get; set; }
/// <summary>
///注意事项
/// </summary>
[CSVAttribute("Notes", "注意事项", false)]
[CSVAttribute("Notes",false, "注意事项", "Note")]
public string Notes { get; set; }
/// <summary>
///投影文字
......@@ -116,7 +116,7 @@ namespace TSA_V.LoadCSVLibrary
return true;
}
}
else if (this.TagNo.Equals(point.TagNo))
else if (this.TagNo.Equals(point.TagNo)&&this.PositionNum.Equals(point.PositionNum))
{
return true;
}
......
DeviceLibrary/manager/WorkInfo.cs
using PUSICANLibrary;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using TSA_V.Common;
using TSA_V.DeviceLibrary.manager;
using TSA_V.LoadCSVLibrary;
namespace TSA_V.DeviceLibrary
......@@ -35,7 +33,7 @@ namespace TSA_V.DeviceLibrary
public DateTime LastSetpTime = DateTime.Now;
public uint PreNodeId = 0;
public List<SMTPointInfo> needWorkSmtList = new List<SMTPointInfo>();
//开始工作后共工作了几块电路板
//开始工作后共工作了几块电路板``````
public int BoardCount = 0;
public DateTime beginWorkTime = DateTime.Now;
public bool IsShowAOI = false;
......@@ -131,8 +129,7 @@ namespace TSA_V.DeviceLibrary
endWorkTime = DateTime.Now;
IsWaitMove = false;
waitList = new List<WaitResultInfo>();
}
}
public bool MoveToNextPoint(bool isNext)
{
return MoveToNextPoint(isNext, false);
......@@ -204,7 +201,41 @@ namespace TSA_V.DeviceLibrary
TSAVPosition position = null;
if (com != null)
{
position = CSVPositionReader<TSAVPosition>.GetPositonByNum(com.PositionNum);
#region 2023-10-31添加
//如果当前位置元器件数量为空时，查询当前元器件库相同物料编号的元器件使用
if (int.Parse(com.ComCount) <= 0)
{
var smtpoint = needWorkSmtList.Where(a => a.PN == com.PN).ToList();
foreach (var item in smtpoint)
{
var componeinfo = CSVBomManager.GetCom(BoardManager.CurrBoard.bomName, item);
if (componeinfo != null && int.Parse(componeinfo.ComCount) > 0)
{
position = CSVPositionReader<TSAVPosition>.GetPositonByNum(componeinfo.PositionNum);
if (position != null)
{
com = componeinfo;
currPoint = item;
break;
}
}
}
}
else
{
position = CSVPositionReader<TSAVPosition>.GetPositonByNum(com.PositionNum);
}
//记录运行过程的位号
ConfigAppSettings.UpdateAppSetting(Setting_Init.ProcedureName, currBoard.boardName);
ConfigAppSettings.UpdateAppSetting(Setting_Init.TagNumber, currIndex.ToString());
if (currPoint.pointNum == 1)//第一个位号不需要记录
{
ConfigAppSettings.UpdateAppSetting(Setting_Init.ProcedureName, "");
ConfigAppSettings.UpdateAppSetting(Setting_Init.TagNumber, "");
}
#endregion
//position = CSVPositionReader<TSAVPosition>.GetPositonByNum(com.PositionNum);
useComponets.Add(com);
}
else
......@@ -216,7 +247,7 @@ namespace TSA_V.DeviceLibrary
LogUtil.info(" 程序【" + currBoard.boardName + "】插件【" + currPoint.PN + "】未找到对应的元器件");
}
else
{
{
this.currPosition = position;
XYMove();
//插件机工作
......@@ -276,6 +307,14 @@ namespace TSA_V.DeviceLibrary
}
public void MoveToBag(TSAVPosition position)
{
Dictionary<string,string> pairs = new Dictionary<string,string>();
if (pairs.Count!=0)
{
//关灯
LogUtil.info($"{pairs.ToString()}");
ScanRequestLabel.Turnoffthelights(pairs);
pairs.Clear();
}
//LedManager.LedOFFALL();
if (position.PositionType.Equals(1))
{
......@@ -288,7 +327,7 @@ namespace TSA_V.DeviceLibrary
//上一个节点返回原点
PUSICANControl.AbsMove(PreNodeId, TSAVBean.RotateNode_DefaultPosition);
Thread.Sleep(50);
}
}
PUSICANControl.AbsMove(moveNode.NodeId, position.RotatePosition);
waitList.Add(WaitResultInfo.WaitNode(moveNode, position.RotatePosition));
PreNodeId = moveNode.NodeId;
......@@ -298,6 +337,24 @@ namespace TSA_V.DeviceLibrary
LogUtil.error("positionNum=" + position.PositionNum + ",未找到对应的运动轴！");
}
}
#region 2023-09-22 添加 控制便签功能
else if (position.PositionType.Equals(2))
{
LogUtil.info("电子屏闪烁！");
var smtPoint=TSAVBean.Work.currPoint;
ComponetInfo com = CSVBomManager.GetCom(BoardManager.CurrBoard.bomName, smtPoint);
string count=null;
string pnname = null;
string ComponentDes=null;
if (com!=null)
{
count = com.ComCount.ToString();
pnname=com.PN.ToString();
ComponentDes=com.ComponentDes.ToString();
}
ScanRequestLabel.RequestPost(position, count, pnname, ComponentDes ,out pairs);
}
#endregion
else
{
if (PreNodeId > 0)
......@@ -305,12 +362,11 @@ namespace TSA_V.DeviceLibrary
PUSICANControl.AbsMove(PreNodeId, TSAVBean.RotateNode_DefaultPosition);
}
PreNodeId = 0;
LEDModule module = LedManager.GetLEDModule(position.DeviceIP);
LEDModule module = LedManager.GetLEDModule(position.DeviceIP);
LedManager.LightOn(position.DeviceIP, position.getLedList());
waitList.Add(WaitResultInfo.WaitTime(500));
}
}
public bool IsLastP()
{
if (IsWorking)
......
TSA-V/App.config
......@@ -124,6 +124,9 @@
<add key="DisableBottomCylinder" value="1" />
<add key="SMF_Serverurl" value ="http://localhost:8800/"/>
<add key="SMF_CID" value ="NEOSTATION001"/>
<!--记录程序运行步骤-->
<add key="ProcedureName" value="12343" />
<add key="TagNumber" value ="3"/>
</appSettings>
<log4net>
<appender name="defaultAppender" type="log4net.Appender.RollingFileAppender">
......
TSA-V/FrmBoardPutCom.cs
......@@ -160,7 +160,7 @@ namespace TSA_V
int newCount = (int)numCount.Value;
ComponetInfo com = comList[currIndex];
com.ComCount = newCount;
com.ComCount = newCount.ToString();
CSVBomManager.UpdateComponet(bomName, com);
}
private void btnNext_Click(object sender, EventArgs e)
......
TSA-V/FrmComponentList.cs
......@@ -159,7 +159,7 @@ namespace TSA_V
obj.PN = FormUtil.getValue(txtName);
obj.ComponentDes = FormUtil.getValue(txtDes);
obj.ComCount = FormUtil.GetIntValue(txtCount);
obj.ComCount = FormUtil.GetIntValue(txtCount).ToString();
obj.Notes = FormUtil.getValue(txtNotes);
obj.TagNo = FormUtil.getValue(txtPartNum);
obj.Id = FormUtil.GetIntValue(txtId);
......@@ -173,7 +173,7 @@ namespace TSA_V
return;
}
if (obj.ComCount<=0)
if (int.Parse(obj.ComCount)<=0)
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteComNum,"请输入元器件数量！"));
txtCount.Focus();
......@@ -226,7 +226,7 @@ namespace TSA_V
obj.TagNo = FormUtil.getValue(txtPartNum);
obj.PN = FormUtil.getValue(txtName);
obj.ComponentDes = FormUtil.getValue(txtDes);
obj.ComCount = FormUtil.GetIntValue(txtCount);
obj.ComCount = FormUtil.GetIntValue(txtCount).ToString();
obj.Notes = FormUtil.getValue(txtNotes);
obj.PositionNum = position.PositionNum;
//if (obj.TagNo.Equals(""))
......@@ -258,7 +258,7 @@ namespace TSA_V
return;
}
if (obj.ComCount <= 0)
if (int.Parse(obj.ComCount) <= 0)
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteComNum, "请输入元器件数量！"));
txtCount.Focus();
......@@ -316,7 +316,7 @@ namespace TSA_V
point.ComponentDes = row.Cells[this.Column_description.Name].Value.ToString();
point.Notes = row.Cells[this.Column_Notes.Name].Value.ToString();
point.PositionNum = row.Cells[this.Column_Position.Name].Value.ToString();
point.ComCount = Convert.ToInt32(row.Cells[this.Column_Count.Name].Value.ToString());
point.ComCount = row.Cells[this.Column_Count.Name].Value.ToString();
point.Id = Convert.ToInt32(row.Cells[this.Column_ID.Name].Value.ToString());
}
......@@ -373,11 +373,11 @@ namespace TSA_V
int selPosIndex = -1;
int index = -1;
string posNum = CSVBomManager.GetPositionNum(obj.PositionNum);
string[] posNum = CSVBomManager.GetPositionNum(obj.PositionNum);
foreach (TSAVPosition p in allPosition)
{
index++;
if (p.PositionNum.Equals(posNum))
if (p.PositionNum.Equals(posNum[0]))
{
selPosIndex = index;
break;
......
TSA-V/FrmDeviceConfig.Designer.cs
......@@ -90,7 +90,6 @@
this.chbISDebug.TabIndex = 19;
this.chbISDebug.Text = "是否调试模式，会自动下一步";
this.chbISDebug.UseVisualStyleBackColor = true;
this.chbISDebug.CheckedChanged += new System.EventHandler(this.chbISDebug_CheckedChanged);
//
// groupBox4
//
......
TSA-V/FrmDeviceConfig.cs
......@@ -128,13 +128,9 @@ namespace TSA_V
LogUtil.info($"保存配置成功： 调试{ isDebug }，禁用底部气缸{disBottom}，禁用侧挡气缸{disSide}，地址{server} ");
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.SaveOk, "保存成功"));
}
private void chbISDebug_CheckedChanged(object sender, EventArgs e)
{
}
private void button1_Click(object sender, EventArgs e)
{
BoardInfo board = new BoardInfo();
......
TSA-V/FrmLanguage.cs
......@@ -9,6 +9,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using TSA_V.Common;
using TSA_V.DeviceLibrary.manager;
namespace TSA_V
{
......@@ -45,7 +46,8 @@ namespace TSA_V
{
string str = ConfigAppSettings.GetValue(Setting_Init.Default_Language);
if (rbtnEnglish.Checked)
{
{
//ScanRequestLabel.Switchlanguage(1);
str = ResourceCulture.English;
}
else if (rbtnRussian.Checked)
......@@ -54,6 +56,7 @@ namespace TSA_V
}
else
{
//ScanRequestLabel.Switchlanguage(0);
str = ResourceCulture.China;
}
ResourceCulture.SetCurrentCulture(str);
......
TSA-V/FrmPutCom.cs
......@@ -213,7 +213,7 @@ namespace TSA_V
{
if (obj.PositionNum.Equals(com.PositionNum))
{
obj.ComCount = newCount;
obj.ComCount = newCount.ToString();
}
}
......
TSA-V/Smart-Workstation.csproj
......@@ -98,10 +98,12 @@
<HintPath>..\dll\packages\OpenCvSharp3-AnyCPU.4.0.0.20181129\lib\net40\OpenCvSharp.UserInterface.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data.SQLite, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net46\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Speech" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Forms.DataVisualization" />
......
TSA-V/workForm/FrmBoardSelect.cs
......@@ -38,6 +38,7 @@ namespace TSA_V
if (!IOBase.NoLine)
timer1.Start();
IsInitOk = true;
CheckIfHaveincomplete();
}
private void LoadCom()
{
......@@ -376,5 +377,23 @@ namespace TSA_V
//停止调宽
LWidthManager.StopChangeWidth();
}
private void CheckIfHaveincomplete()
{
string ProcedureName = ConfigAppSettings.GetValue(Setting_Init.ProcedureName);
string TagNumber = ConfigAppSettings.GetValue(Setting_Init.TagNumber);
if (!string.IsNullOrEmpty(ProcedureName)&&!string.IsNullOrEmpty(TagNumber))
{
cmbBoardList.Text = ProcedureName;
BoardInfo board = (BoardInfo)cmbBoardList.SelectedItem;
BoardManager.CurrBoard = board;
FrmWork fw = new FrmWork();
this.Hide();
this.Close();
fw.ShowDialog();
}
}
}
}
TSA-V/workForm/FrmTSAV.cs
......@@ -15,6 +15,10 @@ using PUSICANLibrary;
using System.Runtime.InteropServices;
using AOI;
using System.Threading.Tasks;
using System.Net.Http;
using TSA_V.DeviceLibrary.manager;
using System.Linq;
using System.Configuration;
namespace TSA_V
{
......@@ -25,11 +29,13 @@ namespace TSA_V
InitializeComponent();
}
private bool isInitOk = false;
private BoardInfo board = BoardManager.CurrBoard;
private PointDisplay display = new PointDisplay();
private List<SMTPointInfo> workSmtList = new List<SMTPointInfo>();
private void FrmWelding_Load(object sender, EventArgs e)
{
btnCamera.Visible = TSAVBean.IsNeedAOI;
TSAVBean.Work.WorkType = 1;
LanguageProcess();
......@@ -61,7 +67,15 @@ namespace TSA_V
smtPoint = new SMTPointInfo();
timerShowForm.Stop();
if (workSmtList.Count > 0)
int TagNumber = ConfigAppSettings.GetIntValue(Setting_Init.TagNumber);
if (workSmtList.Count > 0&&TagNumber!=0)
{
//int TagNumber =ConfigAppSettings.GetIntValue(Setting_Init.TagNumber);
var workSmt = workSmtList.Where(a => a.pointNum == TagNumber).FirstOrDefault();
smtPoint = workSmt;
preIndex = TagNumber-1;//索引从0开始
}
else
{
smtPoint = workSmtList[0];
}
......@@ -569,25 +583,74 @@ namespace TSA_V
lblPositionNum.Text = smtPoint.PositionNum;
lblPartNum.Text = smtPoint.TagNo;
lblPointName.Text = smtPoint.PN;
ComponetInfo com = CSVBomManager.GetCom(BoardManager.CurrBoard.bomName, smtPoint);
#region 2023-10-31修改
ComponetInfo com = null;
com=CSVBomManager.GetCom(BoardManager.CurrBoard.bomName, smtPoint);
if (com != null)
{
TSAVPosition position = CSVPositionReader<TSAVPosition>.GetPositonByNum(com.PositionNum);
if (position != null)
TSAVPosition position = null;
if (int.Parse(com.ComCount) <= 0)
{
lblPositionNum.Text = position.PositionNum;
lblComDes.Text = com.ComponentDes;
this.lblComName.Text = com.PN;
lblCount.Text = com.ComCount.ToString();
txtCount.Text = com.ComCount.ToString();
var smtpoint=workSmtList.Where(a=>a.PN==com.PN).ToList();
foreach (var item in smtpoint)
{
var componeinfo = CSVBomManager.GetCom(BoardManager.CurrBoard.bomName, item);
if (componeinfo != null && int.Parse(componeinfo.ComCount) > 0)
{
position = CSVPositionReader<TSAVPosition>.GetPositonByNum(componeinfo.PositionNum);
if (position != null)
{
com = componeinfo;
break;
}
}
}
string str = $"{smtPoint.PositionNum}位置元器件{smtPoint.PN}数量不足，请及时补充;\n当前使用{com.PositionNum}位置的元器件{com.PN},数量为{com.ComCount}";
lblComNotices.Text = str;
//lblComNotices.Text = ResourceCulture.GetString("元器件数量不足，请及时补充；当前使用位置的元器件", $"{smtPoint.PositionNum}位置元器件{smtPoint.PN}数量不足，请及时补充；当前使用{com.PositionNum}位置的元器件{com.PN},数量为{com.ComCount}");
}
else
{
position = CSVPositionReader<TSAVPosition>.GetPositonByNum(com.PositionNum);
if (position != null)
{
lblPositionNum.Text = position.PositionNum;
}
lblComDes.Text = com.ComponentDes;
this.lblComName.Text = com.PN;
lblCount.Text = com.ComCount.ToString();
txtCount.Text = com.ComCount.ToString();
lblComNotices.Text = com.Notes.ToString();
}
//if (position != null)
//{
// lblPositionNum.Text = position.PositionNum;
//}
lblComDes.Text = com.ComponentDes;
this.lblComName.Text = com.PN;
lblCount.Text = com.ComCount.ToString();
txtCount.Text = com.ComCount.ToString();
lblComNotices.Text = com.Notes.ToString();
if (com.ComCount <= 0)
//lblComDes.Text = com.ComponentDes;
//this.lblComName.Text = com.PN;
//lblCount.Text = com.ComCount.ToString();
//txtCount.Text = com.ComCount.ToString();
//lblComNotices.Text = com.Notes.ToString();
//if (int.Parse(com.ComCount) <= 0)
//{
//lblComNotices.Text = ResourceCulture.GetString("元器件数量不足，请及时补充", "元器件数量不足，请及时补充");
//}
//记录运行过程的位号
ConfigAppSettings.UpdateAppSetting(Setting_Init.ProcedureName, board.boardName);
ConfigAppSettings.UpdateAppSetting(Setting_Init.TagNumber, smtPoint.pointNum.ToString());
if (smtPoint.pointNum==1)//第一个位号不需要记录
{
lblComNotices.Text = ResourceCulture.GetString("元器件数量不足，请及时补充", "元器件数量不足，请及时补充");
ConfigAppSettings.UpdateAppSetting(Setting_Init.ProcedureName, "");
ConfigAppSettings.UpdateAppSetting(Setting_Init.TagNumber, "");
}
#endregion
}
else
{
......@@ -674,6 +737,7 @@ namespace TSA_V
return;
}
preIndex = TSAVBean.Work.currIndex;
smtPoint = TSAVBean.Work.currPoint;
ShowMsg();
......@@ -813,6 +877,19 @@ namespace TSA_V
}
else
{
#region 2023-09-22 添加 控制便签功能
//string count = null;
//string pnname = null;
//string ComponentDes = null;
//if (com != null)
//{
// count = com.ComCount.ToString();
// pnname = com.PN.ToString();
// ComponentDes = com.ComponentDes;
//}
////调用指示灯显示
//ScanRequestLabel.RequestPost(position, count, pnname, ComponentDes);
#endregion
lblPositionNum.Text = position.PositionNum;
}
int leftCount = workSmtList.Count - 1 - preIndex;
......@@ -824,7 +901,7 @@ namespace TSA_V
else if (leftCount <= 0)
{
lblStart.Visible = false;
lblLast.Visible = true;
lblLast.Visible = true;
}
else
{
......@@ -837,9 +914,9 @@ namespace TSA_V
lblBoardPoint.Text = ResourceCulture.GetString(ResourceCulture.PointInfoMsg, "当前：第{0}步，剩余{1}步", (preIndex + 1).ToString(), leftCount);
}
else
{
{
lblBoardPoint.Text = ResourceCulture.GetString(ResourceCulture.PointInfoMsg2, "当前：第{0}步", (preIndex + 1).ToString());
}
}
Crop(Brushes.Red);
if (timerShowForm.Enabled.Equals(false))
{
......@@ -861,7 +938,6 @@ namespace TSA_V
}
}
private void btnUpateCount_Click(object sender, EventArgs e)
{
ShowUpdateCount(true);
......@@ -1008,6 +1084,6 @@ namespace TSA_V
{
FrmIoManager frmWorkIo = new FrmIoManager(true);
frmWorkIo.ShowDialog();
}
}
}
}
UserFromControl/UserFromControl.csproj
......@@ -117,7 +117,6 @@
</Content>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
......
插件机.txt 0 → 100644
文件属性发生变化
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!