From 4183f166994ff740662e1726ccbac5480b675d74 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 28 六月 2023 15:08:52 +0800
Subject: [PATCH] 单据(生产订单、工艺路线、工序流转卡、工序进站单(关闭、反关闭无权限)、工序出站单(关闭、反关闭无权限)、工序委外发出单、工序委外接收单、不良品处理单、工序派工单、工序返工记录单、工序返工申请单、其它入库单、其它出库单、生产入库单、生产汇报单)：添加审核、反审核、关闭、反关闭按钮
---
WorkM/流转卡管理/MES_StationOutBillList.cs | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
index efa4015..9e7ebb2 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBillList.cs"
@@ -10,6 +10,7 @@
using DBUtility;
using System.IO;
using System.Reflection;
+using Pub_Class;
namespace WorkM
{
@@ -46,6 +47,11 @@
DataSet DSet;
string sSql = "";
string sWhere = "";
+
+ if (chkWJieAn.Checked == true)
+ {
+ sWhere = " and HBillStatus<>3 ";
+ }
if (frmCondition.SqlStr.Trim().Length == 0)
{
@@ -153,6 +159,7 @@
oSumGrid.ogrdMain = grdMain; //鍒濆鍖� new
oSumGrid.oGridsum = grdSum;
initGrid();
+ chkWJieAn.Checked = true;
}
private void grdMain_DblClick(object sender, EventArgs e)
@@ -211,9 +218,12 @@
{
if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel)==DialogResult.OK)
{
- if (oBill.omodel.HMaker != ClsPub.CurUserName && (ClsPub.CurUserName != "admin" && ClsPub.CurUserName != "Admin"))
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+ string DeleteCtl = oClsXt_SystemParameter.GetSingleSystemParameter("MES_StationOutBill_DeleteCtl", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (DeleteCtl == "Y" && oBill.omodel.HMaker != DBUtility.ClsPub.CurUserName && DBUtility.ClsPub.CurUserName != "admin" && DBUtility.ClsPub.CurUserName != "Admin")
{
- MessageBox.Show("鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒", "鎻愮ず");
+ MessageBox.Show("鐧诲綍鐢ㄦ埛涓庡埗鍗曚汉涓嶄竴鑷达紝涓嶅厑璁稿垹闄�", "鎻愮ず");
return;
}
@@ -628,9 +638,9 @@
for (int i = 0; i < grdMain.SelectedRows.Count; i++)
{
BillSelect oSelect = new BillSelect();
- oSelect.BillNo = ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[BillNoCol].Value);
- oSelect.BillMainID = ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[MainIDCol].Value);
- oSelect.BillSubID = ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[SubIDCol].Value);
+ oSelect.BillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[BillNoCol].Value);
+ oSelect.BillMainID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[MainIDCol].Value);
+ oSelect.BillSubID = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[SubIDCol].Value);
oSelect.BillTitle = "宸ュ簭鍑虹珯姹囨姤鍗�";
oSelect.BillType = ModName;
oBillSelectColl.Add(oSelect);
@@ -655,5 +665,19 @@
DBUtility.Gy_BaseFun.DataGridViewToExcel2(grdMain, this.Text, this.Text);
}
+
+ private void fj_Click(object sender, EventArgs e)
+ {
+ if (grdMain.CurrentRow == null)
+ return;
+ string sBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("鍗曟嵁鍙�")].Value);
+ if (sBillNo.Trim() != "")
+ {
+ BLL.Xt_File oFile = new BLL.Xt_File();
+ oFile.HBillType = ModName;
+ oFile.HBillNo = sBillNo;
+ oFile.ShowDialog();
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1