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

yangle

2022-08-08 8560519c52cede92c33b89184f39844934c71de4

 WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs

@@ -99,6 +99,7 @@
                }

                ds = Sc_GetMouldProdMoveBill(sWhere,Organization);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
@@ -120,11 +121,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdMoveBillList where (调入组织='" + Organization + "' or 调出组织='" + Organization + "')");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 日期 desc", "h_v_Sc_MouldProdMoveBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldProdMoveBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by 日期 desc";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdMoveBillList");
            }

@@ -322,7 +323,7 @@
                }
                if (bResult)
                {
                    string sql = $"exec h_p_Sc_MouldChangeFileStatus  'in','{oBill.omodel.HInterID.ToString()}' ";
                    string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus  'in','{oBill.omodel.HInterID.ToString()}' ") ;
                    oCn.RunProc(sql);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;