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

yangle

2023-03-03 c2a9a460e38c7c196fe98a94e29e6330eac3626f

 WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs

@@ -451,11 +451,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapInHouseBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by hmainid desc", "h_v_Sc_MouldScrapInHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by 制单日期 desc", "h_v_Sc_MouldScrapInHouseBillList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by hmainid desc";
                string sql = sql1 + sWhere + "order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
            }