diff --git a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
index 01189f0..bd9d67c 100644
--- a/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
+++ b/shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs
@@ -187,7 +187,16 @@ where CONVERT(VARCHAR(10), upload_time , 120)= CONVERT(VARCHAR(10), GetDate() ,
}
return null;
}
-
+ public DataTable piciGetCostCenter(string workorder)
+ {
+ string sql = $" SELECT batch_code FROM pro_order_workorder_batch WHERE workorder_id='{workorder}' AND del_flag='0'";
+ DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
+ if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
+ {
+ return dtset.Tables[0];
+ }
+ return null;
+ }
public DataTable GetFactoryInfo(string sitecode)
{
string sql = $"select factory_name from sys_factory where factory_code = '{sitecode}'";
diff --git a/shangjian/XGLFinishPro/App.config b/shangjian/XGLFinishPro/App.config
index ffb6ec7..7044b4b 100644
--- a/shangjian/XGLFinishPro/App.config
+++ b/shangjian/XGLFinishPro/App.config
@@ -10,9 +10,9 @@
-
+
-
+
diff --git a/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml b/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml
index e622052..7bf7994 100644
--- a/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml
+++ b/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml
@@ -115,6 +115,7 @@
+
@@ -137,12 +138,22 @@
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
diff --git a/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs b/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs
index 15e413b..c1d66c0 100644
--- a/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs
+++ b/shangjian/XGLFinishPro/Views/ExecReportWorkWin.xaml.cs
@@ -14,6 +14,7 @@ using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
+using Xceed.Wpf.DataGrid;
using XGL.Data;
using XGL.Dats.DBServiceFinishProd;
@@ -30,14 +31,16 @@ namespace XGLFinishPro.Views
public string _useMan = "";
public string _costCenter = "";
public string _workQuntity = "";
+ public string workOrdercode = "";
public ExecReportWorkWin()
{
InitializeComponent();
}
- public ExecReportWorkWin(string workOrder, string quantity)
+ public ExecReportWorkWin(string workOrder, string quantity,string workOrdercode)
{
InitializeComponent();
+ this.workOrdercode = workOrdercode;
this.lbCurrOrderNo.Content = workOrder;
this.txtQuantity.Text = quantity;
}
@@ -117,6 +120,7 @@ namespace XGLFinishPro.Views
private void Window_Loaded(object sender, RoutedEventArgs e)
{
InitComBoboxData();
+ piciInitComBoboxData();
}
private void txtQuantity_TextChanged(object sender, TextChangedEventArgs e)
@@ -183,6 +187,32 @@ namespace XGLFinishPro.Views
comboBoxCostCenter.DisplayMemberPath = "factory_name";
comboBoxCostCenter.SelectedIndex = 0;
}
+ private void piciInitComBoboxData()
+ {
+ DataTable dt = userDbWareHouse.piciGetCostCenter(this.workOrdercode);
+ if (dt == null)
+ {
+ CustomMessageBox.Show("没有找到批次号，请联系管理员！", CustomMessageBoxIcon.Warning);
+ return;
+ }
+ List strings =new List();
+ foreach (System.Data.DataRow row in dt.Rows)
+ {
+ strings.Add(row[0].ToString());
+ }
+
+ List listCostCenter = Utils.ToDataList(dt);
+ //comboDryRoomInfo.SelectedValuePath = "quipName";
+ //comboDryRoomInfo.DisplayMemberPath = "quipCode";
+ //comboDryRoomInfo.ItemsSource = listEquip;
+ //绑定
+ pici.ItemsSource = strings;
+ }
+
+ private void comboBoxCostCenter_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+
+ }
}
public class CostCenter
{
diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
index 01147b8..4966312 100644
--- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
+++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml
@@ -436,10 +436,11 @@
-
-
+
+
+
-
+
-
+
+
+
diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
index f11eb60..2988be3 100644
--- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
+++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs
@@ -460,7 +460,7 @@ namespace XGLFinishPro.Views
}
- ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(), selectedRow["quantity_split"].ToString());
+ ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(), selectedRow["quantity_split"].ToString(), selectedRow["workorder_id"].ToString());
if (execReport.ShowDialog() == true)
{
@@ -592,6 +592,14 @@ namespace XGLFinishPro.Views
return true;
}
+
+ private void DatePicker_SelectedDateChanged(object sender, SelectionChangedEventArgs e)
+ {
+ if (sender is DatePicker datePicker)
+ {
+ DateTime selectedDate = datePicker.SelectedDate ?? DateTime.MinValue;
+ }
+ }
}
public class ReportWork
{
diff --git a/shangjian/XGLFinishPro/Views/LanJu_User.xaml.cs b/shangjian/XGLFinishPro/Views/LanJu_User.xaml.cs
index cc63165..fad38fa 100644
--- a/shangjian/XGLFinishPro/Views/LanJu_User.xaml.cs
+++ b/shangjian/XGLFinishPro/Views/LanJu_User.xaml.cs
@@ -88,7 +88,8 @@ namespace XGLFinishPro.Views
if (isSucc)
{
CustomMessageBox.Show("打卡成功，祝您工作愉快！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning);
-
+ txtOnWorkUserID.Text = "";
+ txtOnWorkUserID.Focus();
Now_Click(null, null);
}
else {