代码提交

zjh

2025-04-26 f8187896eeafc43457b81f4d08a1f0821bf51f1c

代码提交

 StandardPda/MES.Service/service/QC/LljService.cs

@@ -687,6 +687,17 @@
        return rkjDto;
    }


    public DataTable getFromInfo(string BarCode)
    {
        OracleSQLHelper SQLHelper = new();
        var sql = string.Format(@"select b.ID,b.LOT_NO,b.RELEASE_NO,b.FSUBMIT from MES_INV_ITEM_BARCODES A
                                    left join MES_QA_ITEMS_DETECT_01 B on A.BILL_NO=b.LOT_NO and A.ITEM_ID=b.ITEM_ID
                                    where ITEM_BARCODE='"+ BarCode + "'");
        return SQLHelper.ExecuteQuery(sql);
    }


    public int UpdateQSItemDetail(MesQaItemsDetectDetail12 detail)
    {
        var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>

 StandardPda/MESApplication/Controllers/Base/LoginController.cs

@@ -1,9 +1,14 @@
using MES.Service.Dto.@base;
using Masuit.Tools;
using Masuit.Tools.Database;
using MES.Service.Dto.@base;
using MES.Service.service;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Dynamic;
using static MES.Service.service.QC.LljService;
using Newtonsoft.Json;

namespace MESApplication.Controllers.Base;

@@ -105,4 +110,42 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    public class Root
    { 
        public string version { get; set; }
      
        public string apkUrl { get; set; }
    }

    /// <summary>
    ///    获取App最新版本信息
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("getAppUpgradeInfo")]
    public async Task<ResponseResult> getAppUpgradeInfo()
    {
        
        try
        {  
            HttpClient client = new();
    var requestUrl = $"http://192.168.1.104:8081/UpgradeInformation.json";
            var response = await client.GetAsync(requestUrl);
            response.EnsureSuccessStatusCode(); // 检查HTTP状态码
            var responseContent = await response.Content.ReadAsStringAsync();
            var a= JsonConvert.DeserializeObject<Root>(responseContent);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = a
            };

        }
        catch (Exception ex)
        {
            return null;
        }
    }

}

 StandardPda/MESApplication/Controllers/QC/LljController.cs

@@ -190,6 +190,37 @@
    }


    /// <summary>
    /// 通过条码获取送检单信息
    /// </summary>
    /// <param name="data"></param>
    /// <returns></returns>
    [HttpPost("getFromInfo")]
    public ResponseResult getFromInfo([FromBody] JObject data)
    {
        var id = data["Barcode"]?.ToString();

        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new LljService().getFromInfo(id);
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }



    [HttpPost("SetQSItemDetail")]
    public ResponseResult SetQSItemDetail(
        [FromBody] MesQaItemsDetectDetail12 detail)