啊鑫
2024-08-10 18d03120573170fbe528f9592b29b4a6e4b9802a
采购退料单重推送
已修改28个文件
58 ■■■■ 文件已修改
MES.Service/Modes/MesInvItemArn.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemBarcodes.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemInCItems.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemStocks.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesQaItemsDetect01.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/Purdhb.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/Purdka.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Debug/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Debug/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Release/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Release/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/GetErpParametersServer.cs 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/Warehouse/MesInvItemOutsManager.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemArn.cs
MES.Service/Modes/MesInvItemBarcodes.cs
MES.Service/Modes/MesInvItemInCItems.cs
MES.Service/Modes/MesInvItemStocks.cs
MES.Service/Modes/MesQaItemsDetect01.cs
MES.Service/Modes/Purdhb.cs
MES.Service/Modes/Purdka.cs
MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
MES.Service/service/GetErpParametersServer.cs
@@ -13,13 +13,16 @@
    private readonly MesInvItemInCDetailsManager _invItemInCDetailsServer =
        new();
    private readonly MesInvItemOutsManager _invItemOutsServer =
        new();
    private readonly MessageCenterManager _messageCenterServer = new();
    public List<MessageCenter> GetErpParameters(List<MessageCenter> data)
    {
        var centers = new List<MessageCenter>();
        //获取第一个请求
        //获取主请求
        var center = data.Find(p => p.Seq == 1);
        //解析URL
@@ -28,34 +31,70 @@
        //提取参数
        var queryParameters = HttpUtility.ParseQueryString(queryString);
        var strings = center.TableName.Split("_");
        MessageCenter mesToErp = null;
        var query = new WarehouseQuery();
        switch (center.TableName)
        {
            //采购入库单审核
            case "MES_INV_ITEM_INS_A":
            //采购入库单反审核
            case "MES_INV_ITEM_INS_B":
                var strings = center.TableName.Split("_");
                var query = new WarehouseQuery();
                //获取到类型(审核还是反审核)
                query.Type = strings[^1];
                //获取url中附带的参数
                query.id = Convert.ToDecimal(queryParameters["id"]);
                query.billNo = queryParameters["billNo"];
                var mesToErp = _invItemInCDetailsServer.MesToErpParam(query);
                //重新获取请求的数据
                mesToErp = _invItemInCDetailsServer.MesToErpParam(query);
                //赋值主id
                mesToErp.Id = center.Id;
                centers.Add(mesToErp);
                //更新剩下的请求的参数
                var messageCenter = data[0];
                var json = new JObject();
                json.Add(new JProperty("id", query.id));
                json.Add(new JProperty("billNo", query.billNo));
                var json = new JObject
                {
                    new JProperty("id", query.id),
                    new JProperty("billNo", query.billNo)
                };
                messageCenter.Data = json.ToString();
                centers.Add(messageCenter);
                break;
            //采购退料单审核
            case "MES_INV_ITEM_OUTS_A":
            //采购退料单反审核
            case "MES_INV_ITEM_OUTS_B":
                //获取到类型(审核还是反审核)
                query.Type = strings[^1];
                query.id = Convert.ToDecimal(queryParameters["id"]);
                query.billNo = queryParameters["itemOutNo"];
                //重新获取请求的数据
                mesToErp = _invItemOutsServer.MesToErpParam(query);
                //更正为主id
                mesToErp.Id = center.Id;
                //添加到请求集合中
                centers.Add(mesToErp);
                //获取剩余的请求
                var find = data.FindAll(s => s.Seq != 1);
                var result = new JObject
                {
                    new JProperty("id", query.id),
                    new JProperty("billNo", query.billNo)
                };
                find.ForEach(s =>
                {
                    s.Data = result.ToString();
                    centers.Add(s);
                });
                break;
            default:
                throw new Exception("无法识别TableName类型");
        }
MES.Service/service/Warehouse/MesInvItemOutsManager.cs
@@ -192,9 +192,10 @@
    private bool Update(WarehouseQuery entity)
    {
        var userName = entity.userName ?? "system";
        return Db.Updateable<MesInvItemOuts>()
            .SetColumns(s => s.Status == entity.status)
            .SetColumns(s => s.CheckUser == entity.userName)
            .SetColumns(s => s.CheckUser == userName)
            .SetColumns(s => s.CheckDate == DateTime.Now)
            .Where(s => s.Id == entity.id).ExecuteCommand() > 0;
    }
MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