啊鑫
2025-01-21 e34de7077207de08b7593a59e79de43491e7f822
删除冗余的文件
已修改4个文件
已删除65个文件
12981 ■■■■■ 文件已修改
StandardPda/MES.Service/Dto/webApi/ErpSupplier.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/MesSupplier.cs 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/DemoService.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/GetErpParametersServer.cs 220 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/LoginService.cs 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/MesLineUserManager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/QC/BaseService.cs 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/QC/MesQaItemsDetectDetail5Manager.cs 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/QC/RKJService.cs 651 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/QC/SJService.cs 458 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/QC/SuspendService.cs 119 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/QC/XJService.cs 531 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesDepotSectionsManager.cs 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesInvBusiness2Manager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs 209 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesInvItemArnManager.cs 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesInvItemBarcodesManager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs 292 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesInvItemInCItemsManager.cs 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesInvItemMovesCDetailsManager.cs 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesInvItemMovesManager.cs 502 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs 189 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesInvItemOutItemsManager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs 973 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/MesQaItemsDetect01Manager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/OpeningReceiptServer.cs 285 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/OrganizeService.cs 235 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/PurdhbManager.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/PurdkaManager.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/Warehouse/PurdkbManager.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/WomcaaManager.cs 267 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/WomcaaWWManager.cs 187 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/WomcabManager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/WomdaaManager.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Base/DemoController.cs 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Base/LoginController.cs 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Base/MessageCenterController.cs 273 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/BasicData/MesSupplierController.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/QC/BaseController.cs 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/QC/MesLineUserController.cs 162 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/QC/RKJController.cs 367 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/QC/SJController.cs 322 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/QC/SuspendController.cs 176 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/QC/XJController.cs 445 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesDepotSectionsController.cs 226 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesInvBusiness2Controller.cs 162 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemArnController.cs 202 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemArnDetailController.cs 223 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemBarcodesController.cs 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemInCDetailsController.cs 288 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemInCItemsController.cs 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemMovesCDetailsController.cs 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs 306 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemOutCDetailsController.cs 238 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemOutItemsController.cs 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs 536 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemStocksController.cs 162 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/MesQaItemsDetect01Controller.cs 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/OpeningReceiptController.cs 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/OrganizeController.cs 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/PurdhbController.cs 162 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/PurdkaController.cs 162 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/Warehouse/PurdkbController.cs 162 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/WomcaaController.cs 256 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/WomcaaWWController.cs 261 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/WomcabController.cs 162 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/WomdaaController.cs 180 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Dto/webApi/ErpSupplier.cs
@@ -23,8 +23,11 @@
    /// </remarks>
    public string? FDocumentStatus { get; set; }
    public string? FForbidStatus { get; set; }
    public string? FCreateOrgId { get; set; }
    public string? FUseOrgId { get; set; }
    // public string? FCreateOrgId { get; set; }
    //用友特殊点
    public string[]? FUseOrgId { get; set; }
    //public string? FDescription { get; set; }
    public string? fremarks { get; set; }
    // public string? fremarks { get; set; }
    public string? PrivateDescSeg { get; set; }
}
StandardPda/MES.Service/Modes/MesSupplier.cs
@@ -33,24 +33,6 @@
    public string? SuppSname { get; set; }
    /// <summary>
    /// æŽ¥å£å­—段调整:标准版接口新增 ERP单据状态 å­—段。
    /// </summary>
    /// <remarks>
    /// ä¿®æ”¹äººï¼š<池南骏>
    /// ä¿®æ”¹æ—¥æœŸï¼š<2024-12-28>
    /// ä¿®æ”¹è¯´æ˜Žï¼š
    /// - åŽŸä»£ç ï¼šç©º
    /// - ä¿®æ”¹åŽï¼š
    ///[SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
    ///public string? FDOCUMENTSTATUS { get; set; }
    /// </remarks>
    /// <summary>
    ///     ERP单据状态
    /// </summary>
    [SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
    public string? FDOCUMENTSTATUS { get; set; }
    /// <summary>
    ///     åœ°åŒº
    /// </summary>
    [SugarColumn(ColumnName = "LAND1")]
@@ -159,16 +141,16 @@
    public string? Fforbidstatus { get; set; }
    /// <summary>
    ///     ä½¿ç”¨ç»„织
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_ORG")]
    public decimal? CreateOrg { get; set; }
    /// <summary>
    ///     åˆ›å»ºç»„织
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_ORG")]
    public string? CreateOrg { get; set; }
    /// <summary>
    /// ä½¿ç”¨ç»„织
    ///</summary>
    [SugarColumn(ColumnName = "USE_ORG")]
    public decimal? UseOrg { get; set; }
    public string? UseOrg { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段3
@@ -188,5 +170,17 @@
    [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }
    /// <summary>
    /// åŒæ­¥SRM 001=是,002=否
    ///</summary>
    [SugarColumn(ColumnName = "PRIVATE_DESC_SEG")]
    public string? PrivateDescSeg { get; set; }
    /// <summary>
    /// Z=暂存,A=创建,B=审核中,C=已审核,D=重新审核
    ///</summary>
    [SugarColumn(ColumnName="DOCUMENT_STATUS"    )]
    public string? DocumentStatus { get; set; }
    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -132,13 +132,13 @@
            /// - ä¿®æ”¹åŽï¼š    
            ///FDOCUMENTSTATUS = supplier.FDocumentStatus,
            /// </remarks>
            FDOCUMENTSTATUS = supplier.FDocumentStatus,
            DocumentStatus = supplier.FDocumentStatus,
            Fforbidstatus = supplier.FForbidStatus,
            CreateDate = DateTime.Now,
            CreateOrg= Convert.ToDecimal(supplier.FCreateOrgId),
            UseOrg= Convert.ToDecimal(supplier.FUseOrgId),
            Remark=supplier.fremarks,
            //CreateOrg= Convert.ToDecimal(supplier.FCreateOrgId),
            //UseOrg = supplier.FUseOrgId,
            //Remark=supplier.fremarks,
            PrivateDescSeg = supplier.PrivateDescSeg,
            Company = "1000",
            Factory = "1000"
        };
@@ -217,7 +217,6 @@
        var insert = db.Insertable(entity).ExecuteCommand();
        return insert > 0;
    }
    private bool InsertOrUpdateBatch(SqlSugarScope db,
StandardPda/MES.Service/service/DemoService.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/GetErpParametersServer.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/LoginService.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/MesLineUserManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/QC/BaseService.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/QC/MesQaItemsDetectDetail5Manager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/QC/RKJService.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/QC/SJService.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/QC/SuspendService.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/QC/XJService.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesDepotSectionsManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesInvBusiness2Manager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesInvItemArnManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesInvItemBarcodesManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesInvItemInCItemsManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesInvItemMovesCDetailsManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesInvItemOutItemsManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesInvItemStocksManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/MesQaItemsDetect01Manager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/OpeningReceiptServer.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/OrganizeService.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/PurdhbManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/PurdkaManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/Warehouse/PurdkbManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/WomcaaManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/WomcaaWWManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/WomcabManager.cs
ÎļþÒÑɾ³ý
StandardPda/MES.Service/service/WomdaaManager.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Base/DemoController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Base/LoginController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Base/MessageCenterController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/BasicData/MesSupplierController.cs
@@ -1,4 +1,5 @@
using System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -32,6 +33,7 @@
        entity.Data = JsonConvert.SerializeObject(unit);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route = unit.FNumber;
        try
        {
            dynamic resultInfos = new ExpandoObject();
@@ -75,6 +77,7 @@
        entity.Data = JsonConvert.SerializeObject(units);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route = units.Select(it => it.FNumber).Join(",");
        try
        {
            dynamic resultInfos = new ExpandoObject();
StandardPda/MESApplication/Controllers/QC/BaseController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/QC/MesLineUserController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/QC/RKJController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/QC/SJController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/QC/SuspendController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/QC/XJController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesDepotSectionsController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesInvBusiness2Controller.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemArnController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemArnDetailController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemBarcodesController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemInCDetailsController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemInCItemsController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemMovesCDetailsController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemOutCDetailsController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemOutItemsController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemStocksController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/MesQaItemsDetect01Controller.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/OpeningReceiptController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/OrganizeController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/PurdhbController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/PurdkaController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/Warehouse/PurdkbController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/WomcaaController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/WomcaaWWController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/WomcabController.cs
ÎļþÒÑɾ³ý
StandardPda/MESApplication/Controllers/WomdaaController.cs
ÎļþÒÑɾ³ý