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

yusijie

2024-09-30 7e129bfd5e7798d96bd523fe3e35ec0d37bdc727

 DAL/²É¹º¹ÜÀí/ClsCg_POInStockBackBill.cs

@@ -12,11 +12,11 @@

        public ClsCg_POInStockBackBill()
        {
            base.MvarItemKeySub = "Cg_POInStockBillSub";
            base.MvarItemKeySub = "Cg_POInStockBackBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey="Cg_POInStockBillMain";
            base.MvarItemKey= "Cg_POInStockBackBillMain";
            base.MvarReportTitle="退料通知单";
            base.BillType="1105";
            base.HBillSubType = "1105";
@@ -91,7 +91,7 @@
                //
                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate Cg_POInStockBillMain set  " +
                oCn.RunProc("UpDate Cg_POInStockBackBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                ",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
@@ -119,7 +119,7 @@
                omodel.HInterID = lngBillKey;
                foreach (Model.ClsCg_POInStockBackBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Cg_POInStockBillSub " +
                    oCn.RunProc("Insert into Cg_POInStockBackBillSub " +
                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HMaterID,HUnitID,HQty,HPrice,HMoney,HTaxPrice,HTaxMoney,HWHID" +
@@ -166,7 +166,7 @@
                //
                oCn.BeginTran();
                //主表
                oCn.RunProc("Insert Into Cg_POInStockBillMain   " +
                oCn.RunProc("Insert Into Cg_POInStockBackBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" +
                ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
                ",HAddress,HSupID,HCurID,HWHID,HExRate" +
@@ -180,7 +180,7 @@
                //插入子表
                foreach (Model.ClsCg_POInStockBackBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Cg_POInStockBillSub " +
                    oCn.RunProc("Insert into Cg_POInStockBackBillSub " +
                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HMaterID,HUnitID,HQty,HPrice,HMoney,HTaxPrice,HTaxMoney,HWHID" +
@@ -215,7 +215,7 @@
            {
                //查询主表
                DataSet Ds ;
                Ds = oCn.RunProcReturn("Select * from Cg_POInStockBillMain Where HInterID=" + lngBillKey.ToString(), "Cg_POInStockBillMain");
                Ds = oCn.RunProcReturn("Select * from Cg_POInStockBackBillMain Where HInterID=" + lngBillKey.ToString(), "Cg_POInStockBackBillMain");
                if(Ds.Tables[0].Rows.Count==0)
                {
                    sReturn = "单据未找到！";
@@ -263,7 +263,7 @@
                
                //循环
                DataSet DsSub ;
                DsSub = oCn.RunProcReturn("Select * from Cg_POInStockBillSub Where HInterID=" + lngBillKey.ToString(), "Cg_POInStockBillSub");
                DsSub = oCn.RunProcReturn("Select * from Cg_POInStockBackBillSub Where HInterID=" + lngBillKey.ToString(), "Cg_POInStockBackBillSub");
                DetailColl.Clear();//清空
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {