From 9671e1c0d88deeea2efc06b800f7eaedfcf82949 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 08 十一月 2021 14:37:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/生产基础资料/Gy_Process.cs | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 1 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
index 5dd9a26..d66843d 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.cs"
@@ -444,6 +444,7 @@
DAL.ClsIF_Department_View oDept = new DAL.ClsIF_Department_View();
//DAL.ClsK3_Process_View oProc = new DAL.ClsK3_Process_View();
DAL.ClsGy_ProcMul_View oPm = new DAL.ClsGy_ProcMul_View();
+ DAL.ClsGy_Warehouse_View oWH = new DAL.ClsGy_Warehouse_View();
if (oProcHlp.GetInfoByID(sItemID))
{
txtHNumber.Text = oProcHlp.omodel.HNumber.ToString();
@@ -481,6 +482,27 @@
{
txtHProcMulID.Text = "";
}
+ //
+ if (oWH.GetInfoByID(oProcHlp.omodel.HBadWHID))
+ {
+ txtHBadWHID.Text = oWH.omodel.HName;
+ txtHBadWHID.Tag = oWH.omodel.HItemID.ToString();
+ }
+ else
+ {
+ txtHBadWHID.Text = "";
+ }
+ //
+ if (oWH.GetInfoByID(oProcHlp.omodel.HWasterWHID))
+ {
+ txtHWasterWHID.Text = oWH.omodel.HName;
+ txtHWasterWHID.Tag = oWH.omodel.HItemID.ToString();
+ }
+ else
+ {
+ txtHWasterWHID.Text = "";
+ }
+ //
txtHNumber.Text = oProcHlp.omodel.HNumber.ToString();
txtHRemark.Text = oProcHlp.omodel.HRemark;
txtHProcCheckNote.Text = oProcHlp.omodel.HProcCheckNote;
@@ -489,6 +511,7 @@
txtHFixPrice.Text = oProcHlp.omodel.HFixPrice.ToString();
txtHOverFixPrice.Text = oProcHlp.omodel.HOverFixPrice.ToString();
cmbHBillSubType.Text = oProcHlp.omodel.HBillSubType;
+
if (oProcHlp.omodel.HStopflag)
chkHStopflag.Checked = true;
else
@@ -584,6 +607,8 @@
oProc.oModel.HFixPrice = DBUtility.ClsPub.isDoule(txtHFixPrice.Text);
oProc.oModel.HOverFixPrice = DBUtility.ClsPub.isDoule(txtHOverFixPrice.Text);
oProc.oModel.HProcMulID = DBUtility.ClsPub.isLong(txtHProcMulID.Tag.ToString());
+ oProc.oModel.HBadWHID = DBUtility.ClsPub.isLong(txtHBadWHID.Tag.ToString());
+ oProc.oModel.HWasterWHID = DBUtility.ClsPub.isLong(txtHWasterWHID.Tag.ToString());
oProc.oModel.HTypeFlow = chkHTypeFlow.Checked;
oProc.oModel.HTypeCount = chkHTypeCount.Checked;
oProc.oModel.HAutoTrunFlag = chkHAutoTrunFlag.Checked;
@@ -683,6 +708,48 @@
DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
}
-
+ private void cmdHBadWHID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
+ if (oWare.RefreshView())
+ {
+ this.txtHBadWHID.Text = oWare.oModel.HName;
+ this.txtHBadWHID.Tag = oWare.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHBadWHID.Text = "";
+ }
+ }
+
+ private void cmdHWasterWHID_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_Warehouse_View oWare = new DAL.ClsGy_Warehouse_View();
+ if (oWare.RefreshView())
+ {
+ this.txtHWasterWHID.Text = oWare.oModel.HName;
+ this.txtHWasterWHID.Tag = oWare.oModel.HItemID.ToString();
+ }
+ else
+ {
+ this.txtHWasterWHID.Text = "";
+ }
+ }
+
+ private void txtHBadWHID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHBadWHID.Text.Length == 0)
+ {
+ txtHBadWHID.Tag = "0";
+ }
+ }
+
+ private void txtHWasterWHID_TextChanged(object sender, EventArgs e)
+ {
+ if (txtHWasterWHID.Text.Length == 0)
+ {
+ txtHWasterWHID.Tag = "0";
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1