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

yxj

2021-11-01 6c1b31728b0dbafeab9b1cce19dac145b972b1b5

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

@@ -143,6 +143,7 @@
        {
            try
            {
                string orgid = DBUtility.ClsPub.HOrgID.ToString();
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //若MAINDI重复则重新获取
@@ -201,14 +202,14 @@
                ",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
                ",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
                ",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
                ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HPRDORGID,HVerNum,HOrgID" +
                ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HPRDORGID,HVerNum" +
                ") " +
                " values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + omodel.HMaterID.ToString() + ",'" + omodel.HName + "'," + omodel.HMaterTypeID.ToString() +
                ",'" + omodel.HRoutingGroupID.ToString() + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HMaterNumber + "','" + omodel.HUnitNumber + "'," + DBUtility.ClsPub.BoolToString(omodel.HStandard) +
                "," + omodel.HMainGroupID.ToString() + "," + omodel.HMainProcID.ToString() + "," + omodel.HMainCenterID.ToString() + ",'" + omodel.HMainTimeUnit + "'," + omodel.HMainUnitTime.ToString() + "," + omodel.HMainWorkQty.ToString() +
                "," + omodel.HMainPrice.ToString() + "," + omodel.HStdSourceQty.ToString() + "," + omodel.HAddSourceRate + "," + omodel.HDelSourceRate.ToString() +
                ",'" + omodel.HPicNumVer.ToString() + "','" + omodel.HPicNumAssemble.ToString() + "','" + omodel.HMaterTexture.ToString() + "','" + omodel.HProductNum.ToString() + "','" + omodel.HPRDORGID.ToString() + "','" + omodel.HVerNum.ToString() + "'," + DBUtility.ClsPub.HOrgID +
                ",'" + omodel.HPicNumVer.ToString() + "','" + omodel.HPicNumAssemble.ToString() + "','" + omodel.HMaterTexture.ToString() + "','" + omodel.HProductNum.ToString() + "','" + DBUtility.ClsPub.HOrgID + "','" + omodel.HVerNum.ToString() + "'" +
                ") ");
                //插入子表
                foreach (Model.ClsGy_RoutingBillSub oSub in DetailColl)
@@ -332,7 +333,7 @@
                omodel.HMaterTexture = Ds.Tables[0].Rows[0]["HMaterTexture"].ToString().Trim();
                omodel.HProductNum = Ds.Tables[0].Rows[0]["HProductNum"].ToString().Trim();
                omodel.HVerNum = Ds.Tables[0].Rows[0]["HVerNum"].ToString().Trim();

                omodel.HPRDORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"].ToString());
                //循环
                DataSet DsSub ;
                DsSub = oCn.RunProcReturn("Select * from Gy_RoutingBillSub Where HInterID=" + lngBillKey.ToString() + " Order by HEntryID ", "Gy_RoutingBillSub");