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

yangle

2025-04-07 e1d42208d39262728267034c020dc8bdf2268ef1

 WebAPI/Controllers/SellOutController.cs

@@ -395,7 +395,7 @@
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                objJsonResult.data = oBar;
                objJsonResult.data = WebSoBar;
                return objJsonResult;
            }
        }
@@ -605,7 +605,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -613,7 +613,8 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                    //objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }