删除冗余的文件

啊鑫

2025-01-21 e34de7077207de08b7593a59e79de43491e7f822

删除冗余的文件

 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

@@ -9,184 +9,178 @@
public class MesSupplier
{
    /// <summary>
    ///     ID
    /// </summary>
    /// ID 
    ///</summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }

    /// <summary>
    ///     ä¾›åº”商编码
    /// </summary>
    /// ä¾›åº”商编码 
    ///</summary>
    [SugarColumn(ColumnName = "SUPP_NO")]
    public string? SuppNo { get; set; }

    /// <summary>
    ///     ä¾›åº”商名称
    /// </summary>
    /// ä¾›åº”商名称 
    ///</summary>
    [SugarColumn(ColumnName = "SUPP_NAME")]
    public string? SuppName { get; set; }

    /// <summary>
    ///     ä¾›åº”商简称
    /// </summary>
    /// ä¾›åº”商简称 
    ///</summary>
    [SugarColumn(ColumnName = "SUPP_SNAME")]
    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>
    /// åœ°åŒº 
    ///</summary>
    [SugarColumn(ColumnName = "LAND1")]
    public string? Land1 { get; set; }

    /// <summary>
    ///     åœ°å€
    /// </summary>
    /// åœ°å€ 
    ///</summary>
    [SugarColumn(ColumnName = "STRAS")]
    public string? Stras { get; set; }

    /// <summary>
    ///     ç”µè¯
    /// </summary>
    /// ç”µè¯ 
    ///</summary>
    [SugarColumn(ColumnName = "TELF1")]
    public string? Telf1 { get; set; }

    /// <summary>
    ///     ä¼ çœŸ
    /// </summary>
    /// ä¼ çœŸ 
    ///</summary>
    [SugarColumn(ColumnName = "TELFX")]
    public string? Telfx { get; set; }

    /// <summary>
    ///     è®°å½•åˆ›å»ºäºº
    /// </summary>
    /// è®°å½•åˆ›å»ºäºº 
    ///</summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }

    /// <summary>
    ///     åˆ›å»ºæ—¶é—´
    /// </summary>
    /// åˆ›å»ºæ—¶é—´ 
    ///</summary>
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }

    /// <summary>
    ///     æœ€è¿‘更新人
    /// </summary>
    /// æœ€è¿‘更新人 
    ///</summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string? LastupdateBy { get; set; }

    /// <summary>
    ///     æœ€è¿‘更新时间
    /// </summary>
    /// æœ€è¿‘更新时间 
    ///</summary>
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }

    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    /// å¤‡æ³¨ 
    ///</summary>
    [SugarColumn(ColumnName = "REMARK")]
    public string? Remark { get; set; }

    /// <summary>
    ///     ç®€ç (打印条码用)
    /// </summary>
    /// ç®€ç (打印条码用) 
    ///</summary>
    [SugarColumn(ColumnName = "FSCODE")]
    public string? Fscode { get; set; }

    /// <summary>
    ///     å…¬å¸ä»£ç 
    /// </summary>
    /// å…¬å¸ä»£ç  
    ///</summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string? Company { get; set; }

    /// <summary>
    ///     åˆ†åŽ‚编码
    /// </summary>
    /// åˆ†åŽ‚编码 
    ///</summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string? Factory { get; set; }

    /// <summary>
    ///     ç‰©æ–™æ˜¯å¦å…±ç®¡(是，否)
    /// </summary>
    /// ç‰©æ–™æ˜¯å¦å…±ç®¡(是，否) 
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_C")]
    public short? ItemC { get; set; }

    /// <summary>
    ///     ç‰©æ–™æ˜¯å¦å›žå†™SAP接口(是，否)
    /// </summary>
    /// ç‰©æ–™æ˜¯å¦å›žå†™SAP接口(是，否) 
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_SAP")]
    public short? ItemSap { get; set; }

    /// <summary>
    ///     æ˜¯å¦æ‰¹æ¬¡ç®¡ç†(是，否)
    /// </summary>
    /// æ˜¯å¦æ‰¹æ¬¡ç®¡ç†(是，否) 
    ///</summary>
    [SugarColumn(ColumnName = "LOT_FLAG")]
    public short? LotFlag { get; set; }

    /// <summary>
    ///     è”系人
    /// </summary>
    /// è”系人 
    ///</summary>
    [SugarColumn(ColumnName = "LXR")]
    public string? Lxr { get; set; }

    /// <summary>
    ///     è´Ÿè´£äºº
    /// </summary>
    /// è´Ÿè´£äºº 
    ///</summary>
    [SugarColumn(ColumnName = "FSTAFFID")]
    public string? Fstaffid { get; set; }

    /// <summary>
    ///     ç¦ç”¨çŠ¶æ€
    /// </summary>
    /// ç¦ç”¨çŠ¶æ€ 
    ///</summary>
    [SugarColumn(ColumnName = "FFORBIDSTATUS")]
    public string? Fforbidstatus { get; set; }

    /// <summary>
    ///     ä½¿ç”¨ç»„织
    /// </summary>
    /// åˆ›å»ºç»„织 
    ///</summary>
    [SugarColumn(ColumnName = "CREATE_ORG")]
    public decimal? CreateOrg { get; set; }
    public string? CreateOrg { get; set; }

    /// <summary>
    ///     åˆ›å»ºç»„织
    /// </summary>
    /// ä½¿ç”¨ç»„织 
    ///</summary>
    [SugarColumn(ColumnName = "USE_ORG")]
    public decimal? UseOrg { get; set; }
    public string? UseOrg { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段3
    /// </summary>
    /// è‡ªå®šä¹‰å­—段3 
    ///</summary>
    [SugarColumn(ColumnName = "REMARK3")]
    public string? Remark3 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段4
    /// </summary>
    /// è‡ªå®šä¹‰å­—段4 
    ///</summary>
    [SugarColumn(ColumnName = "REMARK4")]
    public string? Remark4 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段5
    /// </summary>
    /// è‡ªå®šä¹‰å­—段5 
    ///</summary>
    [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

@@ -62,7 +62,7 @@
                                "B"))
                            throw new NotImplementedException("禁用失败");
                        break;
                    

                    case "3":
                        if (!DeleteSupplierBatch(db, supplierGroup.Value))
                            throw new NotImplementedException("删除失败");
@@ -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

ÎļþÒÑɾ³ý