1.异常处置单推送OA 2.现场管理新增现场收料的条码查询功能

南骏 池

2025-04-30 004a418bd6674d62d06587030e29897ce430f0f2

1.异常处置单推送OA
2.现场管理新增现场收料的条码查询功能

 Controllers/Wom/WomdaaController.cs

@@ -425,5 +425,30 @@
        }
    }

    //GetItemsXcsl
    /// <summary>
    ///     根据工单号获取代领物料明细
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetItemsXcsl")]
    public ResponseResult GetItemsXcsl(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetItemsXcsl(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    #endregion
}

 service/QC/OaApi.cs

@@ -83,14 +83,14 @@
            {"requestName", $"IQC异常处置单流程-{DateTime.Now:yyyyMMddHHmmss}"},
            {"workflowId", "379"},
            //{"otherParams", BuildOtherParams()},
            //{"detailData", BuildDetailData(queryObj)}
            {"detailData", BuildDetailData(queryObj)}
        };
    }
    

    private JArray createbhgpqxmszp(dynamic files)
    {
        var attachments = new JArray();
        

        foreach (var file in files ?? Enumerable.Empty<dynamic>())
        {
            attachments.Add(new JObject
@@ -100,7 +100,7 @@
                ["fileName"] = file.FileName?.ToString() ?? "未命名文件"
            });
        }
        

        return attachments;
    }
    private JArray BuildMainData(dynamic queryObj)
@@ -112,7 +112,7 @@
    C.item_name AS jzmcwlmc,
    D.supp_name AS khgys,
    B.bill_no   AS dhdhmes,
    B.remark    AS bhgpqxms
    A.remark    AS bhgpqxms
FROM Mes_QC_Exceptional A
LEFT JOIN MES_INV_ITEM_ARN B ON A.aboutGuid = b.guid
LEFT JOIN MES_ITEMS C ON A.itemId = c.item_id
@@ -288,30 +288,54 @@
        return array;
    }

    private JArray BuildDetailData(JObject query)
    private JArray BuildDetailData(dynamic queryObj)
    {
        // 示例明细数据，根据实际业务调整
        // 使用参数化查询获取明细数据
        const string mainSql = @"select ROW_NUMBER() over (ORDER BY Jy_Date) AS xh,releaseNo AS jydh, Jy_Date AS jydrq, batchQty as sjsl,
               chouQty AS cys, badQty AS bls, badProb AS bll 
            from [Mes_QC_Exceptional_Detail] 
            WHERE pGuid = @guid";
    
        var details = Db.Ado.SqlQuery<dynamic>(mainSql, new { guid = queryObj.qcczdGuid });
    
        var tableRecords = new JArray();
        
        // 遍历每条明细数据
        foreach (var record in details ?? Enumerable.Empty<dynamic>())
        {
            // 修正字段类型转换（数值类型去除字符串包裹）
            var fields = new JArray
            {
                //new JObject { ["fieldName"] = "xh", ["fieldValue"] = record.xh?.ToString() ?? "" },
                new JObject { ["fieldName"] = "jydh", ["fieldValue"] = record.jydh?.ToString() ?? "" },
                new JObject { 
                    ["fieldName"] = "jydrq", 
                    // 格式化为"yyyy-MM-dd"字符串
                    ["fieldValue"] = (record.jydrq != null 
                        ? Convert.ToDateTime(record.jydrq).ToString("yyyy-MM-dd ") 
                        : DateTime.Now.ToString("yyyy-MM-dd"))
                },
                // 数值字段保持数字类型而非字符串
                // 修正数值类型转换方式
                new JObject { ["fieldName"] = "sjsl", ["fieldValue"] = (float)(record.sjsl ?? 0m) },
                new JObject { ["fieldName"] = "cys", ["fieldValue"] = (float)(record.cys ?? 0) },
                new JObject { ["fieldName"] = "bls", ["fieldValue"] = (float)(record.bls ?? 0) },
                new JObject { ["fieldName"] = "bll", ["fieldValue"] = 1 }
            };
    
            tableRecords.Add(new JObject
            {
                ["recordOrder"] = 0,  // 实际业务中可能需要根据行号设置
                ["workflowRequestTableFields"] = fields
            });
        }
    
        return new JArray
        {
            new JObject
            {
                ["tableDBName"] = "formtable_main_33_dt1",
                ["workflowRequestTableRecords"] = new JArray
                {
                    new JObject
                    {
                        ["recordOrder"] = "0",
                        ["workflowRequestTableFields"] = new JArray
                        {
                            new JObject { ["fieldName"] = "jydh", ["fieldValue"] = query[""] ?? "检验单号" },
                            new JObject { ["fieldName"] = "jydrq", ["fieldValue"] = query[""] ?? "检验单日期" },
                            new JObject { ["fieldName"] = "sjsl", ["fieldValue"] = query[""] ?? "涉及数量" },
                            new JObject { ["fieldName"] = "cys", ["fieldValue"] = query[""] ?? "抽样数" },
                            new JObject { ["fieldName"] = "bls", ["fieldValue"] = query[""] ?? "不良数" },
                            new JObject { ["fieldName"] = "bll", ["fieldValue"] = query[""] ?? "不良率" }
                        }
                    }
                }
                ["workflowRequestTableRecords"] = tableRecords
            }
        };
    }
