王 垚
2021-10-14 b14d014e39c97d339ee83c0e272afd4e7a6ee709
分布式调入调出
8个文件已修改
55 ■■■■■ 已修改文件
Model/生产管理/模具管理/ClsSc_MouldMoveStockStepInBillMain.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/模具管理/ClsSc_MouldMoveStockStepOutBillMain.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/模具管理/ClsSc_MouldStockBillSub.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsSc_MouldMoveStockStepInBill.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsSc_MouldMoveStockStepOutBill.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMoveStockStepInBillMain.cs
@@ -18,5 +18,6 @@
        public string HInnerBillNo;//  varchar(50)         --内部单据号
        public string HRemark; //加工要求
        public bool HRedBlueFlag;//  bit            --红蓝单
        public string HStockStyle;//  bit            --红蓝单
    }
}
Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldMoveStockStepOutBillMain.cs
@@ -18,5 +18,6 @@
        public string HInnerBillNo;//  varchar(50)         --内部单据号
        public string HRemark; //加工要求
        public bool HRedBlueFlag;//  bit            --红蓝单
        public string HStockStyle;//  bit            --红蓝单
    }
}
Model/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldStockBillSub.cs
@@ -42,6 +42,8 @@
        public string HDiameter;
        public string HBackFlag;
        public double HNewLifeQty;
        public long HStockOrgID; //调入组织内码,
        public long HOtherOrgID;//调出组织内码
        public Int64 HPOOrderInterID;//  int              --采购订单主内码
        public Int64 HPOOrderEntryID;//    int            --采购订单子内码
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
@@ -116,7 +116,7 @@
        public static DataSet Sc_MouldMoveStockStepInBill(string sWhere,string Organization)
        {
            string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepInBillListDetail where è°ƒå‡ºç»„织='" + Organization + "'");
            string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepInBillListDetail where (调入组织='" + Organization + "' or è°ƒå‡ºç»„织='" + Organization + "' )");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by æ—¥æœŸ desc", "h_v_Sc_MouldMoveStockStepInBillListDetail");
@@ -161,7 +161,7 @@
                {
                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
                                                è®¾è®¡å¯¿å‘½ HDesignLife, å‰©ä½™å¯¿å‘½ HLeaveLife, ç´¯ç§¯ä½¿ç”¨å¯¿å‘½ HUseLife, åº”发数量 HQtyMust, å®žå‘数量 HQty, 
                                                å•ä»· HPrice, é‡‘额 HMoney, HWHID, è°ƒå…¥ä»“库代码 HWHCode, è°ƒå…¥ä»“库 HWHName,HSPID,
                                                å•ä»· HPrice, é‡‘额 HMoney,HStockOrgID, HOtherOrgID,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, è°ƒå…¥ä»“库代码 HWHCode, è°ƒå…¥ä»“库 HWHName,HSPID,
                                                è°ƒå…¥ä»“位代码 HSPCode, è°ƒå…¥ä»“位 HSPName,HSCWHID, è°ƒå‡ºä»“库代码 HSCWHCode, è°ƒå‡ºä»“库 HSCWHName,HSCSPID, 
                                                è°ƒå‡ºä»“位代码 HSCSPCode, è°ƒå‡ºä»“位 HSCSPName,表体备注 HRemark FROM h_v_Sc_MouldMoveStockStepInBillListDetail"), "h_v_Sc_MouldMoveStockStepInBillListDetail");
@@ -175,7 +175,7 @@
                    //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark  from Sc_MouldRepairCheckBillSub where 1 = 1 ";
                    string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
                                                è®¾è®¡å¯¿å‘½ HDesignLife, å‰©ä½™å¯¿å‘½ HLeaveLife, ç´¯ç§¯ä½¿ç”¨å¯¿å‘½ HUseLife, åº”发数量 HQtyMust, å®žå‘数量 HQty, 
                                                å•ä»· HPrice, é‡‘额 HMoney, HWHID, è°ƒå…¥ä»“库代码 HWHCode, è°ƒå…¥ä»“库 HWHName,HSPID,
                                                å•ä»· HPrice, é‡‘额 HMoney,HStockOrgID, HOtherOrgID,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName,  HWHID, è°ƒå…¥ä»“库代码 HWHCode, è°ƒå…¥ä»“库 HWHName,HSPID,
                                                è°ƒå…¥ä»“位代码 HSPCode, è°ƒå…¥ä»“位 HSPName,HSCWHID, è°ƒå‡ºä»“库代码 HSCWHCode, è°ƒå‡ºä»“库 HSCWHName,HSCSPID, 
                                                è°ƒå‡ºä»“位代码 HSCSPCode, è°ƒå‡ºä»“位 HSCSPName,表体备注 HRemark FROM h_v_Sc_MouldMoveStockStepInBillListDetail where 1 = 1 ");
                    string sql = sql1 + sqlWhere;
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
@@ -116,7 +116,7 @@
        public static DataSet Sc_MouldMoveStockStepOutBill(string sWhere, string Organization)
        {
            string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepOutBill where è°ƒå‡ºç»„织='" + Organization + "'");
            string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepOutBill where (调出组织='" + Organization + "' or è°ƒå…¥ç»„织='" + Organization + "')");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1, "h_v_Sc_MouldMoveStockStepOutBill");
@@ -161,8 +161,9 @@
                {
                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
                                                è®¾è®¡å¯¿å‘½ HDesignLife, å‰©ä½™å¯¿å‘½ HLeaveLife, ç´¯ç§¯ä½¿ç”¨å¯¿å‘½ HUseLife, åº”发数量 HQtyMust, å®žå‘数量 HQty, 
                                                å•ä»· HPrice, é‡‘额 HMoney,HWHSonID HWHID, å‘料仓库代码 HWHCode, å‘料仓库 HWHName,HSPID,
                                                ä»“位代码 HSPCode, ä»“位 HSPName,表体备注 HRemark FROM h_v_Sc_MouldMoveStockStepOutBill"), "h_v_Sc_MouldMoveStockStepOutBill");
                                                å•ä»· HPrice, é‡‘额 HMoney,HStockOrgID,调入组织代码 HStockOrgCode,调入组织 HStockOrgName, HOtherOrgID ,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, è°ƒå…¥ä»“库代码 HWHCode, è°ƒå…¥ä»“库 HWHName,HSPID,
                                                è°ƒå…¥ä»“位代码 HSPCode, è°ƒå…¥ä»“位 HSPName,HSCWHID, è°ƒå‡ºä»“库代码 HSCWHCode, è°ƒå‡ºä»“库 HSCWHName,HSCSPID,
                                                è°ƒå‡ºä»“位代码 HSCSPCode, è°ƒå‡ºä»“位 HSCSPName,表体备注 HRemark FROM h_v_Sc_MouldMoveStockStepOutBill"), "h_v_Sc_MouldMoveStockStepOutBill");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
@@ -171,12 +172,12 @@
                }
                else
                {
                    //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark  from Sc_MouldRepairCheckBillSub where 1 = 1 ";
                    string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
                                                è®¾è®¡å¯¿å‘½ HDesignLife, å‰©ä½™å¯¿å‘½ HLeaveLife, ç´¯ç§¯ä½¿ç”¨å¯¿å‘½ HUseLife, åº”发数量 HQtyMust, å®žå‘数量 HQty, 
                                                å•ä»· HPrice, é‡‘额 HMoney,HWHSonID HWHID, å‘料仓库代码 HWHCode, å‘料仓库 HWHName,HSPID,
                                                ä»“位代码 HSPCode, ä»“位 HSPName,表体备注 HRemark FROM h_v_Sc_MouldMoveStockStepOutBill where 1 = 1 ");
                                                å•ä»· HPrice, é‡‘额 HMoney,HStockOrgID,调入组织代码 HStockOrgCode,调入组织 HStockOrgName, HOtherOrgID,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, è°ƒå…¥ä»“库代码 HWHCode, è°ƒå…¥ä»“库 HWHName,HSPID,
                                                è°ƒå…¥ä»“位代码 HSPCode, è°ƒå…¥ä»“位 HSPName,HSCWHID, è°ƒå‡ºä»“库代码 HSCWHCode, è°ƒå‡ºä»“库 HSCWHName,HSCSPID,
                                                è°ƒå‡ºä»“位代码 HSCSPCode, è°ƒå‡ºä»“位 HSCSPName,表体备注 HRemark FROM h_v_Sc_MouldMoveStockStepOutBill where 1 = 1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutBill");
WebAPI/Controllers/WebAPIController.cs
@@ -371,7 +371,7 @@
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (Warehouse != "")
            {
                sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%' ) ";
                sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%'  or HUSEORGID like '%" + Warehouse + "%' ) ";
            }
            try
            {
WebAPI/DLL/ClsSc_MouldMoveStockStepInBill.cs
@@ -45,6 +45,7 @@
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HStockStyle='" + omodel.HStockStyle + "'" +
                ",HUpDater='" + omodel.HMaker+ "'" +
                ",HUpDateDate=getdate()" +
                //========================================
@@ -75,7 +76,7 @@
                      ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
                      ",HDesignLife,HLeaveLife,HUseLife" +
                      ",HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
                      ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
                      ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo,HStockOrgID,HOtherOrgID" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
@@ -83,7 +84,7 @@
                      "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
                      "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
                      "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
                      "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
                      "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "','" + oSub.HStockOrgID + "','" + oSub.HOtherOrgID + "'" +
                      ") ");
                }
                //
@@ -121,13 +122,13 @@
                //主表
                oCn.RunProc("Insert Into Sc_MouldStockBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                ",HRemark,HMaker,HMakeDate" +
                ",HRemark,HStockStyle,HMaker,HMakeDate" +
                ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
                ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
                ",HProcID"+
                ",HProcID" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ",'" + omodel.HRemark + "','" + omodel.HStockStyle.ToString() + "','" + omodel.HMaker + "',getdate()" +
                ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
                ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
                 "," + '0' +
@@ -142,7 +143,7 @@
                      ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
                      ",HDesignLife,HLeaveLife,HUseLife" +
                      ",HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
                      ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
                      ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo,HStockOrgID,HOtherOrgID" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
@@ -150,7 +151,7 @@
                      "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
                      "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
                      "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
                      "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
                      "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "','" + oSub.HStockOrgID + "','" + oSub.HOtherOrgID + "'" +
                      ") ");
                }
                //
WebAPI/DLL/ClsSc_MouldMoveStockStepOutBill.cs
@@ -45,6 +45,7 @@
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HStockStyle='" + omodel.HStockStyle + "'" +
                ",HUpDater='" + omodel.HMaker+ "'" +
                ",HUpDateDate=getdate()" +
                //========================================
@@ -72,7 +73,7 @@
                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
                      ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
                      ",HQty,HPrice,HMoney,HStockOrgID,HOtherOrgID,HWHID,HSCWHID,HSPID" +
                      ",HDesignLife,HLeaveLife,HUseLife" +
                      ",HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
                      ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
@@ -80,7 +81,7 @@
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
                      "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
                      "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HStockOrgID.ToString() + "," + oSub.HOtherOrgID.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
                      "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
                      "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
                      "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
@@ -121,13 +122,13 @@
                //主表
                oCn.RunProc("Insert Into Sc_MouldStockBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                ",HRemark,HMaker,HMakeDate" +
                ",HRemark,HStockStyle,HMaker,HMakeDate" +
                ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
                ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
                ",HProcID"+
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
                ",'" + omodel.HRemark + "','" + omodel.HStockStyle + "','" + omodel.HMaker + "',getdate()" +
                ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
                ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
                 "," + '0' +
@@ -139,7 +140,7 @@
                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
                      ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
                      ",HQty,HPrice,HMoney,HStockOrgID,HOtherOrgID,HWHID,HSCWHID,HSPID" +
                      ",HDesignLife,HLeaveLife,HUseLife" +
                      ",HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
                      ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
@@ -147,7 +148,7 @@
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
                      "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
                      "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HStockOrgID.ToString() + "," + oSub.HStockOrgID.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
                      "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
                      "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
                      "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +