啊鑫
2024-09-25 e08786579903aba72be57fab1024980bf737dfbd
委外订单接口更新
已修改25个文件
98 ■■■■ 文件已修改
MES.Service/Modes/ProductionOrder.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/ProductionOrderSub.cs 14 ●●●● 补丁 | 查看 | 原始文档 | 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/BasicData/ProductionOrderManager.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/BasicData/ProductionOrderController.cs 2 ●●● 补丁 | 查看 | 原始文档 | 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/MESApplication.xml 20 ●●●● 补丁 | 查看 | 原始文档 | 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 | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.xml 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/ProductionOrder.cs
@@ -1,7 +1,7 @@
using SqlSugar;
namespace MES.Service.Modes;
namespace MES.Service.Modes
{
/// <summary>
///     生产订单表(委外)
/// </summary>
@@ -11,8 +11,7 @@
    /// <summary>
    ///     SEQ_ORDER
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ORDER",
        IsPrimaryKey = true)]
        [SugarColumn(ColumnName = "ID",OracleSequenceName = "SEQ_ORDER", IsPrimaryKey = true)]
    public decimal Id { get; set; }
    /// <summary>
@@ -67,7 +66,7 @@
    ///     工单数量
    /// </summary>
    [SugarColumn(ColumnName = "WORK_ORDER_QTY")]
    public decimal? WorkOrderQty { get; set; }
        public double? WorkOrderQty { get; set; }
    /// <summary>
    ///     计划组
@@ -103,13 +102,13 @@
    ///     入库上限
    /// </summary>
    [SugarColumn(ColumnName = "STORAGE_UPPER_LIMIT")]
    public decimal? StorageUpperLimit { get; set; }
        public double? StorageUpperLimit { get; set; }
    /// <summary>
    ///     入库下限
    /// </summary>
    [SugarColumn(ColumnName = "STORAGE_LOWER_LIMIT")]
    public decimal? StorageLowerLimit { get; set; }
        public double? StorageLowerLimit { get; set; }
    /// <summary>
    ///     计划跟踪号
@@ -247,13 +246,13 @@
    ///     标准点数
    /// </summary>
    [SugarColumn(ColumnName = "STANDARDPOINTS")]
    public decimal? StandardPoints { get; set; }
        public decimal? Standardpoints { get; set; }
    /// <summary>
    ///     计价点数
    /// </summary>
    [SugarColumn(ColumnName = "PRICINGPOINTS")]
    public decimal? PricingPoints { get; set; }
        public decimal? Pricingpoints { get; set; }
    /// <summary>
    ///     入库数量
@@ -265,7 +264,7 @@
    ///     未入库数量
    /// </summary>
    [SugarColumn(ColumnName = "NOSTOCKINQTY")]
    public decimal? NoStockInQty { get; set; }
        public double? NoStockInQty { get; set; }
    /// <summary>
    ///     入库货主
@@ -273,3 +272,4 @@
    [SugarColumn(ColumnName = "STOCKOWNER")]
    public string? StockOwner { get; set; }
}
}
MES.Service/Modes/ProductionOrderSub.cs
@@ -1,7 +1,7 @@
using SqlSugar;
namespace MES.Service.Modes;
namespace MES.Service.Modes
{
/// <summary>
///     生产订单表(委外)子表
/// </summary>
@@ -11,8 +11,7 @@
    /// <summary>
    ///     SEQ_ORDER
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ORDER",
        IsPrimaryKey = true)]
        [SugarColumn(ColumnName = "ID",OracleSequenceName = "SEQ_ORDER", IsPrimaryKey = true)]
    public decimal Id { get; set; }
    /// <summary>
@@ -37,7 +36,7 @@
    ///     需领用量
    /// </summary>
    [SugarColumn(ColumnName = "REQUIRED_QTY")]
    public decimal? RequiredQty { get; set; }
        public double? RequiredQty { get; set; }
    /// <summary>
    ///     已领用量
@@ -127,13 +126,13 @@
    ///     分子
    /// </summary>
    [SugarColumn(ColumnName = "NUMERATOR")]
    public long? Numerator { get; set; }
        public double? Numerator { get; set; }
    /// <summary>
    ///     分母
    /// </summary>
    [SugarColumn(ColumnName = "DENOMINATOR")]
    public long? Denominator { get; set; }
        public double? Denominator { get; set; }
    /// <summary>
    ///     ERPID
