From ed504b73178fc5052cbffe1b360bd5d18b3b29b8 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 07 七月 2023 11:28:35 +0800
Subject: [PATCH] 称重入库模块修改（增加作废、反作废功能；增加包号，选择不良原因；保存时根据是否自动打印进行是否跳出打印模版选择框控制）
---
WorkM/流转卡管理/Sc_ProcessExchangeBillQuery.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs"
index 3ffcfdc..e8d7492 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs"
@@ -56,11 +56,11 @@
//杩囨护鏉′欢
if (frmCondition.SqlStr.Trim().Length == 0)
{
- sSql = "Select * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " order by 鏃ユ湡 desc,hsubid ";
+ sSql = "Select * from " + ViewName + " Where 1=1 " + sWhere + sDlgWhere + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " order by 鏃ユ湡 desc,hsubid ";
}
else
{
- sSql = frmCondition.SqlStr + sWhere + sDlgWhere + " order by 鏃ユ湡 desc,hsubid ";
+ sSql = frmCondition.SqlStr + sWhere + sDlgWhere + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " order by 鏃ユ湡 desc,hsubid ";
}
//
DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -1168,6 +1168,10 @@
private void cf_Click(object sender, EventArgs e)
{
+ //鏅鸿鐗瑰埆鎺у埗
+ MessageBox.Show("鍗曟嵁鎷嗗垎鍔熻兘宸叉帶鍒讹紝璇蜂笌绠＄悊鍛樿仈绯�", "鎻愮ず");
+ return;
+ //
Int64 lngBillKey = 0;
if (grdMain.CurrentRow == null)
return;
--
Gitblit v1.9.1