|
@@ -204,7 +204,7 @@ namespace MainForm
|
|
|
if (GlobalContext.IsUsePLC2)
|
|
|
TaskReadProcess.Add(new Task(() => { ReadStation_S2(2); })); //OP20 顶盖上料设备
|
|
|
if (GlobalContext.IsUsePLC3)
|
|
|
- TaskReadProcess.Add(new Task(() => { ReadStation_S3(3); })); //OP30 点胶设备
|
|
|
+ //TaskReadProcess.Add(new Task(() => { ReadStation_S3(3); })); //OP30 点胶设备
|
|
|
if (GlobalContext.IsUsePLC4)
|
|
|
TaskReadProcess.Add(new Task(() => { ReadStation_S4(4); })); //OP40 点胶检测设备
|
|
|
if (GlobalContext.IsUsePLC5)
|
|
@@ -2178,21 +2178,20 @@ namespace MainForm
|
|
|
|
|
|
string workorder_code = GlobalContext.WorkOrderCode; // 工单号
|
|
|
string batch_num = GlobalContext.BatchNumber; // 批次号
|
|
|
- string mtltmrk = (string)stPLC_MesData.BarcodeSet.strProductBarcode; // 产品条码; // 产品型号
|
|
|
+ string mtltmrk = GlobalContext.Mtltmrk; // 产品条码; // 产品型号
|
|
|
mtltmrk = mtltmrk.Replace("\0", "");
|
|
|
- string CarrierBarcode = (string)stPLC_MesData.BarcodeSet.strCarrierBarcode; // 载具条码;
|
|
|
- CarrierBarcode = CarrierBarcode.Replace("\0", "");
|
|
|
-
|
|
|
+ string CarrierBarcode = "";//(string)stPLC_MesData.BarcodeSet.strCarrierBarcode; // 载具条码;
|
|
|
+
|
|
|
// 产品结果
|
|
|
int a1Result = 0;
|
|
|
- if (direction=="Left")
|
|
|
- {
|
|
|
- a1Result=(int)stPLC_MesData.iotData.Left.testStatus;
|
|
|
- }
|
|
|
- if (direction == "Right")
|
|
|
- {
|
|
|
- a1Result = (int)stPLC_MesData.iotData.Left.testStatus;
|
|
|
- }
|
|
|
+ //if (direction=="Left")
|
|
|
+ //{
|
|
|
+ // a1Result=(int)stPLC_MesData.iotData.Left.testStatus;
|
|
|
+ //}
|
|
|
+ //if (direction == "Right")
|
|
|
+ //{
|
|
|
+ // a1Result = (int)stPLC_MesData.iotData.Left.testStatus;
|
|
|
+ //}
|
|
|
bool pass = a1Result == 1;
|
|
|
|
|
|
List<TestItem> items = new List<TestItem>();
|