zzr99
2022-04-25 e5e8b23083cd7f09ebe3c110e84cfad7747eba49
BaseSet/¹«ÓÃ×ÊÁÏ/ÆäËû»ù´¡×ÊÁÏ/Gy_StdWorkTimesList.cs
@@ -263,23 +263,31 @@
                sr = CurNode.Text.Split(c);
                HParentID = sr[0].ToString();
            }
            //过滤条件
            if (HParentID == "" || HParentID == "物料资料" || HParentID == "工序资料")
            if (frmCondition==null)
            {
                sSql = "Select top 10000 * from " + ViewName + " order by  HItemID Desc";
            }
            else
            {
                if (wl.Checked == false)
                //过滤条件
                if (HParentID == "" || HParentID == "物料资料" || HParentID == "工序资料")
                {
                    sSql = "Select top 10000 * from " + ViewName + " where å·¥åºä»£ç  like '%" + HParentID.ToString() + "%' order by HItemID Desc";
                    sSql = "Select top 10000 * from " + ViewName + " order by  HItemID Desc";
                }
                else
                {
                    sSql = "Select top 10000 * from " + ViewName + " where ç‰©æ–™ä»£ç  like '%" + HParentID.ToString() + "%' order by HItemID Desc ";
                }
                    if (wl.Checked == false)
                    {
                        sSql = "Select top 10000 * from " + ViewName + " where å·¥åºä»£ç  like '%" + HParentID.ToString() + "%' order by HItemID Desc";
                    }
                    else
                    {
                        sSql = "Select top 10000 * from " + ViewName + " where ç‰©æ–™ä»£ç  like '%" + HParentID.ToString() + "%' order by HItemID Desc ";
                    }
                }
            }
            else
            {
                sSql = frmCondition.SqlStr + sWhere + " order by " + ModName;
            }
            //执行SQL
            DSet = SubCn.RunProcReturn(sSql, ViewName);
@@ -395,18 +403,15 @@
                else
                {
                    //审核
                    if (oItem.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        MessageBox.Show("审核成功!", "提示");
                    }
                    else
                    if (oItem.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) != true)
                    {
                        MessageBox.Show("审核失败!", "提示");
                        return;
                    }
                }
            }
            MessageBox.Show("审核成功,请刷新!", "提示");
            MessageBox.Show("审核成功!", "提示");
            Display();
            return;
        }
        //反审核
@@ -435,18 +440,15 @@
                else
                {
                    //审核
                    if (oItem.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        MessageBox.Show("反审核成功!", "提示");
                    }
                    else
                    if (oItem.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) != true)
                    {
                        MessageBox.Show("反审核失败!", "提示");
                        return;
                    }
                }
            }
            MessageBox.Show("审核成功,请刷新!", "提示");
            MessageBox.Show("反审核成功!", "提示");
            Display();
            return;
        }
@@ -481,9 +483,11 @@
                else
                {
                    oCn.RunProc(" Update Gy_StdWorkTimes set HStopflag=1 Where HItemID=" + lngBillKey.ToString());
                }
            }
            MessageBox.Show("禁用成功,请刷新!", "提示");
            MessageBox.Show("禁用成功!", "提示");
            Display();
            return;
        }
@@ -512,9 +516,11 @@
                else
                {
                    oCn.RunProc(" Update Gy_StdWorkTimes set HStopflag=0 Where HItemID=" + lngBillKey.ToString());
                }
            }
            MessageBox.Show("反禁用成功,请刷新!", "提示");
            MessageBox.Show("反禁用成功!", "提示");
            Display();
            return;
        }
    }