nothing

王 垚

2021-11-17 6a14f78a188e99230efe9a004f0c9b73a70aaa52

nothing

 WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs

@@ -227,9 +227,9 @@
            else
            {
                string sql1 = "select * from h_v_Sc_MouldMaintain where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by 日期 desc";
                string sql = sql1 + sWhere + "order by 日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMaintain");
              

            }
            //return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainBillList ", "h_v_Sc_MouldMaintainBillList");
        }
@@ -329,7 +329,7 @@

        public static DataSet Sc_MouldDotCheckBillList_s(string sWhere)
        {
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 "+sWhere+ "order by 日期 desc", "h_v_Sc_MouldDotCheckBillList");
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 " + sWhere + "order by 日期 desc", "h_v_Sc_MouldDotCheckBillList");
        }
        #endregion

@@ -468,12 +468,12 @@
            DataSet ds;
            if (sWhere == null || sWhere.Equals(""))
            {
               ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList order by 日期 desc" + sWhere, "h_v_Sc_MouldConkBookBillList");
                ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList order by 日期 desc" + sWhere, "h_v_Sc_MouldConkBookBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldConkBookBillList where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by 日期 desc";
                string sql = sql1 + sWhere + "order by 日期 desc";
                ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldConkBookBillList");
            }
            return ds;
@@ -523,7 +523,7 @@
            else
            {
                string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by 日期 desc";
                string sql = sql1 + sWhere + "order by 日期 desc";
                ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit");
            }
            return ds;
@@ -639,7 +639,7 @@
            else
            {
                string sql1 = "select * from h_v_Sc_MouldRepairWorkBillList where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by 日期 desc";
                string sql = sql1 + sWhere + "order by 日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList");
            }
        }
@@ -802,24 +802,12 @@
        {
            try
            {

                ds = Sc_GetMateOutBillList(sWhere);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception ex)
            {
@@ -1506,7 +1494,7 @@
        public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "Sb_MouldRepairWorkBill_Check";
            DBUtility.ClsPub.CurUserName=CurUserName;
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
                //审核权限
@@ -1580,7 +1568,7 @@
                    return objJsonResult;
                }
                if (IsAudit == 0) //审核提交
                {  
                {
                    //审核提交
                    if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
@@ -2576,12 +2564,12 @@
                    //oItemSub.HSourceBillNo = "";  //源单单号
                    //oItemSub.HSourceBillType = ""; //源单类型
                    Sub.HRelationQty = 0;     //关联数量
                                                   //oItemSub.HRelationMoney = 0;   //关联金额
                                                   //HMaterID = "";//配件代码
                                                   //HUnitID = "";//单位代码
                                                   //HQty = "";//实际用量
                                                   //HQtyMust = "";//单位用量
                                                   //HRemark = "";//备注
                                              //oItemSub.HRelationMoney = 0;   //关联金额
                                              //HMaterID = "";//配件代码
                                              //HUnitID = "";//单位代码
                                              //HQty = "";//实际用量
                                              //HQtyMust = "";//单位用量
                                              //HRemark = "";//备注

                    oBill.DetailColl.Add(Sub);

@@ -2687,7 +2675,7 @@
        public object Sc_MouldMaintainBillListProjectDetaiNew(string HInterID)
        {

            DataSet ds,ds1;
            DataSet ds, ds1;
            List<object> list = new List<object>();
            string Swhere = "";
            try
@@ -2696,7 +2684,7 @@
                {
                    Swhere = " and hmainid='" + HInterID + "'";
                }
                else 
                else
                {
                    Swhere = HInterID;
                }
@@ -2704,7 +2692,7 @@
                //获取保养项目编辑数据
                string sql = "select HMaintainItemID, 保养项目代码 HMaintainItemNumber,保养项目名称 HMaintainItem,保养部位 HMaintainPart,具体要求 HClaim,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName,表体备注 HRemark  from h_v_Sc_MouldMaintainBillListItem where 1 = 1 " + Swhere + "";
                ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainBillListItem");
               //获取配件项目编辑数据
                //获取配件项目编辑数据
                string sql1 = "select HMaterID, 配件代码 HMaterNumber,配件名称 HMaterName,规格型号 HMaterSpec,HUnitID,单位代码 HUnitNumber,单位名称 HUnitName,实际用量 HQty,标准用量 HQtyMust,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName,表体备注 HRemark  from h_v_Sc_MouldMaintainBillList where 1 = 1 " + Swhere + "";
                ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainBillList");
                list.Add(ds.Tables[0]);
@@ -2726,11 +2714,11 @@
        #endregion

        #region [模具保养记录表删除功能]
            /// <summary>
            /// 模具维修单删除功能
            /// </summary>
            /// <returns></returns>
            [Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
        /// <summary>
        /// 模具维修单删除功能
        /// </summary>
        /// <returns></returns>
        [Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
        [HttpGet]
        public object DeltetSc_MouldMaintainBill(string HInterID)
        {
@@ -3679,7 +3667,7 @@
                    oBill.omodel = oItem;
                }
                //子表体数据
 

                List<Models.ClsSc_MouldStockBillSub> ls = new List<Models.ClsSc_MouldStockBillSub>();
                ls = oListModels.getObjectByJson_Gy_MouldScrapInHouseBillSub(msg2);
                int i = 0;
@@ -3757,7 +3745,7 @@

        [Route("Sc_MouldScrapOutHouseBill/GetMouldScrapOutHouseBill")]
        [HttpGet]
        public object GetMouldScrapOutHouseBill(string sWhere,string user, string Organization)
        public object GetMouldScrapOutHouseBill(string sWhere, string user, string Organization)
        {
            try
            {
@@ -3771,7 +3759,7 @@
                    return objJsonResult;
                }

                ds = Sc_GetMouldScrapOutHouseBill(sWhere,Organization);
                ds = Sc_GetMouldScrapOutHouseBill(sWhere, Organization);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
@@ -3793,11 +3781,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapOutHouseBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 日期 desc", "h_v_Sc_MouldScrapOutHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 日期 desc", "h_v_Sc_MouldScrapOutHouseBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by 日期 desc";
                string sql = sql1 + sWhere + "order by 日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapOutHouseBillList");
            }
        }
@@ -3838,7 +3826,7 @@
                                                  HSecUnitID, 辅助计量单位代码 HSecUnitCode, 辅助计量单位名称 HSecUnitName, 换算率 HSecUnitRate, HUnitID, 计量单位代码 HUnitCode, 计量单位名称 HUnitName, 批次 HBatchNo,
                                                  设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife, 实发数量 HQty, 单价 HPrice, 金额 HMoney, HWHID, 发货仓库代码 HWHCode, 发货仓库名称 HWHName,
                                                  HSPID, 仓位代码 HSPCode, 仓位名称 HSPName, 备注 HRemark,HStockOrgID FROM h_v_Sc_MouldScrapOutHouseBillList"), "h_v_Sc_MouldScrapOutHouseBillList");
                    

                }
                else
                {
@@ -4027,7 +4015,7 @@
        /// <returns></returns>
        [Route("Sc_MouldScrapOutHouseBill/DeltetMouldScrapOutHouseBill")]
        [HttpGet]
        public object DeltetMouldScrapOutHouseBill(string HInterID,string user)
        public object DeltetMouldScrapOutHouseBill(string HInterID, string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, true, user))
@@ -4331,7 +4319,7 @@

        [Route("Sc_MouldProdBackBill/GetMouldProdBackBill")]
        [HttpGet]
        public object GetMouldProdBackBill(string sWhere,string user, string Organization)
        public object GetMouldProdBackBill(string sWhere, string user, string Organization)
        {
            try
            {
@@ -4344,7 +4332,7 @@
                    return objJsonResult;
                }

                ds = Sc_GetMouldProdBackBill(sWhere,Organization);
                ds = Sc_GetMouldProdBackBill(sWhere, Organization);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
@@ -4361,7 +4349,7 @@
            }
        }

        public static DataSet Sc_GetMouldProdBackBill(string sWhere,string Organization)
        public static DataSet Sc_GetMouldProdBackBill(string sWhere, string Organization)
        {
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdBackBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
@@ -4370,7 +4358,7 @@
            }
            else
            {
                string sql = sql1 + sWhere+ "order by 日期 desc";
                string sql = sql1 + sWhere + "order by 日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList");
            }

@@ -4600,7 +4588,7 @@
        /// <returns></returns>
        [Route("Sc_MouldProdBackBill/DeltetMouldProdBackBill")]
        [HttpGet]
        public object DeltetMouldProdBackBill(string HInterID,string user)
        public object DeltetMouldProdBackBill(string HInterID, string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, user))
@@ -4764,7 +4752,7 @@

        [Route("Sc_MouldProdOutBill/GetMouldProdOutBill")]
        [HttpGet]
        public object GetMouldProdOutBill(string sWhere, string user,string Organization)
        public object GetMouldProdOutBill(string sWhere, string user, string Organization)
        {
            try
            {
@@ -4777,7 +4765,7 @@
                    return objJsonResult;
                }

                ds = Sc_GetMouldProdOutBill(sWhere,Organization);
                ds = Sc_GetMouldProdOutBill(sWhere, Organization);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
@@ -4799,11 +4787,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdOutHouseBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 日期 desc", "h_v_Sc_MouldProdOutHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 日期 desc", "h_v_Sc_MouldProdOutHouseBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by 日期 desc";
                string sql = sql1 + sWhere + "order by 日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdOutHouseBillList");
            }

@@ -4896,7 +4884,7 @@
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string msg4= sArray[2].ToString();
            string msg4 = sArray[2].ToString();


            string UserName = "";
@@ -5227,7 +5215,7 @@
            else
            {
                string sql1 = "select * from h_v_Sc_MouldLifeChangeBillList where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by 日期 desc";
                string sql = sql1 + sWhere + "order by 日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldLifeChangeBillList");
            }