Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-client

shangjian/XGLFinishPro/Views/LanJu_Check_Report.xaml.cs

@@ -44,6 +44,8 @@ namespace XGLFinishPro.Views
         private readonly List<string> _minutes = new List<string> { "00", "05", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55" };
         private string LineStr = "";
         private readonly List<string> teamGroup = new List<string>() { "A", "B", "C", "D", "E", "F" };
+        private string shiftName = string.Empty;
+        private string shiftCode = LoginUser.ShiftCode;
         public LanJu_Check_Report()
         {
             InitializeComponent();
@@ -59,6 +61,7 @@ namespace XGLFinishPro.Views
         {
             this.NickName.Text = LoginUser.UserName;
             LineStr = dbService.GetBaseEquipment(Utils.GetAppSetting("DeviceCode"));
+            shiftName = dbService.GetShiftById(shiftCode);
             LoadData();
         }
 
@@ -85,7 +88,7 @@ namespace XGLFinishPro.Views
             }
             list.ForEach(t => t.value = t.value.Insert(0, "A"));
 
-            mesTableSelf = dbService.GetMesTableSelf(deviceCode, null, date, "CheckReport");
+            mesTableSelf = dbService.GetMesTableSelf(deviceCode, null, date, "CheckReport" + shiftName);
             if (mesTableSelf == null)
             {
                 mesTableSelf = new MesTableSelf()
@@ -98,7 +101,7 @@ namespace XGLFinishPro.Views
                     del_flag = "0",
                     product_date = date,
                     bz = string.Empty,
-                    report_name = "CheckReport"
+                    report_name = "CheckReport" + shiftName
                 };
                 dbService.InsertMesTableSelf(mesTableSelf);
             }

shangjian/XGLFinishPro/Views/LanJu_Conversion_Report.xaml.cs

@@ -47,6 +47,8 @@ namespace XGLFinishPro.Views
         private string workId = string.Empty;
         private string productName = string.Empty;
         private bool IsFinal = false;
+        private string shiftName = string.Empty;
+        private string shiftCode = LoginUser.ShiftCode;
         public LanJu_Conversion_Report()
         {
             InitializeComponent();
@@ -95,6 +97,7 @@ namespace XGLFinishPro.Views
             //this.CheckDate.Text = date;
             try
             {
+                shiftName = dbService.GetShiftById(shiftCode);
                 this.Line.Text = dbService.GetBaseEquipment(Utils.GetAppSetting("DeviceCode"));
                 product_code = string.Empty;
                 DataTable dataTable = dbService.GetProOrderWorkorder(workId);
@@ -173,7 +176,7 @@ namespace XGLFinishPro.Views
             }
             TypeDic = mainTypeDic;
             mesTableSelf = null;
-            mesTableSelf = dbService.GetMesTableSelf(deviceCode, productName, this.CheckDate.Text, "ConversionReport");
+            mesTableSelf = dbService.GetMesTableSelf(deviceCode, productName, this.CheckDate.Text, "ConversionReport"+ shiftName);
             if (mesTableSelf == null)
             {
                 mesTableSelf = new MesTableSelf()
@@ -187,7 +190,7 @@ namespace XGLFinishPro.Views
                     del_flag = "0",
                     product_date = this.CheckDate.Text,
                     bz = string.Empty,
-                    report_name = "ConversionReport"
+                    report_name = "ConversionReport"+ shiftName
                 };
                 if (!string.IsNullOrEmpty(productName))
                 {

shangjian/XGLFinishPro/Views/LanJu_First_Inspection_Reprot.xaml.cs

@@ -55,6 +55,8 @@ namespace XGLFinishPro.Views
         private string workId = string.Empty;
 
         private string date = string.Empty;
+        private string shiftName = string.Empty;
+        private string shiftCode = LoginUser.ShiftCode;
 
         public LanJu_First_Inspection_Reprot()
         {
@@ -70,6 +72,7 @@ namespace XGLFinishPro.Views
                 try
                 {
                     this.LeftCheckDate.SelectedDate = DateTime.Parse(LoginUser.WorkDate);
+                    shiftName = dbService.GetShiftById(shiftCode);
                 }
                 catch
                 {
@@ -260,7 +263,7 @@ namespace XGLFinishPro.Views
         private MesTableSelf leftmesTableSelf;
         private void GetMesTableSeft()
         {
-            leftmesTableSelf = dbService.GetMesTableSelf(deviceCode, LProductName, this.LeftCheckDate.Text, "ConversionReportLeft");
+            leftmesTableSelf = dbService.GetMesTableSelf(deviceCode, LProductName, this.LeftCheckDate.Text, "ConversionReportLeft"+ shiftName);
             if (leftmesTableSelf == null)
             {
                 if (!string.IsNullOrEmpty(LProductName))
@@ -276,7 +279,7 @@ namespace XGLFinishPro.Views
                         del_flag = "0",
                         product_date = this.LeftCheckDate.Text,
                         bz = string.Empty,
-                        report_name = "ConversionReportLeft"
+                        report_name = "ConversionReportLeft"+ shiftName
                     };
                 }
                 dbService.InsertMesTableSelf(leftmesTableSelf);