提交

SCADA_DAQ/Customer/Machines/SampleMachine_ScanCompleted.cs

@@ -252,12 +252,12 @@ namespace SCADA_DAQ.Customer.Machines
             if (screen1?.GetListenReg("ScreenRow1") != null && CurrentOperationLine1 != null)
             {
                 var rcl = CurrentOperationLine1.RowColLayerFormat();
-                screen1?.GetListenReg("ScreenRow1").WriteReg($"    {rcl}");
+                screen1?.GetListenReg("ScreenRow1").WriteReg($"       {rcl}");
                 screen1?.GetListenReg("ScreenRow2").WriteReg(CurrentOperationLine1.ItemName);
             }
             if (screen1?.GetListenReg("ScreenRow1") != null && CurrentOperationLine1 == null)
             {
-                screen1?.GetListenReg("ScreenRow1").WriteReg("    00-000-00");
+                screen1?.GetListenReg("ScreenRow1").WriteReg("       00-000-00");
                 screen1?.GetListenReg("ScreenRow2").WriteReg(" ");
             }
 
@@ -265,12 +265,12 @@ namespace SCADA_DAQ.Customer.Machines
             if (screen2?.GetListenReg("ScreenRow1") != null && CurrentOperationLine2 != null)
             {
                 var rcl = CurrentOperationLine2.RowColLayerFormat();
-                screen2?.GetListenReg("ScreenRow1").WriteReg($"    {rcl}");
+                screen2?.GetListenReg("ScreenRow1").WriteReg($"       {rcl}");
                 screen2?.GetListenReg("ScreenRow2").WriteReg(CurrentOperationLine2.ItemName);
             }
             if (screen2?.GetListenReg("ScreenRow1") != null && CurrentOperationLine2 == null)
             {
-                screen2?.GetListenReg("ScreenRow1").WriteReg("    00-000-00");
+                screen2?.GetListenReg("ScreenRow1").WriteReg("       00-000-00");
                 screen2?.GetListenReg("ScreenRow2").WriteReg(" ");
             }
 

SCADA_DAQ/Customer/Service/Wcs_WebOperationService.cs

@@ -86,7 +86,7 @@ namespace SCADA_DAQ.Customer.Service
             var inventory = Env.DAL.App_BC_Inventory.GetData<App_BC_Inventory>(t=>t.SourceLocation_Str == rcl).FirstOrDefault();
             if (inventory != null)
             {
-                operation.ItemName = inventory.ItemName_Str;
+                operation.ItemName = inventory.ItemName_Str ?? " ";
                 operation.ItemCode = inventory.ItemCode_Str;
             }
             if (operation.Crane == 1)