委外变更单更新开工状态

zyf

2024-11-15 4fa3f2b7d70af1539cf2731d7c54cc9769b0e14d

委外变更单更新开工状态

 MES.Service/Dto/webApi/ErpProductionOrderDto.cs

@@ -43,4 +43,5 @@
    public string? FBaseStockInQty { get; set; } // 入库数量
    public string? FBaseNoStockInQty { get; set; } // 未入库数量
    public string? FInStockOwnerId { get; set; } // 入库货主
    public string? FSUPPLIERID { get; set; } // 供应商ID
}

 MES.Service/Modes/ProductionOrder.cs

@@ -271,5 +271,11 @@
        ///</summary>
        [SugarColumn(ColumnName = "STOCKOWNER")]
        public string? StockOwner { get; set; }

        /// <summary>
        /// 供应商
        ///</summary>
        [SugarColumn(ColumnName = "SUPP_NO")]
        public string? SUPPLIER { get; set; }
    }
}

 MES.Service/Modes/Womcaa.cs

@@ -278,5 +278,5 @@
    ///     生产订单行内码
    /// </summary>
    [SugarColumn(ColumnName = "FMOENTRYID")]
    public decimal? Fmoentryid { get; set; }
    public decimal? FMOENTRYID { get; set; }
}

 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/BasicData/ProductionOrderManager.cs

@@ -1,8 +1,11 @@
using System.Globalization;
using System.Data;
using System.Globalization;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
using DbType = System.Data.DbType;

namespace MES.Service.service.BasicData;

@@ -35,7 +38,7 @@
                    return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
                case "2":
                case "4":
                    return SaveOrUpdateData(db, mesRohIn, mesRohInDatas)
                    return SaveOrUpdateData(db, mesRohIn, mesRohInDatas, erpProductionOrderDto.Type)
                        ? 1
                        : 0;
                default:
@@ -60,7 +63,7 @@

    // 插入或更新数据的方法
    private bool SaveOrUpdateData(SqlSugarScope db, ProductionOrder mesRohIn,
        List<ProductionOrderSub> mesRohInDatas)
        List<ProductionOrderSub> mesRohInDatas,string type)
    {
        if (mesRohIn.Id != null) base.DeleteById(mesRohIn.Id);

@@ -70,7 +73,52 @@

        var orUpdate = base.Insert(mesRohIn);
        var baOrUpdate = _productionOrderSubManager.InsertRange(mesRohInDatas);
        if (orUpdate && baOrUpdate) return true;
        if (orUpdate && baOrUpdate)
        {
            if ("4".Equals(type))
            {
                //调用存储过程
                try
                {
                    // 定义输出参数
                    var outputResult = new SugarParameter("C_RESULT", null,
                        DbType.Int32, ParameterDirection.Output,
                        4000);

                    var outputMessage = new SugarParameter("MSG", null, DbType.String,
                        ParameterDirection.Output, 4000);

                    // 定义输入参数
                    var parameters = new List<SugarParameter>
                {

                    new("P_ID",mesRohIn.ErpId , DbType.String,
                        ParameterDirection.Input),
                    outputResult,
                    outputMessage
                };

                    // 使用 SqlSugar 执行存储过程
                    Db.Ado.ExecuteCommand(
                        "BEGIN PRC_MES_WW_UPDATE_BS(:P_ID, :C_RESULT, :MSG); END;",
                        parameters.ToArray());

                    // 获取输出参数的值
                    var resultValue = outputResult.Value?.ToString();
                    var messageValue = outputMessage.Value?.ToString();

                    if ("1".Equals(resultValue)) throw new Exception("更新失败");

                    return true;
                }
                catch (Exception ex)
                {
                    throw new Exception(ex.Message);
                }
            }
            return true; 
        }

        throw new NotImplementedException("插入或更新失败");
    }

@@ -143,7 +191,8 @@
            //     Convert.ToDecimal(erpDto.F_UNW_BaseProperty_jjds),
            StockInQty = Convert.ToDecimal(erpDto.FBaseStockInQty),
            NoStockInQty = Convert.ToDouble(erpDto.FBaseNoStockInQty),
            StockOwner = erpDto.FInStockOwnerId
            StockOwner = erpDto.FInStockOwnerId,
            SUPPLIER = erpDto.FSUPPLIERID
        };

        var single = base.GetSingle(it => it.ErpId == erpDto.FPPOMID);

 MES.Service/service/WomcaaManager.cs

@@ -2,7 +2,6 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
using DbType = System.Data.DbType;

namespace MES.Service.service;

@@ -56,15 +55,6 @@

        var orUpdate = base.Insert(mesWomcaa);
        var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);

        var inputParam = mesWomcaa.Erpid;

        // 使用 SqlSugar 执行存储过程
        Db.Ado.ExecuteCommand(
            "BEGIN PRC_UPDATE_DAA(:P_ID); END;",
            new SugarParameter("P_ID", inputParam,
                DbType.Decimal));

        if (orUpdate && baOrUpdate) return true;
        throw new NotImplementedException("插入或更新失败");
    }