@@ -378,13 +402,13 @@
        {
            formData.Add(new KeyValuePair<string, string>(item.Key, item.Value.ToString()));
        }
        

        var content = new FormUrlEncodedContent(formData);
        content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/x-www-form-urlencoded");

        var response = await _httpClient.PostAsync(url, content);
        var responseString = await response.Content.ReadAsStringAsync();
        

        // 添加响应元数据
        var responseInfo = new JObject
        {
@@ -393,10 +417,10 @@
            ["Headers"] = JToken.FromObject(response.Headers),
            ["Content"] = responseString
        };
    

        // 调试输出完整响应信息
        Console.WriteLine($"完整响应：\n{responseInfo.ToString(Formatting.Indented)}");
        

        return responseInfo.ToString();
    }


 service/Wom/WomdaaManager.cs

@@ -589,4 +589,79 @@
            }
        }
    }



    //根据工单号返回产品型号和待领物料
    public ProductionPickDto GetItemsXcsl(WarehouseQuery query)
    {
        if (string.IsNullOrEmpty(query.daa001)) throw new Exception("工单号为空");

        var womdaa = Db.Queryable<Womdaa, MesItems>((a, i) =>
                new JoinQueryInfos(JoinType.Left,
                    a.Daa002 == i.ItemId.ToString()))
            .Where((a, i) => a.Daa001 == query.daa001
                    && a.Fstatus == 1)
            .Select((a, i) => new
            {
                a.Daa001,
                a.CaaGuid
            }).First();

        if (womdaa?.Daa001 == null) throw new Exception("工单号不存在");

        var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,
       dbo.F_QX_GETRECODEPOTSE(B.dab003) as RecoKw
    FROM WOMDAB B
    LEFT JOIN WOMDAA A ON A.guid = B.daaGuid
    LEFT JOIN MES_ITEMS C ON  B.dab003 = C.item_id
    LEFT JOIN WOMCAB D ON B.erpid = D.ERPID
    WHERE daa001 = '{0}' AND ISSUE_TYPE = 1 ORDER BY DAB002", query.daa001);

        var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);


        var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();

        var YS_list = womdabs.Where(s => s.SQty > 0).ToList();

        var mesInvItemOutCDetailsList = Db
            .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
            ((a, b, c) =>
                new JoinQueryInfos(
                    JoinType.Inner, a.ItemId == b.Id,
                    JoinType.Inner, c.DepotId == a.DepotId
                ))
            .Where((a, b, c) => a.WorkNo == query.daa001)
            .Select((a, b, c) => new MesInvItemOutCDetails
            {
                ItemName = b.ItemName,
                ItemNo = b.ItemNo,
                ItemId = a.ItemId,
                DepotId = a.DepotId,
                WorkNo = a.WorkNo,
                DepotName = c.DepotName,
                Quantity = a.Quantity
            })
            .ToList();

        var womcaa = Db.Queryable<Womcaa>().Where(s => s.Guid == womdaa.CaaGuid)
            .First();

        if (womcaa == null)
        {
            throw new Exception("生产任务单不存在");
        }

        var dto = new ProductionPickDto
        {
            daa001 = womdaa.Daa001,
            PlanNo = womcaa.Caa020,
            items = DS_list,
            Ysitems = YS_list
            // yisao = mesInvItemOutCDetailsList
        };

        return dto;
    }
}