Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2024-12-17 feec6d0e153a8435ead4383a2a8f988b47003191

 WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs

@@ -71,6 +71,7 @@

        /// <summary>
        /// 新增单据-保存按钮
        /// 产品入库检验单列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
@@ -104,8 +105,19 @@
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string user = sArray[2].ToString();
            try
            {
                //判断权限
                if (!DBUtility.ClsPub.Security_Log("QC_POStockInCheckBill_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                msg2 = "[" + msg2.ToString() + "]";
                List<QC_LastPieceCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_LastPieceCheckBillMain>>(msg2);
                string BillType = "7507";
@@ -243,14 +255,25 @@
        }
        /// <summary>
        ///删除功能
        ///产品入库检验单
        /// </summary>
        /// <returns></returns>
        [Route("QC_LastPieceCheckBill/DeltetLastPieceCheckBill")]
        [HttpGet]
        public object DeltetLastPieceCheckBill(string HInterID)
        public object DeltetLastPieceCheckBill(string HInterID,string  user)
        {
            try
            {
            { 
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("QC_POStockInCheckBill_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();
                oCN.RunProc("Delete From QC_LastPieceCheckBillMain where HInterID = " + HInterID);
                oCN.RunProc("Delete From QC_LastPieceCheckBillSub where HInterID = " + HInterID);
@@ -278,36 +301,47 @@
        /// </summary>
        [Route("QC_LastPieceCheckBill/GetLastPieceCheckBillList")]
        [HttpGet]
        public object GetLastPieceCheckBillList(string sWhere)
        public object GetLastPieceCheckBillList(string sWhere,string user)
        {
            try
            {
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("QC_POStockInCheckBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_QC_LastPieceCheckBillListDetail " + sWhere, "h_v_QC_LastPieceCheckBillListDetail");
                    ds = oCN.RunProcReturn("select * from h_v_QC_LastPieceCheckBillListDetail order by hmainid desc ", "h_v_QC_LastPieceCheckBillListDetail");
                }
                else
                {
                    string sql1 = "select * from h_v_QC_LastPieceCheckBillListDetail where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere+ " order by hmainid desc ";
                    ds = oCN.RunProcReturn(sql, "h_v_QC_LastPieceCheckBillListDetail");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {