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

shangjian/CommonFunc/Tools/MachineRepairWin.xaml

@@ -277,6 +277,8 @@
                 <TextBlock Text="故障描述：" VerticalAlignment="Center"/>
                 <TextBox x:Name="txtP" Width="309" Height="30" FontSize="18" VerticalAlignment="Center" VerticalContentAlignment="Center" TextChanged="txtP_TextChanged"/>
                 <Button x:Name="btnQueryUser" Content="查询" FontWeight="Bold" Width="100" Height="40" Style="{StaticResource btnKey}" Click="btnQueryUser_Click" Visibility="Collapsed"/>
+                <TextBlock Text="故障设备：" VerticalAlignment="Center"/>
+                <ComboBox  FontSize="25" Width="165" Height="33" Name="eqname" ></ComboBox>
                 <Button x:Name="btnUserConfirm" Content="确认" FontWeight="Bold" Width="100" Height="40" Style="{StaticResource btnKey}" Click="btnUserConfirm_Click"/>
                 <Button x:Name="btnCloseWin" HorizontalAlignment="Right" Content="关闭" FontWeight="Bold" Width="100" Height="40" Style="{StaticResource btnKey}" Click="btnCloseWin_Click"/>
             </StackPanel>

shangjian/CommonFunc/Tools/MachineRepairWin.xaml.cs

@@ -28,15 +28,20 @@ namespace CommonFunc.Tools
         List<faultModel> CopyModel = new List<faultModel>();
         string _apiUrl = "";
         DataTable _tables = new DataTable();
+        DataTable _eqmentable = new DataTable();
         public MachineRepairWin()
         {
             InitializeComponent();
         }
-        public MachineRepairWin(string apiUrl,DataTable dataTable)
+        public MachineRepairWin(string apiUrl,DataTable dataTable,DataTable eqmentable)
         {
             InitializeComponent();
             _apiUrl = apiUrl;
             _tables= dataTable;
+            _eqmentable= eqmentable;
+            eqname.ItemsSource = _eqmentable.DefaultView;
+            eqname.DisplayMemberPath = "auxiliary_equipment_name";   // 显示的名字列
+            eqname.SelectedValuePath = "auxiliary_equipment_code";   // 选中后获取的值是Code列
         }
         private void btnQueryUser_Click(object sender, RoutedEventArgs e)
         {
@@ -89,6 +94,11 @@ namespace CommonFunc.Tools
         {
             try
             {
+                if (eqname.SelectedIndex==-1)
+                {
+                    CustomMessageBox.Show("请选择设备！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
+                    return;
+                }
                 if (dgUserInfo.SelectedItems.Count <= 0)
                 {
                     CustomMessageBox.Show("请选择故障！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
@@ -97,7 +107,7 @@ namespace CommonFunc.Tools
                    var select= dgUserInfo.SelectedItem as faultModel;
                 var user= Utils.userList.Find(t=>t.nick_name== LoginUser.UserName);
                 MachineRepairModel machineRepairModel = new MachineRepairModel();
-                machineRepairModel.equipmentCode = Utils.GetAppSetting("DeviceCode");
+                machineRepairModel.equipmentCode = eqname.SelectedValue?.ToString();
                 machineRepairModel.factory = Utils.GetAppSetting("SiteCode");
                 machineRepairModel.userName = user.user_name;
                 machineRepairModel.phoneNumber = user.phonenumber;

shangjian/XGL.Data/DBService/FormingMachineService.cs

@@ -1110,6 +1110,18 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC";
             return null;
         }
 
+        public DataTable GetReportCodeeqment(string eqment)
+        {
+            string getReportCodeSql = $@"select * from equ_bind_auxiliary_equipment where  equipment_code ='{eqment}'";
+
+            DataSet dtset = Utils.netClientDBHelper.getDataSet(getReportCodeSql);
+            if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
+            {
+                return dtset.Tables[0];
+            }
+            return null;
+        }
+
         public string GetInterfaceUrl(string v)
         {
             string getReportCodeSql = $@"SELECT url FROM [dbo].[mes_interface_url] where url_type = '{v}' and del_flag = '0'";

shangjian/XGL/Views/DryingRoomUC.xaml.cs

@@ -303,7 +303,8 @@ namespace XGL.Views
             FormingMachineService formingMachineService = new FormingMachineService();
             //调用首件检验接口
             string apiUrl = formingMachineService.GetInterfaceUrl("machineRepair");
-            MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl, selefuel);
+            var eqment = formingMachineService.GetReportCodeeqment(Utils.GetAppSetting("DeviceCode"));
+            MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl, selefuel, eqment);
             machineRepairWin.ShowDialog();
         }
     }

shangjian/XGL/Views/LanJu_Operator.xaml.cs

@@ -613,7 +613,8 @@ VALUES
             
             //调用首件检验接口
             string apiUrl = formingMachineService.GetInterfaceUrl("machineRepair");
-            MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl, formingMachineService.ConvertToFaultModelList());
+            var eqment = formingMachineService.GetReportCodeeqment(Utils.GetAppSetting("DeviceCode"));
+            MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl, formingMachineService.ConvertToFaultModelList(), eqment);
             machineRepairWin.ShowDialog();
         }
 

shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs

@@ -919,7 +919,8 @@ namespace XGLFinishPro.Views
             var selefuel= formingMachineService.ConvertToFaultModelList();
             //调用首件检验接口
             string apiUrl = formingMachineService.GetInterfaceUrl("machineRepair");
-            MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl, selefuel);
+            var eqment = formingMachineService.GetReportCodeeqment(Utils.GetAppSetting("DeviceCode"));
+            MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl, selefuel, eqment);
             machineRepairWin.ShowDialog();
 
         }