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

yangle

2023-03-03 c2a9a460e38c7c196fe98a94e29e6330eac3626f

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÑéÊÕÈë¿â/Kf_StepFoldinBillController.cs

@@ -15,7 +15,7 @@
        public DataSet ds = new DataSet();
        public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

        #region å§”外加工出库单
        #region åˆ†æ­¥å¼è°ƒå…¥å• æŸ¥è¯¢

        [Route("Kf_StepFoldinBill/GetStepFoldinBillList")]
        [HttpGet]
@@ -23,34 +23,43 @@
        {
            try
            {
                //判断权限(略)
                
                string sql1 = string.Format("select * from h_v_Kf_MoveStockStepInBillList where (调入组织='" + Organization + "')");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCn.RunProcReturn(sql1 + " order by æ—¥æœŸ desc", "h_v_Kf_MoveStockStepInBillList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by æ—¥æœŸ desc";
                    ds = oCn.RunProcReturn(sql, "h_v_Kf_MoveStockStepInBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                //判断查询权限
                if (!DBUtility.ClsPub.Security_Log("Fb_StepFoldinBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.Message = "无查询权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql1 = string.Format("select * from h_v_Kf_MoveStockStepInBillList where (调入组织='" + Organization + "')");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCn.RunProcReturn(sql1 + " order by hmainid desc", "h_v_Kf_MoveStockStepInBillList");
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                    string sql = sql1 + sWhere + " order by hmainid desc";
                    ds = oCn.RunProcReturn(sql, "h_v_Kf_MoveStockStepInBillList");
                }

                //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 ex)
            {