~yxj/MES-WEB-API.git

parent: e73cecaa | 补丁 | 提交 | ignore whitespace

王垚

2021-10-14 b14d014e39c97d339ee83c0e272afd4e7a6ee709

分布式调入调出

8个文件已修改

	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 + "'" +

			@@ -18,5 +18,6 @@
			public string HInnerBillNo;// varchar(50) --åé¨åæ®å·
			public string HRemark; //å å·¥è¦æ±
			public bool HRedBlueFlag;// bit --çº¢èå
			public string HStockStyle;// bit --çº¢èå
			}
			}

			@@ -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 --éè´è®¢åååç

			@@ -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;

			@@ -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
			{

			@@ -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 + "'" +
			") ");
			}
			//