巡检入库检修改

xwt

3 天以前 b289e477c13910c2814d89915342a7edabee5a8d

 StandardInterface/MESApplication/Controllers/QC/XJController.cs

@@ -15,7 +15,7 @@
    [HttpPost("getAll")]
    public ResponseResult getAll([FromBody] JObject data)
    {
        var modify1Flag = Convert.ToInt32(data["modify1Flag"].ToString());
        var modify1Flag = Convert.ToInt32(data["modify1Flag"]?.ToString() ?? "0");
        try
        {
            dynamic resultInfos = new ExpandoObject();
@@ -88,13 +88,36 @@
    [HttpPost("getDaa001")]
    public ResponseResult getDaa001([FromBody] JObject data)
    {
        var daa020 = data["daa020"].ToString();
        var item = data["item"].ToString();
        var daa020 = data["daa020"]?.ToString() ?? "";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new XJService().getDaa001(daa020, item);
            var tbBillList = new XJService().getDaa001(daa020);
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     获取工单详细信息（包含物料信息）
    /// </summary>
    [HttpPost("getWorkOrderWithItem")]
    public ResponseResult getWorkOrderWithItem([FromBody] JObject data)
    {
        var daa020 = data["daa020"]?.ToString() ?? "";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList = new XJService().getWorkOrderWithItem(daa020);
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {
@@ -116,7 +139,7 @@
    [HttpPost("getBoardItem")]
    public ResponseResult getBoardItem([FromBody] JObject data)
    {
        var lineNo = data["lineNo"].ToString();
        var lineNo = data["lineNo"]?.ToString() ?? "";
        try
        {
            dynamic resultInfos = new ExpandoObject();
@@ -142,7 +165,7 @@
    [HttpPost("getItem")]
    public ResponseResult getItem([FromBody] JObject data)
    {
        var daa001 = data["daa001"].ToString();
        var daa001 = data["daa001"]?.ToString() ?? "";
        try
        {
            dynamic resultInfos = new ExpandoObject();
@@ -166,7 +189,7 @@
    [HttpPost("setJYItem")]
    public ResponseResult setJYItem([FromBody] JObject data)
    {
        var itemNo = data["itemNo"].ToString();
        var itemNo = data["itemNo"]?.ToString() ?? "";
        try
        {
            dynamic resultInfos = new ExpandoObject();
@@ -193,9 +216,12 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new XJService().save(xjDto);
            resultInfos.tbBillList = tbBillList;
            var result = new XJService().save(xjDto);
            
            // 返回完整的XJDto对象，包含更新后的items
            resultInfos.tbBillList = result;
            resultInfos.xjDto = xjDto; // 包含完整的检验项目信息
            
            return new ResponseResult
            {
                status = 0,
@@ -529,8 +555,8 @@
        try
        {
            var id = Convert.ToDecimal(data["id"]);
            var departmentId = data["departmentId"].ToString();
            var departmentName = data["departmentName"].ToString();
                    var departmentId = data["departmentId"]?.ToString() ?? "";
        var departmentName = data["departmentName"]?.ToString() ?? "";

            dynamic resultInfos = new ExpandoObject();
            var result = new XJService().SaveDepartmentSelection(id, departmentId, departmentName);
@@ -556,7 +582,7 @@
    {
        try
        {
            var departmentId = data["departmentId"].ToString();
            var departmentId = data["departmentId"]?.ToString() ?? "";

            dynamic resultInfos = new ExpandoObject();
            var tbBillList = new XJService().GetLinesByDepartment(departmentId);