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

yusijie

2026-04-07 fc54037c44b84e9782f06f3bedf37ae97b93d97e

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -20,6 +20,7 @@

namespace WebAPI.Controllers
{
   
    public class WEBSController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
@@ -46,6 +47,7 @@
        /// <returns></returns>
        [Route("WEBSController/GetUser_Json")]
        [HttpGet]
        [AllowAnonymous]
        public object GetUser_Json(string HUserNumber, string HPassWord, Int64 HStockOrgID, string HStockOrgName)
        {
            try
@@ -91,11 +93,23 @@
                        return objJsonResult;
                    }

                    if(!oSystemParameter.ShowBill(ref DBUtility.ClsPub.sErrInfo))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "登录异常！Token ç”Ÿæˆå¼‚常，无法获取公司信息！";
                    }

                    string tokenStr = JWTHelper.GenerateToken(ds.Tables[0].Rows[0]["Czybm"].ToString(), ds.Tables[0].Rows[0]["Czymc"].ToString());


                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "登录成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                    JObject jobjJsonResult = JObject.FromObject(objJsonResult);
                    jobjJsonResult["token"] = tokenStr;
                    return jobjJsonResult;
                }
            }
            catch (Exception e)
@@ -1633,7 +1647,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "更新条码出入库缓存列表条码记录失败！" + e.ToString();
                objJsonResult.Message = "更新条码出入库缓存列表条码记录失败！" + e.Message.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -3020,6 +3034,7 @@
        /// <returns></returns>
        [Route("WEBSController/set_SavePOStockInBill_Json")]
        [HttpPost]
        [Permission(HModName = "Kf_POStockInBill", Operate = "_Edit")]
        public object set_SavePOStockInBill_Json([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();