Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

hao

2025-09-18 c99834caa934a5c43824dfe459601e8470d82fc9

 StandardInterface/MESApplication/Controllers/QC/SJController.cs

@@ -41,14 +41,14 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new SJService().getPage(queryObj);
            resultInfos.tbBillList = tbBillList;
            var (items, totalCount) = new SJService().getPage(queryObj);
            resultInfos.tbBillList = items;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
                data = resultInfos,
                TotalCount = totalCount
            };
        }
        catch (Exception ex)
@@ -319,4 +319,56 @@
            return ResponseResult.ResponseError(ex);
        }
    }

    //刷新检验项目
    [HttpPost("GenUpdate")]
    public ResponseResult GenUpdate([FromBody] JObject data)
    {
        try
        {
            decimal? id = data["id"]?.ToObject<decimal>();
            string? no = data["no"]?.ToString();
            string? user = data["user"]?.ToString();
            decimal? mnum = data["mnum"]?.ToObject<decimal?>();
            string? dnum = data["dnum"]?.ToString();

            var (result, message) = new SJService().GenUpdate(id, no, user, mnum, dnum);

            dynamic resultInfos = new ExpandoObject();
            resultInfos.result = result;
            resultInfos.message = message;

            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    //提交检验
    [HttpPost("SjSubmit")]
    public ResponseResult SjSubmit([FromBody] SJDto sjDto)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList = new SJService().SjSubmit(sjDto);
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
}