Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

jingh

2021-08-12 01d28a4fc9a05afe6271ea4ef194dabd060bf911

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 DAL/¼Æ»®¹ÜÀí/ClsGy_RoutingBill.cs

@@ -141,6 +141,37 @@
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //若MAINDI重复则重新获取
                oCn.BeginTran();
                //string BillType1 = this.BillType;
                //string HInterID = omodel.HInterID.ToString();
                //string HBillNo = omodel.HBillNo;
                //DateTime HDate = omodel.HDate;
                //string HYear = omodel.HYear.ToString();
                //string HPeriod = omodel.HPeriod.ToString();
                //string HRemark = omodel.HRemark;
                //string CurUserName = DBUtility.ClsPub.CurUserName;
                //string HMaterID = omodel.HMaterID.ToString();
                //string HName = omodel.HName;
                //string HMaterTypeID = omodel.HMaterTypeID.ToString();
                //string HRoutingGroupID = omodel.HRoutingGroupID.ToString();
                //string HUnitID = omodel.HUnitID.ToString();
                //string HMaterNumber = omodel.HMaterNumber;
                //string HUnitNumber = omodel.HUnitNumber;
                //string HStandard = DBUtility.ClsPub.BoolToString(omodel.HStandard);
                //string HMainGroupID = omodel.HMainGroupID.ToString();
                //string HMainProcID = omodel.HMainProcID.ToString();
                //string HMainCenterID = omodel.HMainCenterID.ToString();
                //string HMainTimeUnit = omodel.HMainTimeUnit;
                //string HMainUnitTime = omodel.HMainUnitTime.ToString();
                //string HMainWorkQty = omodel.HMainWorkQty.ToString();
                //string HMainPrice = omodel.HMainPrice.ToString();
                //string HStdSourceQty = omodel.HStdSourceQty.ToString();
                //string HAddSourceRate = omodel.HAddSourceRate.ToString();
                //string HDelSourceRate = omodel.HDelSourceRate.ToString();
                //string HPicNumVer = omodel.HPicNumVer.ToString();
                //string HPicNumAssemble = omodel.HPicNumAssemble.ToString();
                //string HMaterTexture = omodel.HMaterTexture.ToString();
                //string HProductNum = omodel.HProductNum.ToString();
                //string HVerNum = omodel.HVerNum.ToString();
                //主表
                oCn.RunProc("Insert Into Gy_RoutingBillMain   " +
                "(HBillType,HInterID,HBillNo,HDate" +

 PlanM/Êý¾Ýµ¼Èë/Gy_DataIn_RoutingBill.cs

@@ -18,6 +18,7 @@
        }

        public int HMaterNumberCol = 0;             //产品代码
        public int HProcNoCol = 0;       //工序序号
        public int HProcNameCol = 0;           //工序
        public int HWorkCenterNameCol = 0;        //工作中心   
        public int HWorkQtyCol = 0;          //产能
@@ -25,10 +26,17 @@
        public int HBeginFixQtyCol = 7;     //开工余量 
        public int HFixPriceCol = 8;        //定额 å°æ—¶å·¥èµ„
        public int HProcPriceCol = 9;       //工价
        public int HProcNoCol = 0;       //工序序号
        public int HTechnologyParameterCol = 0;       //工艺参数
        public int HPicNumCol = 0;       //图纸编号 
        public int HProcCheckNoteCol = 0;       //本工序确认记录

        public int HPicNumVerCol = 0;       //图号版本
        public int HPicNumAssembleCol = 0;       //总装图号
        public int HMaterTextureCol = 0;       //材质
        public int HProductNumCol = 0;       //成品编号
        public int HVerNumCol = 0;       //版本
        public int HMouldNoCol = 0;       //模具编号
        public int HProcWorkNumCol = 0;        //程序号
        //
        public const int HBeginRow = 2;         //有效数据，开始行数
        // 
