WebAPI/Controllers/Sc_MouldOtherInBillController.cs
@@ -83,12 +83,21 @@
        [Route("Sc_MouldOtherInBill/GetMouldOtherInBill")]
        [HttpGet]
        public object GetMouldOtherInBill(string sWhere)
        public object GetMouldOtherInBill(string sWhere,string user, string Organization)
        {
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBillList", 1, true, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = Sc_MouldOtherInBill(sWhere);
                ds = Sc_MouldOtherInBill(sWhere, Organization);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功!";
@@ -105,16 +114,16 @@
            }
        }
        public static DataSet Sc_MouldOtherInBill(string sWhere)
        public static DataSet Sc_MouldOtherInBill(string sWhere, string Organization)
        {
            string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherInBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldOtherInBillList ", "h_v_Sc_MouldOtherInBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 日期 desc", "h_v_Sc_MouldOtherInBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldOtherInBillList where 1 = 1 ";
                string sql = sql1 + sWhere;
                string sql = sql1 + sWhere+ "order by 日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherInBillList");
            }
@@ -122,16 +131,16 @@
        #endregion
        #region[器具分布式调出单编辑时获取表头数据]
        #region[器具其他入库单编辑时获取表头数据]
        [Route("Sc_MouldOtherInBill/Sc_MouldOtherInBillListCheckDetai")]
        [HttpGet]
        public ApiResult<DataSet> Sc_MouldOtherInBillListCheckDetai(string HID)
        public ApiResult<DataSet> Sc_MouldOtherInBillListCheckDetai(string HID)
        {
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn("select top 1 * from    where hmainid= " + HID + " ", "h_v_Sc_MouldOtherInBillList");
             var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldOtherInBillList  where hmainid= " + HID + " ", "h_v_Sc_MouldOtherInBillList");
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在退库单号" };
@@ -139,7 +148,7 @@
        }
        #endregion
        #region[器具分布式调出单编辑时获取表体数据]
        #region[器具其他入库单编辑时获取表体数据]
        [Route("Sc_MouldOtherInBill/Sc_MouldOtherInBillListProjectDetai")]
        [HttpGet]
        public object Sc_MouldOtherInBillListProjectDetai(string sqlWhere)
@@ -188,7 +197,7 @@
        }
        #endregion
        #region 器具分布式调出单保存/编辑
        #region 器具其他入库单保存/编辑
        /// <summary>
        /// 保存模具领用单
        /// </summary>
@@ -203,12 +212,22 @@
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            string UserName = "";
            ListModels oListModels = new ListModels();
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBill_Edit", 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DLL.ClsSc_MouldOtherInBill oBill = new DLL.ClsSc_MouldOtherInBill();
                List<Model.ClsSc_MouldOtherInBillMain> lsmain = new List<Model.ClsSc_MouldOtherInBillMain>();
                msg2 = msg2.Replace("\\", "");
@@ -323,24 +342,24 @@
        }
        #endregion
        #region [器具分布式调入单删除功能]
        #region [器具其他入库单删除功能]
        /// <summary>
        /// 模具处理领用单删除功能
        /// </summary>
        /// <returns></returns>
        [Route("Sc_MouldOtherInBill/DeltetMouldOtherInBill")]
        [HttpGet]
        public object DeltetMouldOtherInBill(string HInterID)
        public object DeltetMouldOtherInBill(string HInterID,string user)
        {
            //编辑权限
            //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "无删除权限!";
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherOutBill_Delete", 1, true, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无删除权限!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            Int64 lngBillKey = 0;