1
yangle
2022-04-18 8473931f7e7673fcc570ddee0c214756f8e85b76
1
2个文件已修改
119 ■■■■■ 已修改文件
DAL/基础资料/公用基础资料/ClsGy_Source_View.cs 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/流转卡管理/MES_StationOutBill.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/ClsGy_Source_View.cs
@@ -31,30 +31,30 @@
            GC.SuppressFinalize(this);
        }
        //
        //返回项目信息
        //public override bool GetInfoByID(Int64 sItemID)
        //{
        //    DataSet DS ;
        //    try
        //    {
        //        DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HItemID='" + sItemID + "'", MvarItemKey, ref DBUtility.ClsPub.sExeReturnInfo);
        //        if (DS.Tables[0].Rows.Count  == 0)
        //            return false;
        //        else
        //        {
        //            return GetInfo(DS);
        //        }
        //    }
        //    catch (Exception e)
        //    {
        //        throw (e);
        //    }
        //}
        //返回项目信息
        public override bool GetInfoByID(Int64 sItemID)
        {
            DataSet DS;
            try
            {
                DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HItemID='" + sItemID + "'", MvarItemKey, ref DBUtility.ClsPub.sExeReturnInfo);
                if (DS.Tables[0].Rows.Count == 0)
                    return false;
                else
                {
                    return GetInfo(DS);
                }
            }
            catch (Exception e)
            {
                throw (e);
            }
        }
        //返回项目信息    å¥¥é‚¦ä¸“用
        public bool GetInfoByID_AoBang(Int64 sItemID)
        {
            DataSet DS;
            try
@@ -160,22 +160,19 @@
                omodel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
                omodel.HNumber = DS.Tables[0].Rows[0]["HNumber"].ToString().Trim();
                omodel.HName = DS.Tables[0].Rows[0]["HName"].ToString().Trim();
                //20220331修改
                //omodel.HHelpCode = DS.Tables[0].Rows[0]["HHelpCode"].ToString().Trim();
                //omodel.HShortNumber = DS.Tables[0].Rows[0]["HShortNumber"].ToString().Trim();
                //omodel.HParentID = Convert.ToInt64(DS.Tables[0].Rows[0]["HParentID"]);
                //omodel.HLevel = Convert.ToInt64(DS.Tables[0].Rows[0]["HLevel"]);
                //omodel.HEndFlag = (bool)DS.Tables[0].Rows[0]["HEndFlag"];
                //omodel.HStopflag = (bool)DS.Tables[0].Rows[0]["HStopflag"];
                //omodel.HRemark = DS.Tables[0].Rows[0]["HRemark"].ToString().Trim();
                //omodel.HProcID = Convert.ToInt64(DS.Tables[0].Rows[0]["HProcID"]);
                //omodel.HRelationID = Convert.ToInt64(DS.Tables[0].Rows[0]["HRelationID"]);
                //omodel.HCenterID = Convert.ToInt64(DS.Tables[0].Rows[0]["HCenterID"]);
                //omodel.HBarCode = DS.Tables[0].Rows[0]["HBarCodeForBase"].ToString().Trim();
                //omodel.HType = DS.Tables[0].Rows[0]["HType"].ToString().Trim();
                //omodel.HEquipFileID_K3 = Convert.ToInt64(DS.Tables[0].Rows[0]["HEquipFileID_K3"]);
                //修改的地方到这里
                omodel.HHelpCode = DS.Tables[0].Rows[0]["HHelpCode"].ToString().Trim();
                omodel.HShortNumber = DS.Tables[0].Rows[0]["HShortNumber"].ToString().Trim();
                omodel.HParentID = Convert.ToInt64(DS.Tables[0].Rows[0]["HParentID"]);
                omodel.HLevel = Convert.ToInt64(DS.Tables[0].Rows[0]["HLevel"]);
                omodel.HEndFlag = (bool)DS.Tables[0].Rows[0]["HEndFlag"];
                omodel.HStopflag = (bool)DS.Tables[0].Rows[0]["HStopflag"];
                omodel.HRemark = DS.Tables[0].Rows[0]["HRemark"].ToString().Trim();
                omodel.HProcID = Convert.ToInt64(DS.Tables[0].Rows[0]["HProcID"]);
                omodel.HRelationID = Convert.ToInt64(DS.Tables[0].Rows[0]["HRelationID"]);
                omodel.HCenterID = Convert.ToInt64(DS.Tables[0].Rows[0]["HCenterID"]);
                omodel.HBarCode = DS.Tables[0].Rows[0]["HBarCodeForBase"].ToString().Trim();
                omodel.HType = DS.Tables[0].Rows[0]["HType"].ToString().Trim();
                omodel.HEquipFileID_K3 = Convert.ToInt64(DS.Tables[0].Rows[0]["HEquipFileID_K3"]);
                //omodel.HGroupK3ID = Convert.ToInt64(DS.Tables[0].Rows[0]["HGroupK3ID"]);
                //omodel.HGroupID = Convert.ToInt64(DS.Tables[0].Rows[0]["HGroupID"]);
@@ -195,6 +192,25 @@
            }
        }
        //返回项目信息    å¥¥é‚¦ä¸“用
        public bool GetInfo_AoBang(DataSet DS)
        {
            try
            {
                omodel = new Model.ClsGy_Source_Model();
                omodel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
                omodel.HNumber = DS.Tables[0].Rows[0]["HNumber"].ToString().Trim();
                omodel.HName = DS.Tables[0].Rows[0]["HName"].ToString().Trim();
                return true;
            }
            catch (Exception e)
            {
                throw (e);
            }
        }
        /// <summary>
        /// å¾—到默认资源根据部门
WorkM/Á÷ת¿¨¹ÜÀí/MES_StationOutBill.cs
@@ -669,6 +669,35 @@
                MessageBox.Show("单据号重复!", "提示");
                return false;
            }
            //根据不同客户,对录入总工时与标准总工时进行对比判断
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            long sMaterID = DBUtility.ClsPub.isLong(this.txtHMaterID.Tag);
            long sProcID = DBUtility.ClsPub.isLong(this.txtHProcID.Tag);
            double sQty = DBUtility.ClsPub.isDoule(this.txtHQty.Text);
            double sBadCount = DBUtility.ClsPub.isDoule(this.txtHBadCount.Text);
            double sWasterQty = DBUtility.ClsPub.isDoule(this.txtHWasterQty.Text);
            double sWorkTimes = DBUtility.ClsPub.isSingle(this.txtHWorkTimes.Text);
            DataSet Ds;
            Ds = oCn.RunProcReturn("exec h_p_MES_StationOutBill_WorkTimesCtrl  " + sMaterID.ToString() + "," + sProcID.ToString() + "," + sQty.ToString() + "," + sBadCount.ToString() + "," + sWasterQty.ToString() + "," + sWorkTimes.ToString(), "h_p_MES_StationOutBill_WorkTimesCtrl");
            if (Ds == null || Ds.Tables[0].Rows.Count == 0)
            {
                MessageBox.Show("录入总工时与标准总工时对比判断失败!", "提示");
                return false;
            }
            else
            {
                if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
                {
                    MessageBox.Show(DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]));
                    return false;
                }
                else if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 2)
                {
                    MessageBox.Show(DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]));
                }
            }
            return true;
        }
        //保存单据