@@ -207,3 +206,4 @@
    [SugarColumn(ColumnName = "SUPPLYING_ORG_2")]
    public string? SupplyingOrg2 { 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
@@ -108,15 +108,15 @@
            BusinessStatus = erpDto.FStatus,
            ProductCode = erpDto.FMaterialId,
            Unit = erpDto.FUnitID,
            WorkOrderQty = Convert.ToDecimal(erpDto.FQty),
            WorkOrderQty = Convert.ToDouble(erpDto.FQty),
            PlanningGroup = erpDto.FWorkGroupId,
            Planner = erpDto.FPlannerID,
            EstimatedStartTime =
                ParseDateTime(erpDto.FPlanStartDate) ?? null,
            EstimatedEndTime =
                ParseDateTime(erpDto.FPlanFinishDate) ?? null,
            StorageUpperLimit = Convert.ToDecimal(erpDto.FStockInLimitH),
            StorageLowerLimit = Convert.ToDecimal(erpDto.FStockInLimitL),
            StorageUpperLimit = Convert.ToDouble(erpDto.FStockInLimitH),
            StorageLowerLimit = Convert.ToDouble(erpDto.FStockInLimitL),
            TrackingNo = erpDto.FMTONO,
            BatchNo = erpDto.FLot,
            BomVersion = erpDto.FBomId,
@@ -137,12 +137,12 @@
            ErpProductionEntryCode = erpDto.FSUBENTRYID,
            PurchaseOrderNo = erpDto.FPurOrderNo,
            PurchaseOrderEntrySeq = long.Parse(erpDto.FPurOrderEntrySeq),
            StandardPoints =
                Convert.ToDecimal(erpDto.F_UNW_BaseProperty_bzds),
            PricingPoints =
                Convert.ToDecimal(erpDto.F_UNW_BaseProperty_jjds),
            // StandardPoints =
            //     Convert.ToDecimal(erpDto.F_UNW_BaseProperty_bzds),
            // PricingPoints =
            //     Convert.ToDecimal(erpDto.F_UNW_BaseProperty_jjds),
            StockInQty = Convert.ToDecimal(erpDto.FBaseStockInQty),
            NoStockInQty = Convert.ToDecimal(erpDto.FBaseNoStockInQty),
            NoStockInQty = Convert.ToDouble(erpDto.FBaseNoStockInQty),
            StockOwner = erpDto.FInStockOwnerId
        };
