|
|
|
@ -406,6 +406,8 @@ namespace XGLFinishPro.Views
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private async void btnComplete_Click(object sender, RoutedEventArgs e)
|
|
|
|
private async void btnComplete_Click(object sender, RoutedEventArgs e)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var selectedRow = (dgWorkOrderInfo.SelectedItem as DataRowView); //dgWorkOrderInfo.SelectedItem as FoamingMacModel;
|
|
|
|
var selectedRow = (dgWorkOrderInfo.SelectedItem as DataRowView); //dgWorkOrderInfo.SelectedItem as FoamingMacModel;
|
|
|
|
if (selectedRow == null)
|
|
|
|
if (selectedRow == null)
|
|
|
|
@ -422,17 +424,17 @@ namespace XGLFinishPro.Views
|
|
|
|
DataTable dtNewReportCode = formingMachineService.GetReportCode();
|
|
|
|
DataTable dtNewReportCode = formingMachineService.GetReportCode();
|
|
|
|
if (dtNewReportCode == null || dtNewReportCode.Rows.Count == 0)
|
|
|
|
if (dtNewReportCode == null || dtNewReportCode.Rows.Count == 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
newReportCode = DateTime.Now.ToString("yyyyMMdd") + "001";
|
|
|
|
newReportCode = DateTime.Now.ToString("yyyyMMdd") + "0001";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (string.IsNullOrEmpty(dtNewReportCode.Rows[0]["report_code"].ToString()))
|
|
|
|
if (string.IsNullOrEmpty(dtNewReportCode.Rows[0]["report_code"].ToString()))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
newReportCode = DateTime.Now.ToString("yyyyMMdd") + "001";
|
|
|
|
newReportCode = DateTime.Now.ToString("yyyyMMdd") + "0001";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
newReportCode = (Convert.ToInt32(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString();
|
|
|
|
newReportCode = (Convert.ToInt64(dtNewReportCode.Rows[0]["report_code"].ToString()) + 1).ToString();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(), selectedRow["quantity_split"].ToString());
|
|
|
|
ExecReportWorkWin execReport = new ExecReportWorkWin(selectedRow["workorder_code"].ToString(), selectedRow["quantity_split"].ToString());
|
|
|
|
@ -454,9 +456,9 @@ namespace XGLFinishPro.Views
|
|
|
|
var jsonContent = JsonConvert.SerializeObject(reportWork);
|
|
|
|
var jsonContent = JsonConvert.SerializeObject(reportWork);
|
|
|
|
LogHelper.instance.log.Info("开始报工>>" + jsonContent);
|
|
|
|
LogHelper.instance.log.Info("开始报工>>" + jsonContent);
|
|
|
|
RestHelper restClient = new RestHelper();
|
|
|
|
RestHelper restClient = new RestHelper();
|
|
|
|
var response = await restClient.PostAsync(apiUrl, jsonContent);
|
|
|
|
//var response =;
|
|
|
|
|
|
|
|
|
|
|
|
MesResult result = Utils.DeJson<MesResult>(response);
|
|
|
|
Rootobjectresu result = Utils.DeJson<Rootobjectresu>(await restClient.PostAsync(apiUrl, jsonContent));
|
|
|
|
|
|
|
|
|
|
|
|
if (result.code == 200)
|
|
|
|
if (result.code == 200)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -472,6 +474,12 @@ namespace XGLFinishPro.Views
|
|
|
|
CustomMessageBox.Show("报工失败", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Error);
|
|
|
|
CustomMessageBox.Show("报工失败", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Error);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
zhaojian
2 years ago