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

chenhaozhe

17 小时以前 e9a84a2ca945afa4693306045bc244973ebe9835

 WebAPI/Controllers/MJGL/Sc_MouldUpperBillController.cs

@@ -141,7 +141,7 @@
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.code = "1";
                objJsonResult.count = 1;  //成功！
                objJsonResult.Message = DBUtility.ClsPub.isStrNull(BeforeSave.Tables[0].Rows[0]["HRemark"]);
                objJsonResult.data = null;
@@ -171,7 +171,7 @@
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.code = "1";
                objJsonResult.count = 1;  //成功！
                objJsonResult.Message = DBUtility.ClsPub.isStrNull(AfterSave.Tables[0].Rows[0]["HRemark"]);
                objJsonResult.data = null;
@@ -1131,7 +1131,7 @@
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.code = "1";
                objJsonResult.count = 1;  //成功！
                objJsonResult.Message = DBUtility.ClsPub.isStrNull(BeforeSave.Tables[0].Rows[0]["HRemark"]);
                objJsonResult.data = null;
@@ -1161,7 +1161,7 @@
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.code = "1";
                objJsonResult.count = 1;  //成功！
                objJsonResult.Message = DBUtility.ClsPub.isStrNull(AfterSave.Tables[0].Rows[0]["HRemark"]);
                objJsonResult.data = null;
@@ -1294,7 +1294,7 @@

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = null;
                objJsonResult.Message = "";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -2013,11 +2013,16 @@

                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "当前模具未做上模单,查询失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                    ds = oCN.RunProcReturn("select * from  h_v_Gy_MouldFile_Query where 1=1" + sWhere, "h_v_Gy_MouldFile_Query");

                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "当前模具未做上模单,查询失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }                  
                }

                objJsonResult.code = "1";