浏览代码

Merge branch 'dev20250218_IOT开发' into dev2025318_补充功能开发

WIN-GH9CEESPLTB\Administrator 1 月之前
父节点
当前提交
181f9063c4
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      MainForm/FaForm/Dialog_BandBarode_S1.cs
  2. 2 2
      MainForm/FaForm/Form_Home.cs

+ 2 - 2
MainForm/FaForm/Dialog_BandBarode_S1.cs

@@ -118,9 +118,9 @@ namespace MainForm.FaForm
             if (!string.IsNullOrEmpty(Barcode))
             if (!string.IsNullOrEmpty(Barcode))
             {
             {
                 if (Barcode.Length > 9)
                 if (Barcode.Length > 9)
-                    ProductBarcode.Text = Barcode;
+                    ProductBarcode.Text = Barcode.ToUpper();
                 else 
                 else 
-                    CarrierBarcode.Text= Barcode;
+                    CarrierBarcode.Text= Barcode.ToUpper();
 
 
                 Form_Home._strProductBarcode = ProductBarcode.Text.Trim();
                 Form_Home._strProductBarcode = ProductBarcode.Text.Trim();
                 Form_Home._strCarrierBarcode = CarrierBarcode.Text.Trim();
                 Form_Home._strCarrierBarcode = CarrierBarcode.Text.Trim();

+ 2 - 2
MainForm/FaForm/Form_Home.cs

@@ -5467,7 +5467,7 @@ namespace MainForm
 
 
                 int result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
                 int result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem
                     , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode,
                     , workorder_code, batch_num, mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode,
-                    "01-SLOT-01", MachineId, StationId, "", paramJson,new XmStationOut_InspectionItemData(), "");
+                    "01-SLOT-01", MachineId, StationId, "", paramJson, inspectionItemData, "");
 
 
                 byte mesResultFrmWeb = (byte)(result1 == 1 ? 1 : 110);
                 byte mesResultFrmWeb = (byte)(result1 == 1 ? 1 : 110);
                 if (mesResultFrmWeb == 1)
                 if (mesResultFrmWeb == 1)
@@ -6038,7 +6038,7 @@ namespace MainForm
                     result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem, workorder_code,
                     result1 = SwitctProcessData(stationNameStr, items, equipmentCode, processItem, workorder_code,
                         batch_num
                         batch_num
                         , mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "01-SLOT-01", MachineId, StationId,
                         , mtltmrk, plcDate_YMD, supplierCode, sn, pass, CarrierBarcode, "01-SLOT-01", MachineId, StationId,
-                        PartBarcode, paramJson,new XmStationOut_InspectionItemData(), "");
+                        PartBarcode, paramJson, inspectionItemData, "");
                     uuid = "";
                     uuid = "";
                 }
                 }
                 else if (stPLC_MesData.mesCommFrmPLC.cmdParam == 1)
                 else if (stPLC_MesData.mesCommFrmPLC.cmdParam == 1)