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

zzr99

2021-11-05 e0f1e38e04ca7debc900e0e91d87b6b5b67c6a76

 WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs

File was renamed from WebAPI/Controllers/Éú²ú¹ÜÀí/QC_LastPieceCheckBillController.cs
@@ -22,7 +22,52 @@
        DataSet ds1;


        #region[编辑时获取表头数据]
        [Route("QC_LastPieceCheckBill/QC_LastPieceCheckBillListCheckDetail")]
        [HttpGet]
        public ApiResult<DataSet> QC_LastPieceCheckBillListCheckDetail(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 h_v_QC_LastPieceCheckBillListDetail  where hmainid= " + HID + " ", "h_v_QC_LastPieceCheckBillListDetail");
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在结算单号" };

            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        #endregion

        #region[编辑时获取表体数据]
        [Route("QC_LastPieceCheckBill/QC_LastPieceCheckBillListProjectDetai")]
        [HttpGet]
        public object QC_LastPieceCheckBillListProjectDetai(string sqlWhere)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql1 = "SELECT æ—¥æœŸ,单据号,备注,产品内码, äº§å“åç§°" +
                    ", äº§å“åž‹å·, æ£€éªŒå‘˜ä»£ç , æ£€éªŒå‘˜åç§°, åˆ¶å•äºº, åˆ¶å•æ—¥æœŸ" +
                    ", å®¡æ ¸äºº, å®¡æ ¸æ—¥æœŸ, ä¿®æ”¹äºº, ä¿®æ”¹æ—¥æœŸ, å…³é—­äºº, å…³é—­æ—¥æœŸ FROM h_v_QC_LastPieceCheckBillListDetail where 1 = 1 ";
                string sql = sql1 + sqlWhere;
                ds = oCN.RunProcReturn(sql, "h_v_QC_LastPieceCheckBillListDetail");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.data = ds.Tables[0];
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion

        /// <summary>
        /// æ–°å¢žå•æ®-保存按钮
@@ -196,7 +241,36 @@
            objJsonResult.data = null;
            return objJsonResult;
        }

        /// <summary>
        ///删除功能
        /// </summary>
        /// <returns></returns>
        [Route("QC_LastPieceCheckBill/DeltetLastPieceCheckBill")]
        [HttpGet]
        public object DeltetLastPieceCheckBill(string HInterID)
        {
            try
            {
                oCN.BeginTran();
                oCN.RunProc("Delete From QC_LastPieceCheckBillMain where HInterID = " + HInterID);
                oCN.RunProc("Delete From QC_LastPieceCheckBillSub where HInterID = " + HInterID);
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// è¿”回产品入库检验单列表
        ///参数：string sql。
@@ -210,13 +284,13 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from [h_v_QC_LastPieceCheckBillList] " + sWhere, "[h_v_QC_LastPieceCheckBillList]");
                    ds = oCN.RunProcReturn("select * from h_v_QC_LastPieceCheckBillListDetail " + sWhere, "h_v_QC_LastPieceCheckBillListDetail");
                }
                else
                {
                    string sql1 = "select * from [h_v_QC_LastPieceCheckBillList] where 1 = 1 ";
                    string sql1 = "select * from h_v_QC_LastPieceCheckBillListDetail where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "[h_v_QC_LastPieceCheckBillList]");
                    ds = oCN.RunProcReturn(sql, "h_v_QC_LastPieceCheckBillListDetail");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {