|
|
@ -1422,8 +1422,18 @@ namespace ProductionSystem.Forms
|
|
|
|
Program.CommandPointKeyValues.FirstOrDefault(m => m.Key == tagDict[par]);
|
|
|
|
Program.CommandPointKeyValues.FirstOrDefault(m => m.Key == tagDict[par]);
|
|
|
|
if (entity != null)
|
|
|
|
if (entity != null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
string productBarCode = "";
|
|
|
|
|
|
|
|
if (txtProductCode.Text == "暂无条码")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
productBarCode = "8888";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
productBarCode=txtProductCode.Text;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var value = OmronHelper.GetPlcVal(entity.DataType, entity.Address);
|
|
|
|
var value = OmronHelper.GetPlcVal(entity.DataType, entity.Address);
|
|
|
|
if (value.Item2 == "0.000")
|
|
|
|
if (value.Item2.ToDouble().ToInt()==1)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
T_Result2 t = new T_Result2
|
|
|
|
T_Result2 t = new T_Result2
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -1431,7 +1441,7 @@ namespace ProductionSystem.Forms
|
|
|
|
ProductType = Program.ProductType,
|
|
|
|
ProductType = Program.ProductType,
|
|
|
|
CreateTime = DateTime.Now,
|
|
|
|
CreateTime = DateTime.Now,
|
|
|
|
Step = par,
|
|
|
|
Step = par,
|
|
|
|
ProductBarcode = "8888",
|
|
|
|
ProductBarcode = productBarCode,
|
|
|
|
Electricity = "0",
|
|
|
|
Electricity = "0",
|
|
|
|
Voltage = "0",
|
|
|
|
Voltage = "0",
|
|
|
|
Xll = "0",
|
|
|
|
Xll = "0",
|
|
|
|