From 3db477ccda04b391872cbd570b7d1c1253e1f6e0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 23 五月 2023 14:11:00 +0800
Subject: [PATCH] 生产订单备注字段改成白坯要求，底部备注下推流转卡的时候带到流转卡底部备注中去 生产订单 已经下推过 流转卡或 生产入库单 或生产领料单 后，就不能删除； 生产资源新增模块增加 负责人 HEmpID int 字段（gy_Employee） 非必录入，打印的时候打印出来 生产订单列表里增加关闭和反关闭按钮（在生产订单编辑模块里有这个功能，将一样的功能复制出来），列表显示关闭状态 工序流转卡维护列表增加当前工序过滤条件（下拉框形式，取值取工序列表） 网格选中行， 背景行 浅蓝色 显示；（优先改 生产订单列表，流转卡列表，出站单列表，进站单列表）（最好改JS底层方法）
---
WorkM/报表分析/MES_WIPProcReport.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_WIPProcReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_WIPProcReport.cs"
index ccb2971..18b3838 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_WIPProcReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_WIPProcReport.cs"
@@ -132,6 +132,7 @@
{
dtpHFDate.Value = DateTime.Today;
dtpHEDate.Value = DateTime.Today;
+ cmbHType.Text = "鍏ㄩ儴";
}
private bool Fun_AllowQuery()//瀹℃牳鏌ヨ鏉′欢
@@ -162,11 +163,11 @@
//杩囨护鏉′欢Dlg
string sDlgWhere = "";
sDlgWhere = sDlgWhere + ",'" + dtpHFDate.Value.ToShortDateString() + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHWorkCenter.Text.Trim() + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHSupName.Text.Trim() + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHExProcNo.Text.Trim() + "'";
- sDlgWhere = sDlgWhere + ",'" + txtHOrderProcNo.Text.Trim() + "'";
+ sDlgWhere = sDlgWhere + ",'" + cmbHType.Text.Trim() + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHProcName.Text.Trim() + "'";
sDlgWhere = sDlgWhere + ",'" + txtHMaterNumber.Text.Trim() + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHMaterName.Text.Trim() + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHMaterModel.Text.Trim() + "'";
if (sDlgWhere.Trim().Length > 0)
{
@@ -335,15 +336,6 @@
}
}
- private void cmdHWorkCenter_Click(object sender, EventArgs e)
- {
- BLL.ClsBaseSelect.SetTextByWorkCenter(txtHWorkCenter);
- }
-
- private void cmdHSupName_Click(object sender, EventArgs e)
- {
- BLL.ClsBaseSelect.SetTextBySupplier(txtHSupName);
- }
private void grdMain_Scroll(object sender, ScrollEventArgs e)
{
@@ -370,8 +362,16 @@
DBUtility.Gy_BaseFun.DataGridViewToExcel2(grdMain, this.Text, this.Text);
}
-
-
+ //娓呯┖鎸夐挳
+ private void btnClear_Click(object sender, EventArgs e)
+ {
+ dtpHFDate.Value = DateTime.Today;
+ cmbHType.Text = "鍏ㄩ儴";
+ txtHProcName.Text = "";
+ txtHMaterNumber.Text = "";
+ txtHMaterName.Text = "";
+ txtHMaterModel.Text = "";
+ }
--
Gitblit v1.9.1