@@ -76,18 +84,25 @@
            string HBillNo = "";
            //
            HMaterNumberCol = DBUtility.Gy_BaseFun.Fun_GetCol("产品代码", grdMain);
            HProcNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序序号", grdMain);
            HProcNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序", grdMain);
            HWorkCenterNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工作中心", grdMain);
            HWorkQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("产能", grdMain);
            HPicNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("图纸编号", grdMain);
            HTechnologyParameterCol = DBUtility.Gy_BaseFun.Fun_GetCol("工艺参数", grdMain);
            HProcCheckNoteCol = DBUtility.Gy_BaseFun.Fun_GetCol("本工序确认记录", grdMain);
            HPicNumVerCol = DBUtility.Gy_BaseFun.Fun_GetCol("图号版本", grdMain);
            HPicNumAssembleCol = DBUtility.Gy_BaseFun.Fun_GetCol("总装图号", grdMain);
            HMaterTextureCol = DBUtility.Gy_BaseFun.Fun_GetCol("材质", grdMain);
            HProductNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("成品编号", grdMain);
            HVerNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("版本", grdMain);
            HMouldNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("模具编号", grdMain);
            HProcWorkNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("程序号", grdMain);
            HBeginFixQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("开工余量", grdMain);
            HBeginDayQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("开工固天", grdMain);
            HFixPriceCol = DBUtility.Gy_BaseFun.Fun_GetCol("小时工资", grdMain);
            HProcPriceCol = DBUtility.Gy_BaseFun.Fun_GetCol("单个工价", grdMain);

            HProcNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序序号", grdMain);
            HTechnologyParameterCol = DBUtility.Gy_BaseFun.Fun_GetCol("工艺参数", grdMain);
            HPicNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("图纸编号", grdMain);
            HProcCheckNoteCol = DBUtility.Gy_BaseFun.Fun_GetCol("本工序确认记录", grdMain);
            //没有找到列
            if (HMaterNumberCol == -1)
            {
@@ -149,6 +164,41 @@
                MessageBox.Show("没有找到【本工序确认记录】的标题", "提示");
                return;
            }
            if (HPicNumVerCol == -1)
            {
                MessageBox.Show("没有找到【图号版本】的标题", "提示");
                return;
            }
            if (HPicNumAssembleCol == -1)
            {
                MessageBox.Show("没有找到【总装图号】的标题", "提示");
                return;
            }
            if (HMaterTextureCol == -1)
            {
                MessageBox.Show("没有找到【材质】的标题", "提示");
                return;
            }
            if (HProductNumCol == -1)
            {
                MessageBox.Show("没有找到【成品编号】的标题", "提示");
                return;
            }
            if (HVerNumCol == -1)
            {
                MessageBox.Show("没有找到【版本】的标题", "提示");
                return;
            }
            if (HMouldNoCol == -1)
            {
                MessageBox.Show("没有找到【模具编号】的标题", "提示");
                return;
            }
            if (HProcWorkNumCol == -1)
            {
                MessageBox.Show("没有找到【程序号】的标题", "提示");
                return;
            }
            //
            if (!Checkdata())
            {
@@ -164,10 +214,20 @@
                BillNew.omodel.HPeriod = 1;
                BillNew.omodel.HBillNo = HBillNo;
                BillNew.omodel.HDate = DateTime.Today.Date;
                BillNew.omodel.HPicNumVer = "";
                BillNew.omodel.HPicNumAssemble = "";
                BillNew.omodel.HMaterTexture = "";
                BillNew.omodel.HProductNum = "";
                BillNew.omodel.HVerNum = "";
                BillNew.DetailColl.Clear();
            } 
            for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
            {
                BillNew.omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumVerCol].Value);
                BillNew.omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumAssembleCol].Value);
                BillNew.omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterTextureCol].Value);
                BillNew.omodel.HProductNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProductNumCol].Value);
                BillNew.omodel.HVerNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HVerNumCol].Value);
                string sHNumber = ""; 
                if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value) != "" )
                {
@@ -366,6 +426,8 @@
            oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HTechnologyParameterCol].Value);
            oSub.HPicNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HPicNumCol].Value);
            oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HProcCheckNoteCol].Value);
            oSub.HMouldNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HMouldNoCol].Value);
            oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HProcWorkNumCol].Value);
            BillNew.DetailColl.Add(oSub);
            return true;
        }