智云MES后端API代码
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
1
ch
2023-02-07 30091220a09acb060269784dbee1a3ab799bc663 
 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs


@@ -336,8 +336,7 @@


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }




                //if (ds.Tables[0].Rows.Count != 0 || ds != null)


                //{


                


                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


@@ -345,15 +344,6 @@


                objJsonResult.list = columnNameList;




                return objJsonResult;


                //}


                //else


                //{


                //objJsonResult.code = "0";


                //objJsonResult.count = 0;


                //objJsonResult.Message = "无数据";


                //objJsonResult.data = null;


                //return objJsonResult;


                //}


            }


            catch (Exception ex)


            {


@@ -1485,7 +1475,7 @@


        #endregion






        #region 模具维修单保存/编辑


        #region 模具维修记录单保存/编辑


        /// <summary>


        /// 保存模具维修单


        /// </summary>


@@ -1501,6 +1491,7 @@


            string msg2 = sArray[0].ToString();


            string msg3 = sArray[1].ToString();


            string msg4 = sArray[2].ToString();


            string msg5 = sArray[3].ToString();






            string UserName = "";


@@ -1573,24 +1564,62 @@


                List<Model.ClsSb_MouldRepairWorkBillSub> ls = new List<Model.ClsSb_MouldRepairWorkBillSub>();


                ls = oListModels.getObjectByJson_Gy_MouldRepairWorkBillSub(msg3);


                int i = 0;


                foreach (Model.ClsSb_MouldRepairWorkBillSub oItemSub in ls)


                foreach (Model.ClsSb_MouldRepairWorkBillSub oItem in ls)


                {




                    i++;


                    oItemSub.HEntryID = i;


                    oItem.HEntryID = i;


                    //oItemSub.HCloseMan = "";       //行关闭


                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);


                    oItemSub.HCloseType = false;   //关闭类型


                    oItem.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);


                    oItem.HCloseType = false;   //关闭类型


                    //oItemSub.HRemark = "";         //备注


                    oItemSub.HRelationQty = 0;     //关联数量


                    oItem.HRelationQty = 0;     //关联数量


                    //oItemSub.HRelationMoney = 0;   //关联金额


                    //oItemSub.HRepairID = 0;       //维修项目


                    //oItemSub.HRepairExplanation ="";   //维修要求


                    //oItemSub.HManagerID = 0;   //负责人ID


                    //oItemSub.HMoney = 0;        //维修费用


                    oBill.DetailColl.Add(oItemSub);


                    oBill.DetailColl.Add(oItem);




                }




                //配件数据


                //按 },{来拆分数组 //去掉【和】


                msg5 = msg5.Substring(1, msg5.Length - 2);


                msg5 = msg5.Replace("\\", "");


                msg5 = msg5.Replace("\n", "");  //\n


                //msg2 = msg2.Replace("'", "’");


                List<Model.ClsSb_MouldRepairWorkBillSub_Item> ls1 = new List<Model.ClsSb_MouldRepairWorkBillSub_Item>();


                ls1 = oListModels.getObjectByJson_Gy_MouldRepairWorkBillSub_Item(msg5);


                int j = 0;


                foreach (Model.ClsSb_MouldRepairWorkBillSub_Item oItemSub in ls1)


                {




                    j++;


                    oItemSub.HEntryID = j;


                    //oItemSub.HCloseMan = "";       //行关闭


                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);


                    oItemSub.HCloseType = false;   //关闭类型


                    //oItemSub.HRemark = "";         //备注


                    oItemSub.HSourceInterID = 0;     // 源单主内码


                    oItemSub.HSourceEntryID = 0;   //源单子内码


                    //oItemSub.HSourceBillNo = "";  //源单单号


                    //oItemSub.HSourceBillType = ""; //源单类型


                    oItemSub.HRelationQty = 0;     //关联数量


                    //oItemSub.HRelationMoney = 0;   //关联金额


                    //HMaterID = "";//配件代码


                    //HUnitID = "";//单位代码


                    //HQty = "";//实际用量


                    //HQtyMust = "";//单位用量


                    //HRemark = "";//备注


                    //oItemSub.HRepairID = 0;       //维修项目


                    //oItemSub.HRepairExplanation ="";   //维修要求


                    //oItemSub.HManagerID = 0;   //负责人ID


                    //oItemSub.HMoney = 0;        //维修费用


                    oBill.DetailCol.Add(oItemSub);




                }




                //保存


                //保存完毕后处理


                bool bResult;


@@ -1652,30 +1681,27 @@


        [HttpGet]


        public object Sb_MouldRepairWorkBillListProjectDetai(string sqlWhere)


        {


            DataSet ds;


            DataSet ds, ds1;


            List<object> list = new List<object>();


            try


            {


                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();


                if (sqlWhere == null || sqlWhere.Equals(""))


                {


                    //ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark   from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");


                    ds = oCN.RunProcReturn("select HRepairID, 子维修项目代码 HRepairCode,子维修项目 HRepairName,子维修要求 HRepairExplanation,HManagerSonID HManagerID,子负责人代码 HManagerCode,子负责人 HManagerName,维修费用 HMoney,表体备注 HRemark,源单主内码 HSourceInterID,源单子内码 HSourceEntryID,源单单号 HSourceBillNo,源单类型 HSourceBillType   from h_v_Sc_MouldRepairWorkBillList_Edit", "h_v_Sc_MouldRepairWorkBillList_Edit");


                    objJsonResult.code = "0";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "获取信息成功！";


                    objJsonResult.data = ds.Tables[0];


                }


                else


                {


                    //string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark  from Sc_MouldRepairWorkBillSub where 1 = 1 ";


                    string sql1 = "select HRepairID,子维修项目代码 HRepairCode,子维修项目 HRepairName,子维修要求 HRepairExplanation,HManagerSonID HManagerID,子负责人代码 HManagerCode,子负责人 HManagerName,维修费用 HMoney,表体备注 HRemark,源单主内码 HSourceInterID,源单子内码 HSourceEntryID,源单单号 HSourceBillNo,源单类型 HSourceBillType   from h_v_Sc_MouldRepairWorkBillList_Edit where 1 = 1 ";


                    string sql = sql1 + sqlWhere;


                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList_Edit");


                    objJsonResult.code = "0";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "获取信息成功！";


                    objJsonResult.data = ds.Tables[0];


                }




                string sql = "select HRepairID,子维修项目代码 HRepairCode,子维修项目 HRepairName,子维修要求 HRepairExplanation,HManagerSonID HManagerID,子负责人代码 HManagerCode,子负责人 HManagerName,维修费用 HMoney,表体备注 HRemark,源单主内码 HSourceInterID,源单子内码 HSourceEntryID,源单单号 HSourceBillNo,源单类型 HSourceBillType   from h_v_Sc_MouldRepairWorkBillList_Edit where 1 = 1 "+ sqlWhere;


                ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList_Edit");




                string sql1 = "select 配件ID HMaterID, 配件代码 HMaterNumber,配件名称 HMaterName,规格型号 HMaterSpec,单位ID HUnitID,计量单位代码 HUnitNumber,计量单位名称 HUnitName,用量 HQty,标准用量 HQtyMust,子备注1 HRemark,规格型号 HMaterSpec  from h_v_Sc_MouldRepairWorkBillSub_Item  where 1 = 1 " + sqlWhere ;


                ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldRepairWorkBillSub_Item");




                list.Add(ds.Tables[0]);


                list.Add(ds1.Tables[0]);




                objJsonResult.code = "0";


                objJsonResult.count = 1;


                objJsonResult.Message = "获取信息成功！";


                objJsonResult.data = null;


                objJsonResult.list = list;




            }


            catch (Exception e)


            {


@@ -2689,11 +2715,11 @@


            {


                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();


                //获取保养项目编辑数据


                string sql = "select 保养项目ID HMaintainItemID, 保养项目代码 HMaintainItemNumber,保养项目 HMaintainItem,保养部位 HMaintainPart,具体要求 HClaim,负责人ID,负责人代码 HManagerNumber,负责人名称 HManagerName,子备注2 HRemark  from h_v_Sc_MouldMaintainPlanBillSub_Item where 1 = 1 " + sqlWhere + "";


                string sql = "select 保养项目ID HMaintainItemID, 保养项目代码 HMaintainItemNumber,保养项目 HMaintainItem,保养部位 HMaintainPart,具体要求 HClaim,负责人ID,负责人代码 HManagerNumber,负责人名称 HManagerName,子备注2 HRemark,HMouldMaintainRuleID,HEquipDotCheckNo  from h_v_Sc_MouldMaintainPlanBillSub_Item where 1 = 1 " + sqlWhere + "";




                ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainPlanBillSub_Item");


                //获取配件项目编辑数据


                string sql1 = "select 配件ID HMaterID, 配件代码 HMaterNumber,配件名称 HMaterName,单位ID HUnitID,计量单位代码 HUnitNumber,计量单位名称 HUnitName,用量 HQty,标准用量 HQtyMust,子备注1 HRemark  from h_v_Sc_MouldMaintainPlanBillSub  where 1 = 1 " + sqlWhere + "";


                string sql1 = "select 配件ID HMaterID, 配件代码 HMaterNumber,配件名称 HMaterName,单位ID HUnitID,计量单位代码 HUnitNumber,计量单位名称 HUnitName,用量 HQty,标准用量 HQtyMust,子备注1 HRemark,规格型号 HMaterSpec  from h_v_Sc_MouldMaintainPlanBillSub  where 1 = 1 " + sqlWhere + "";


                ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainPlanBillSub");




                list.Add(ds.Tables[0]);


@@ -3164,6 +3190,7 @@


            string msg2 = sArray[0].ToString();


            string msg3 = sArray[1].ToString();


            string msg4 = sArray[2].ToString();


            //string msg5 = sArray[3].ToString();




            string UserName = "";


            ListModels oListModels = new ListModels();


@@ -3187,6 +3214,7 @@


                {


                    //oItem.HMaker = "";


                    UserName = oItem.HMaker;  //制单人


                    oItem.HMaker = msg4;


                    oItem.HBillType = "3821";


                    oItem.HBillSubType = "3821";




@@ -3249,6 +3277,32 @@


                    oBill.DetailColl.Add(oItemSub);




                }




                ////配件项表体数据


                ////按 },{来拆分数组 //去掉【和】


                //msg5 = msg5.Substring(1, msg5.Length - 2);


                //msg5 = msg5.Replace("\\", "");


                //msg5 = msg5.Replace("\n", "");  //\n


                //                                //msg2 = msg2.Replace("'", "’");


                //List<Model.ClsSc_MouldDotCheckBillSub_Item> ls1 = new List<Model.ClsSc_MouldDotCheckBillSub_Item>();


                //ls1 = oListModels.getObjectByJson_Sc_MouldDotCheckBillSub_Item(msg5);


                //int j = 0;


                //foreach (Model.ClsSc_MouldDotCheckBillSub_Item oItemSub in ls1)


                //{




                //    j++;


                //    oItemSub.HEntryID = j;


                //    //oItemSub.HCloseMan = "";       //行关闭


                //    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);


                //    oItemSub.HCloseType = false;   //关闭类型




                //    oItemSub.HSourceInterID = 0;     // 源单主内码


                //    oItemSub.HSourceEntryID = 0;   //源单子内码




                //    oItemSub.HRelationQty = 0;     //关联数量


                //    oBill.DetailCol.Add(oItemSub);


                //}




                //保存


                //保存完毕后处理


                bool bResult;


@@ -3310,28 +3364,29 @@


        [HttpGet]


        public object Sc_MouldDotCheckBillListProjectDetai(string sqlWhere)


        {


            DataSet ds;


            DataSet ds, ds1;


            List<object> list = new List<object>();


            string Swhere = "";


            try


            {


                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();


                if (sqlWhere == null || sqlWhere.Equals(""))


                {


                    ds = oCN.RunProcReturn("select HDotCheckItemID,点检项目 HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName from h_v_Sc_MouldDotCheckBillList", "h_v_Sc_MouldDotCheckBillList");


                    objJsonResult.code = "0";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "获取信息成功！";


                    objJsonResult.data = ds.Tables[0];


                }


                else


                {


                    string sql1 = "select HDotCheckItemID,点检项目 HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName from h_v_Sc_MouldDotCheckBillList where 1 = 1 ";


                    string sql = sql1 + sqlWhere;


                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckBillList");


                    objJsonResult.code = "0";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "获取信息成功！";


                    objJsonResult.data = ds.Tables[0];


                }


                //获取点检项目编辑数据


                ds = oCN.RunProcReturn("select HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckBillSub a left join Gy_Employee e on a.HManagerID=e.HItemID where 1=1 " + sqlWhere, "Sc_MouldDotCheckBillSub");


                //获取配件项目编辑数据


                ds1 = oCN.RunProcReturn(@"select b.HMaterID,  mt.Hnumber HMaterNumber ,mt.HName HMaterName, b.HUnitID


                    ,u2.hnumber HUnitNumber,u2.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark 


                    from Sc_MouldDotCheckBillSub_Item b 


                    left join Gy_Material mt on b.HMaterID=mt.HItemID 


                    left join h_v_IF_Unit u2 on b.HUnitID=u2.HItemID  where 1=1 " + sqlWhere, "Sc_MouldDotCheckBillSub_Item");


                list.Add(ds.Tables[0]);


                list.Add(ds1.Tables[0]);




                objJsonResult.code = "0";


                objJsonResult.count = 1;


                objJsonResult.Message = "获取信息成功！";


                objJsonResult.data = null;


                objJsonResult.list = list;




            }


            catch (Exception e)


            {


@@ -3470,6 +3525,7 @@


            string msg2 = sArray[0].ToString();


            string msg3 = sArray[1].ToString();


            string msg4 = sArray[2].ToString();


            //string msg5 = sArray[3].ToString();






            string UserName = "";


@@ -3484,7 +3540,7 @@


                    objJsonResult.data = null;


                    return objJsonResult;


                }




                DBUtility.ClsPub.CurUserName = msg4;


                DAL.ClsSc_MouldDotCheckPlanBill oBill = new DAL.ClsSc_MouldDotCheckPlanBill();


                List<Model.ClsSc_MouldDotCheckPlanBillMain> lsmain = new List<Model.ClsSc_MouldDotCheckPlanBillMain>();


                msg2 = msg2.Replace("\\", "");


@@ -3494,8 +3550,8 @@


                {


                    //oItem.HMaker = "";


                    UserName = oItem.HMaker;  //制单人


                    oItem.HBillType = "3821";


                    oItem.HBillSubType = "3821";


                    oItem.HBillType = "3820";


                    oItem.HBillSubType = "3820";




                    //oItem.HInterID =0;


                    //oItem.HBillNo = "";


@@ -3523,7 +3579,7 @@


                    }


                    oBill.omodel = oItem;


                }


                //表体数据


                //点检项目表体数据


                //按 },{来拆分数组 //去掉【和】


                msg3 = msg3.Substring(1, msg3.Length - 2);


                msg3 = msg3.Replace("\\", "");


@@ -3556,6 +3612,32 @@


                    oBill.DetailColl.Add(oItemSub);




                }




                ////配件项表体数据


                ////按 },{来拆分数组 //去掉【和】


                //msg5 = msg5.Substring(1, msg5.Length - 2);


                //msg5 = msg5.Replace("\\", "");


                //msg5 = msg5.Replace("\n", "");  //\n


                //                                //msg2 = msg2.Replace("'", "’");


                //List<Model.ClsSc_MouldDotCheckPlanBillSub_Item> ls1 = new List<Model.ClsSc_MouldDotCheckPlanBillSub_Item>();


                //ls1 = oListModels.getObjectByJson_Sc_MouldDotCheckPlanBillSub_Item(msg5);


                //int j = 0;


                //foreach (Model.ClsSc_MouldDotCheckPlanBillSub_Item oItemSub in ls1)


                //{




                //    j++;


                //    oItemSub.HEntryID = j;


                //    //oItemSub.HCloseMan = "";       //行关闭


                //    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);


                //    oItemSub.HCloseType = false;   //关闭类型




                //    oItemSub.HSourceInterID = 0;     // 源单主内码


                //    oItemSub.HSourceEntryID = 0;   //源单子内码




                //    oItemSub.HRelationQty = 0;     //关联数量


                //    oBill.DetailCol.Add(oItemSub);


                //}




                //保存


                //保存完毕后处理


                bool bResult;


@@ -3617,28 +3699,29 @@


        [HttpGet]


        public object Sc_MouldDotCheckPlanBillListProjectDetai(string sqlWhere)


        {


            DataSet ds;


            DataSet ds, ds1;


            List<object> list = new List<object>();


            string Swhere = "";


            try


            {


                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();


                if (sqlWhere == null || sqlWhere.Equals(""))


                {


                    ds = oCN.RunProcReturn("select HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckPlanBillSub a left join Gy_Employee e on a.HManagerID=e.HItemID", "Sc_MouldDotCheckPlanBillSub");


                    objJsonResult.code = "0";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "获取信息成功！";


                    objJsonResult.data = ds.Tables[0];


                }


                else


                {


                    string sql1 = "select HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckPlanBillSub a left join Gy_Employee e on a.HManagerID=e.HItemID where 1 = 1 ";


                    string sql = sql1 + sqlWhere;


                    ds = oCN.RunProcReturn(sql, "Sc_MouldDotCheckPlanBillSub");


                    objJsonResult.code = "0";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "获取信息成功！";


                    objJsonResult.data = ds.Tables[0];


                }


                //获取点检项目编辑数据


                ds = oCN.RunProcReturn(@"select a.HDotCheckItemID,HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckPlanBillSub a 


                  left join Gy_Employee e on a.HManagerID=e.HItemID


                        where 1=1 " + sqlWhere, "Sc_MouldDotCheckPlanBillSub");


                ////获取配件项目编辑数据


                //ds1 = oCN.RunProcReturn(@"select b.HMaterID,  mt.Hnumber HMaterNumber ,mt.HName HMaterName, b.HUnitID


                //    ,u2.hnumber HUnitNumber,u2.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark 


                //    from Sc_MouldDotCheckPlanBillSub_Item b 


                //    left join Gy_Material mt on b.HMaterID=mt.HItemID 


                //    left join h_v_IF_Unit u2 on b.HUnitID=u2.HItemID  where 1=1 " + sqlWhere, "Sc_MouldDotCheckPlanBillSub_Item");


                list.Add(ds.Tables[0]);


                //list.Add(ds1.Tables[0]);


                objJsonResult.code = "0";


                objJsonResult.count = 1;


                objJsonResult.Message = "获取信息成功！";


                objJsonResult.data = null;


                objJsonResult.list = list;


            }


            catch (Exception e)


            {


@@ -3772,7 +3855,7 @@


                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,HPropertyID,辅助属性代码 HPropertyCode,辅助属性名称 HPropertyName,


                                            HSecUnitID, 辅助计量单位代码 HSecUnitCode, 辅助计量单位名称 HSecUnitName, HUnitID, 计量单位代码 HUnitCode, 计量单位名称 HUnitName, 批次 HBatchNo,


                                            设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife, 实收数量 HQty, 单价 HPrice, 金额 HMoney, HWHID, 收料仓库代码 HWHCode, 收料仓库名称 HWHName,


                                            HSPID, 仓位代码 HSPCode, 仓位名称 HSPName, 备注 HRemark,HStockOrgID


                                            HSPID, 仓位代码 HSPCode, 仓位名称 HSPName, 子备注 HRemark,HStockOrgID


                                            FROM h_v_Sc_MouldScrapInHouseBillList"), "h_v_Sc_MouldScrapInHouseBillList");




                }


@@ -3783,7 +3866,7 @@


                    string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,HPropertyID,辅助属性代码 HPropertyCode,辅助属性名称 HPropertyName,


                                            HSecUnitID, 辅助计量单位代码 HSecUnitCode, 辅助计量单位名称 HSecUnitName, HUnitID, 计量单位代码 HUnitCode, 计量单位名称 HUnitName, 批次 HBatchNo,


                                            设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife, 实收数量 HQty, 单价 HPrice, 金额 HMoney, HWHID, 收料仓库代码 HWHCode, 收料仓库名称 HWHName,


                                            HSPID, 仓位代码 HSPCode, 仓位名称 HSPName, 备注 HRemark,HStockOrgID


                                            HSPID, 仓位代码 HSPCode, 仓位名称 HSPName, 子备注 HRemark,HStockOrgID


                                            FROM h_v_Sc_MouldScrapInHouseBillList where 1 = 1 ");


                    string sql = sql1 + sqlWhere;


                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");


@@ -5781,7 +5864,7 @@


                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具 HMaterName,规格型号 HMaterSpec,HPropertyID,辅助属性代码 HPropertyCode,辅助属性 HPropertyName,


                                                           HSecUnitID, 辅助计量单位代码 HSecUnitCode, 辅助计量单位 HSecUnitName,换算率 HSecUnitRate,


                                                           HUnitID, 计量单位代码 HUnitCode, 计量单位 HUnitName,


                                                           设计寿命 HDesignLife, 原剩余寿命 HLeaveLife, 新剩余寿命 HNewLife,表体备注 HRemark 


                                                           设计寿命 HDesignLife, 原剩余寿命 HLeaveLife, 新剩余寿命 HNewLeaveLife,表体备注 HRemark 


                                                          FROM h_v_Sc_MouldLifeChangeBillList_Edit"), "h_v_Sc_MouldLifeChangeBillList_Edit");




                    objJsonResult.code = "0";


@@ -5796,7 +5879,7 @@


                    string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具 HMaterName,规格型号 HMaterSpec,HPropertyID,辅助属性代码 HPropertyCode,辅助属性 HPropertyName,


                                                  HSecUnitID, 辅助计量单位代码 HSecUnitCode, 辅助计量单位 HSecUnitName,换算率 HSecUnitRate,


                                                  HUnitID, 计量单位代码 HUnitCode, 计量单位 HUnitName,


                                                  设计寿命 HDesignLife, 原剩余寿命 HLeaveLife, 新剩余寿命 HNewLife,表体备注 HRemark 


                                                  设计寿命 HDesignLife, 原剩余寿命 HLeaveLife, 新剩余寿命 HNewLeaveLife,表体备注 HRemark 


                                                 FROM h_v_Sc_MouldLifeChangeBillList_Edit where 1 = 1 ");


                    string sql = sql1 + sqlWhere;


                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldLifeChangeBillList_Edit");