@@ -164,7 +164,7 @@
            {
                SequenceNo = long.Parse(erpDto.FSEQ),
                MaterialCode = erpDto.FMaterialID2,
                RequiredQty = Convert.ToDecimal(erpDto.FMustQty),
                RequiredQty = Convert.ToDouble(erpDto.FMustQty),
                IssuedQty = Convert.ToDecimal(erpDto.FPickedQty),
                LocationNo = erpDto.FPositionNO,
                StockOwner = erpDto.FOwnerID,
@@ -175,8 +175,8 @@
                Process = erpDto.F_UNW_Text_tpgy_Z,
                Unit = erpDto.FUnitID2,
                SupplyingType = erpDto.FSupplyType,
                Numerator = long.Parse(erpDto.FNumerator),
                Denominator = long.Parse(erpDto.FDenominator),
                Numerator = Convert.ToDouble(erpDto.FNumerator),
                Denominator = Convert.ToDouble(erpDto.FDenominator),
                ErpId = erpDto.FPPOMENTRYID,
                ErpHeaderId = erpDto.FPPOMID,
                FixedLoss = Convert.ToDecimal(erpDto.FFixScrapQty),
MESApplication/Controllers/BasicData/ProductionOrderController.cs
@@ -22,7 +22,7 @@
    private readonly string TableName = "PRODUCTION_ORDER";
    private readonly string URL =
        "http://localhost:10054/api/PRODUCTION_ORDER/";
        "http://localhost:10054/api/ProductionOrder/";
    //
    [HttpPost("Save")]
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/MESApplication.xml
@@ -1597,29 +1597,29 @@
            </summary>
            <returns></returns>
        </member>
        <member name="T:MESApplication.ActionFilter">
        <member name="T:MESApplication.Filter.ActionFilter">
            <summary>
                方法过滤器
            </summary>
        </member>
        <member name="P:MESApplication.ActionFilter.LoggerMonitor">
        <member name="P:MESApplication.Filter.ActionFilter.LoggerMonitor">
            <summary>
                监控日志
            </summary>
        </member>
        <member name="P:MESApplication.ActionFilter.LoggerError">
        <member name="P:MESApplication.Filter.ActionFilter.LoggerError">
            <summary>
                错误日志
            </summary>
        </member>
        <member name="M:MESApplication.ActionFilter.OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext)">
        <member name="M:MESApplication.Filter.ActionFilter.OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext)">
            <summary>
                方法执行前
            </summary>
            <param name="context"></param>
            <exception cref="T:System.NotImplementedException"></exception>
        </member>
        <member name="M:MESApplication.ActionFilter.CreateRequestLogText(System.String,System.String,System.String,System.String,System.String)">
        <member name="M:MESApplication.Filter.ActionFilter.CreateRequestLogText(System.String,System.String,System.String,System.String,System.String)">
            <summary>
                创建请求日志文本
            </summary>
@@ -1629,7 +1629,7 @@
            <param name="actionArgs"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.ActionFilter.CreateResponseLogText(System.String,System.String,System.String,System.Object)">
        <member name="M:MESApplication.Filter.ActionFilter.CreateResponseLogText(System.String,System.String,System.String,System.Object)">
            <summary>
                创建响应日志文本
            </summary>
@@ -1639,7 +1639,7 @@
            <param name="result"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.ErrorLog.Write(System.String,System.String,System.Exception)">
        <member name="M:MESApplication.Filter.ErrorLog.Write(System.String,System.String,System.Exception)">
            <summary>
                写入操作日志到文件中
            </summary>
@@ -1647,21 +1647,21 @@
            <param name="message">错误文本信息</param>
            <param name="ex">异常</param>
        </member>
        <member name="M:MESApplication.ErrorLog.Write(System.String,System.Exception)">
        <member name="M:MESApplication.Filter.ErrorLog.Write(System.String,System.Exception)">
            <summary>
                写入操作日志到文件中
            </summary>
            <param name="moduleName">模块名字</param>
            <param name="ex">异常</param>
        </member>
        <member name="M:MESApplication.ErrorLog.Write(System.String)">
        <member name="M:MESApplication.Filter.ErrorLog.Write(System.String)">
            <summary>
                写入过程数据或说明到文件中,以便跟踪
            </summary>
            <param name="moduleName">模块名字</param>
            <param name="ex">异常</param>
        </member>
        <member name="M:MESApplication.ErrorLog.LogToFile(System.String,System.String)">
        <member name="M:MESApplication.Filter.ErrorLog.LogToFile(System.String,System.String)">
            <summary>
                文本写入
            </summary>
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/MESApplication.xml
@@ -1597,29 +1597,29 @@
            </summary>
            <returns></returns>
        </member>
        <member name="T:MESApplication.ActionFilter">
        <member name="T:MESApplication.Filter.ActionFilter">
            <summary>
                方法过滤器
            </summary>
        </member>
        <member name="P:MESApplication.ActionFilter.LoggerMonitor">
        <member name="P:MESApplication.Filter.ActionFilter.LoggerMonitor">
            <summary>
                监控日志
            </summary>
        </member>
        <member name="P:MESApplication.ActionFilter.LoggerError">
        <member name="P:MESApplication.Filter.ActionFilter.LoggerError">
            <summary>
                错误日志
            </summary>
        </member>
        <member name="M:MESApplication.ActionFilter.OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext)">
        <member name="M:MESApplication.Filter.ActionFilter.OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext)">
            <summary>
                方法执行前
            </summary>
            <param name="context"></param>
            <exception cref="T:System.NotImplementedException"></exception>
        </member>
        <member name="M:MESApplication.ActionFilter.CreateRequestLogText(System.String,System.String,System.String,System.String,System.String)">
        <member name="M:MESApplication.Filter.ActionFilter.CreateRequestLogText(System.String,System.String,System.String,System.String,System.String)">
            <summary>
                创建请求日志文本
            </summary>
@@ -1629,7 +1629,7 @@
            <param name="actionArgs"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.ActionFilter.CreateResponseLogText(System.String,System.String,System.String,System.Object)">
        <member name="M:MESApplication.Filter.ActionFilter.CreateResponseLogText(System.String,System.String,System.String,System.Object)">
            <summary>
                创建响应日志文本
            </summary>
@@ -1639,7 +1639,7 @@
            <param name="result"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.ErrorLog.Write(System.String,System.String,System.Exception)">
        <member name="M:MESApplication.Filter.ErrorLog.Write(System.String,System.String,System.Exception)">
            <summary>
                写入操作日志到文件中
            </summary>
@@ -1647,21 +1647,21 @@
            <param name="message">错误文本信息</param>
            <param name="ex">异常</param>
        </member>
        <member name="M:MESApplication.ErrorLog.Write(System.String,System.Exception)">
        <member name="M:MESApplication.Filter.ErrorLog.Write(System.String,System.Exception)">
            <summary>
                写入操作日志到文件中
            </summary>
            <param name="moduleName">模块名字</param>
            <param name="ex">异常</param>
        </member>
        <member name="M:MESApplication.ErrorLog.Write(System.String)">
        <member name="M:MESApplication.Filter.ErrorLog.Write(System.String)">
            <summary>
                写入过程数据或说明到文件中,以便跟踪
            </summary>
            <param name="moduleName">模块名字</param>
            <param name="ex">异常</param>
        </member>
        <member name="M:MESApplication.ErrorLog.LogToFile(System.String,System.String)">
        <member name="M:MESApplication.Filter.ErrorLog.LogToFile(System.String,System.String)">
            <summary>
                文本写入
            </summary>