@@ -124,7 +114,7 @@
            Caa018 = Convert.ToDecimal(dto.planId),
            Caa019 = Convert.ToDecimal(dto.planSeq),
            Caa020 = dto.planNum,
            Fmoentryid = Convert.ToDecimal(dto.FMOENTRYID)
            FMOENTRYID = Convert.ToDecimal(dto.FMOENTRYID)
        };

        var single = base.GetSingle(it => it.Erpid == entity.Erpid);

 MESApplication/MESApplication.csproj.user

@@ -5,6 +5,6 @@
  </PropertyGroup>
  <PropertyGroup>
    <ActiveDebugProfile>IIS Express</ActiveDebugProfile>
    <NameOfLastUsedPublishProfile>C:\Users\qewqer\Desktop\MES\GSMESJK\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\qewqer\Desktop\MES\SG\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
  </PropertyGroup>
</Project>

 MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,8 +4,8 @@
-->
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>C:\Users\qewqer\Desktop\MES\GSMESJK\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
    <History>True|2024-09-06T06:40:56.3762241Z||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
    <_PublishTargetUrl>C:\Users\qewqer\Desktop\MES\SG\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
    <History>True|2024-11-15T01:32:12.6287354Z||;True|2024-11-13T10:19:32.3283327+08:00||;True|2024-09-06T14:40:56.3762241+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 MESApplication/bin/Debug/net8.0/Azure.Core.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/Azure.Identity.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/DM.DmProvider.dll

Binary files differ

 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/Debug/net8.0/Microsoft.Identity.Client.Extensions.Msal.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/Microsoft.IdentityModel.Abstractions.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/Microsoft.SqlServer.Server.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/System.ClientModel.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/System.Memory.Data.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/de/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/es/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/fr/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/it/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/ja/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/ko/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/pt-BR/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/ru/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/runtimes/unix/lib/net8.0/Microsoft.Data.SqlClient.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/runtimes/win/lib/net8.0/Microsoft.Data.SqlClient.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/runtimes/win/lib/net8.0/System.Runtime.Caching.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/zh-Hans/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/zh-Hant/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/Azure.Core.dll

Binary files differ

 MESApplication/bin/Release/net8.0/Azure.Identity.dll

Binary files differ

 MESApplication/bin/Release/net8.0/DM.DmProvider.dll

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/Microsoft.Identity.Client.Extensions.Msal.dll

Binary files differ

 MESApplication/bin/Release/net8.0/Microsoft.IdentityModel.Abstractions.dll

Binary files differ

 MESApplication/bin/Release/net8.0/Microsoft.SqlServer.Server.dll

Binary files differ

 MESApplication/bin/Release/net8.0/System.ClientModel.dll

Binary files differ

 MESApplication/bin/Release/net8.0/System.Memory.Data.dll

Binary files differ

 MESApplication/bin/Release/net8.0/de/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/es/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/fr/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/it/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/ja/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/ko/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/pt-BR/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/Azure.Core.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/Azure.Identity.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/DM.DmProvider.dll

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

 MESApplication/bin/Release/net8.0/publish/Microsoft.Bcl.AsyncInterfaces.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/Microsoft.Identity.Client.Extensions.Msal.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/Microsoft.IdentityModel.Abstractions.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/Microsoft.SqlServer.Server.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/System.ClientModel.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/System.Memory.Data.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/de/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/es/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/fr/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/it/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/ja/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/ko/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/pt-BR/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/ru/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/runtimes/unix/lib/net8.0/Microsoft.Data.SqlClient.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/runtimes/win/lib/net8.0/Microsoft.Data.SqlClient.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/runtimes/win/lib/net8.0/System.Runtime.Caching.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/web.config

@@ -8,4 +8,5 @@
      <aspNetCore processPath="dotnet" arguments=".\MESApplication.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="inprocess" />
    </system.webServer>
  </location>
</configuration>
</configuration>
<!--ProjectGuid: C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA-->

 MESApplication/bin/Release/net8.0/publish/zh-Hans/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/zh-Hant/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/ru/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/runtimes/unix/lib/net8.0/Microsoft.Data.SqlClient.dll

Binary files differ

 MESApplication/bin/Release/net8.0/runtimes/win/lib/net8.0/Microsoft.Data.SqlClient.dll

Binary files differ

 MESApplication/bin/Release/net8.0/runtimes/win/lib/net8.0/System.Runtime.Caching.dll

Binary files differ

 MESApplication/bin/Release/net8.0/zh-Hans/Microsoft.Data.SqlClient.resources.dll

Binary files differ

 MESApplication/bin/Release/net8.0/zh-Hant/Microsoft.Data.SqlClient.resources.dll

Binary files differ