Browse Source

补充

master
songnan.zhang 2 years ago
parent
commit
8260333f7c
  1. 3
      APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml
  2. 7
      APPQ5/QMAPP.FJC.Web/Views/TSWeighRecore/TSWeighRecoreList.aspx
  3. 38
      APPQ5/QMAPP.WinForm/Forms/Injection/InjectionCodePrint.cs
  4. 4
      APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
  5. 3
      APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs

3
APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml

@ -434,7 +434,8 @@
<MenuItem MenuID="10050000" SystemID="FJC" MenuDes="表皮称重" Action="/TSWeighRecore/List" Target="url" PowerID="CD10050000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="10000000" Seq="1"> <MenuItem MenuID="10050000" SystemID="FJC" MenuDes="表皮称重" Action="/TSWeighRecore/List" Target="url" PowerID="CD10050000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="10000000" Seq="1">
<Actions> <Actions>
<Action ContorllerName="TSWeighRecore" ActionName="List" PowerID="CD10050001">查询</Action> <Action ContorllerName="TSWeighRecore" ActionName="List" PowerID="CD10050001">查询</Action>
<Action ContorllerName="TSWeighRecore" ActionName="ExportExcel" PowerID="CD10050002">导出</Action> <Action ContorllerName="TSWeighRecore" ActionName="Statistics" PowerID="CD10050002">统计</Action>
<Action ContorllerName="TSWeighRecore" ActionName="ExportExcel" PowerID="CD10050003">导出</Action>
</Actions> </Actions>
</MenuItem> </MenuItem>
<MenuItem MenuID="10060000" SystemID="FJC" MenuDes="库存信息" Action="/Storage/List" Target="url" PowerID="CD10060000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="10000000" Seq="1"> <MenuItem MenuID="10060000" SystemID="FJC" MenuDes="库存信息" Action="/Storage/List" Target="url" PowerID="CD10060000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="10000000" Seq="1">

7
APPQ5/QMAPP.FJC.Web/Views/TSWeighRecore/TSWeighRecoreList.aspx

@ -96,6 +96,11 @@
}) })
} }
} }
//导出
function Export() {
document.getElementById("selectKey").value = getSelectKey();
submitByButton("ExportExcel");
}
function Statistics() { function Statistics() {
submitByButton("Statistics"); submitByButton("Statistics");
} }
@ -108,7 +113,7 @@
<td align="center"> <td align="center">
<%=Html.QTButtonSearch("TSWeighRecore", "List", "List(1)", QMAPP.Common.Web.SystemLimit.isLimt)%> <%=Html.QTButtonSearch("TSWeighRecore", "List", "List(1)", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButton("Statistics", "Statistics", QMFrameWork.WebUI.IconCls.redo, "Statistics()", QMAPP.Common.Web.SystemLimit.isLimt)%> <%=Html.QTButton("Statistics", "Statistics", QMFrameWork.WebUI.IconCls.redo, "Statistics()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButton("export", "ExportExcel", QMFrameWork.WebUI.IconCls.redo, "Export()", QMAPP.Common.Web.SystemLimit.isLimt)%>
</td> </td>
</tr> </tr>
</table> </table>

38
APPQ5/QMAPP.WinForm/Forms/Injection/InjectionCodePrint.cs

@ -106,10 +106,17 @@ namespace QMAPP.WinForm.Forms.Injection
int i = 1; int i = 1;
//DataResult<List<PrintCode>> resultList = _agent.InvokeServiceFunction<DataResult<List<PrintCode>>>("MainOperationBLL_GetPrintCodeForChengdu", materialListInfo, model, i); //DataResult<List<PrintCode>> resultList = _agent.InvokeServiceFunction<DataResult<List<PrintCode>>>("MainOperationBLL_GetPrintCodeForChengdu", materialListInfo, model, i);
var machine = comMachine.SelectedItem as MachineInfo; var machine = comMachine.SelectedItem as MachineInfo;
DataResult<List<PrintCode>> resultList = _agent.InvokeServiceFunction<DataResult<List<PrintCode>>>("MainOperationBLL_GetPrintCodeWithParam", materialListInfo, machine, model, "", new Dictionary<string,string>()); DataResult<List<PrintCode>> resultList = _agent.InvokeServiceFunction<DataResult<List<PrintCode>>>("MainOperationBLL_GetPrintCodeWithParam", materialListInfo, machine, model, "", new Dictionary<string, string>());
try
{
Print(resultList.Result, true); Print(resultList.Result, true);
} }
catch (Exception e)
{
var ss = e.Message;
}
}
private void CodeCreatePrint(string header, string datarow, char[] dataSeparator) private void CodeCreatePrint(string header, string datarow, char[] dataSeparator)
{ {
@ -216,14 +223,32 @@ namespace QMAPP.WinForm.Forms.Injection
} }
} }
fr.Load(string.Format("{0}\\{1}.frx", path, typeTem)); fr.Load(string.Format("{0}\\{1}.frx", path, typeTem));
if (cbTemplateDesign.Enabled && cbTemplateDesign.Checked) if (cbTemplateDesign.Enabled && cbTemplateDesign.Checked)
{
try
{ {
fr.Design(true); fr.Design(true);
} }
catch (Exception e)
{
var ss = e.Message;
}
}
else else
{
try
{ {
fr.PrintSettings.ShowDialog = false; fr.PrintSettings.ShowDialog = false;
fr.Print(); fr.Print();
}
catch (Exception e)
{
var ss = e.Message;
}
#region 张松男20210802 修改 增加新版注塑投料条码绑定 #region 张松男20210802 修改 增加新版注塑投料条码绑定
@ -250,7 +275,16 @@ namespace QMAPP.WinForm.Forms.Injection
#endregion #endregion
} }
try
{
fr.Dispose(); fr.Dispose();
}
catch (Exception e)
{
var ss = e.Message;
}
//QM.Assist.PrintUtil pu = new QM.Assist.PrintUtil(); //QM.Assist.PrintUtil pu = new QM.Assist.PrintUtil();
//pu.PrintLabel2(System.Configuration.ConfigurationManager.AppSettings["proPath"].ToString //pu.PrintLabel2(System.Configuration.ConfigurationManager.AppSettings["proPath"].ToString

4
APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs

@ -2523,6 +2523,10 @@ namespace QMAPP.WinForm.Forms.Operation
/// <param name="e"></param> /// <param name="e"></param>
private void tsbPrint_Click(object sender, EventArgs e) private void tsbPrint_Click(object sender, EventArgs e)
{ {
MessageBox.Show("重打功能已关闭!");
return;
if (this.DGViewProList.SelectedRows.Count == 0) if (this.DGViewProList.SelectedRows.Count == 0)
{ {
MessageBox.Show("请选择打印的本体信息!"); MessageBox.Show("请选择打印的本体信息!");

3
APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs

@ -2698,6 +2698,9 @@ namespace QMAPP.WinForm.Forms.Operation
/// <param name="e"></param> /// <param name="e"></param>
private void tsbPrint_Click(object sender, EventArgs e) private void tsbPrint_Click(object sender, EventArgs e)
{ {
MessageBox.Show("重打功能已关闭!");
return;
if (this.DGViewProList.SelectedRows.Count == 0) if (this.DGViewProList.SelectedRows.Count == 0)
{ {
MessageBox.Show("请选择打印的本体信息!"); MessageBox.Show("请选择打印的本体信息!");

Loading…
Cancel
Save