展杰
2024-08-07 e749bf256738008aa9283c3f8ac4241b374191a0
夏蒙
已添加4个文件
已修改53个文件
已删除1个文件
952 ■■■■ 文件已修改
MES.Service/DB/Repository.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpCustomer.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpDepartment.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpDepots.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpItemType.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpItems.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpOrganize.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpPosition.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpRohIn.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpRohinData.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpStaff.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSupplier.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesCustomer.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesDepots.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesItemType.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesItems.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesPosition.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesRohIn.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesRohInData.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesStaff.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesSupplier.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/Organize.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SysDepartment.cs 16 ●●●● 补丁 | 查看 | 原始文档 | 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/MesCustomerManager.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/MesDepotsManager.cs 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/MesItemTypeManager.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/MesItemsManager.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/MesPositionManager.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/MesRohInManager.cs 47 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/MesStaffManager.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/MesSupplierManager.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/OrganizeManager.cs 257 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/SysDepartmentManager.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication.sln.DotSettings.user 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/BasicData/OrganizeController.cs 266 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/MESApplication.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user 4 ●●●● 补丁 | 查看 | 原始文档 | 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 | 历史
MESApplication/bin/Release/net8.0/publish/web.config 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
global.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/DB/Repository.cs
@@ -8,7 +8,7 @@
        {
            DbType = DbType.Oracle,
            ConnectionString =
                @"Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd",
                @"Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_dev; Password=xmdev",
            IsAutoCloseConnection = true
        },
        db =>
MES.Service/Dto/webApi/ErpCustomer.cs
@@ -2,6 +2,9 @@
public class ErpCustomer
{
    //ERP傳輸過來的數據存儲在這裡//json格式小寫
    public string? Type { get; set; }
    public string Id { get; set; }
    public string? FNumber { get; set; }
@@ -11,4 +14,8 @@
    public string? Fmobilephone { get; set; }
    public string? Fseller { get; set; }
    public string? FForbidStatus { get; set; }
    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }
    public string? Fremarks { get; set; }
}
MES.Service/Dto/webApi/ErpDepartment.cs
@@ -17,4 +17,7 @@
    public string? FForbidStatus { get; set; }
    public string? Type { get; set; }
    public string? FParentID { get; set; }
    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }
}
MES.Service/Dto/webApi/ErpDepots.cs
@@ -19,4 +19,9 @@
    public string? FGroup { get; set; }
    public string? Type { get; set; }
    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }
    public string? FSUPPLIERID { get; set; }
    public string? Fdeptid { get; set; }
}
MES.Service/Dto/webApi/ErpItemType.cs
@@ -8,4 +8,6 @@
    public string? FNumber { get; set; }
    public string? FName { get; set; }
    public string? FDescription { get; set; }
    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }
}
MES.Service/Dto/webApi/ErpItems.cs
@@ -12,7 +12,9 @@
    public double? FMaxStock { get; set; }
    public double? FMinPackCount { get; set; }
    public string? FStockId { get; set; }
    public string? PPBOM00019124 { get; set; }
    /// <summary>
    //public string? PPBOM00019124 { get; set; }
    /// </summary>
    public string? FMaterialGroup { get; set; }
    public string? FDescription { get; set; }
    public decimal? FFinishReceiptOverRate { get; set; }
@@ -28,4 +30,12 @@
    public string? FPRODUCEUNITID { get; set; }
    public string? FSUBCONUNITID { get; set; }
    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }
    public string? FLOSSPERCENT { get; set; }
    public string? FMnemonicCode { get; set; }
    public string? FExpPeriod { get; set; }
}
MES.Service/Dto/webApi/ErpOrganize.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
namespace MES.Service.Dto.webApi;
public class ErpOrganize
{
    public string? Type { get; set; }
    public string Id { get; set; }
    public string? FNumber { get; set; }
    public string? FName { get; set; }
    public string? FForbidStatus { get; set; }
}
MES.Service/Dto/webApi/ErpPosition.cs
@@ -22,7 +22,8 @@
    public string? FForbidderId { get; set; }
    public string? FForbidDate { get; set; }
    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     ç¦ç”¨çŠ¶æ€  A å¯ç”¨ B禁用
    /// </summary>
MES.Service/Dto/webApi/ErpRohIn.cs
@@ -17,7 +17,7 @@
    public string? Facctype { get; set; }
    public string? FPurchaserId { get; set; }
    public string? F_UNW_Remarks_zlyq { get; set; }
   // public string? F_UNW_Remarks_zlyq { get; set; }
    // public string? F_UNW_GYSLXR { get; set; }
    // public string? F_UNW_LXRDH { get; set; }
@@ -26,10 +26,10 @@
    // public string? FProviderAddress { get; set; }
    public string? FSettleId { get; set; }
    public string? FChargeId { get; set; }
    public string? FProviderEMail { get; set; }
    public string? F_UNW_Text_ysfs { get; set; }
    public string? F_UNW_BZ { get; set; }
    public string? F_UNW_Combo_zjmj { get; set; }
  //  public string? FProviderEMail { get; set; }
   // public string? F_UNW_Text_ysfs { get; set; }
    public string? FHEADNOTE { get; set; }
   // public string? F_UNW_Combo_zjmj { get; set; }
    public string? FCancelStatus { get; set; }
    public string? FCancellerId { get; set; }
    public string? FCancelDate { get; set; }
@@ -43,5 +43,5 @@
    public string? FCHANGEREASON { get; set; }
    //采购订单A  é‡‡è´­è®¢å•变更单B    
    public string? FBILLTYPE { get; set; }
    //public string? FBILLTYPE { get; set; }
}
MES.Service/Dto/webApi/ErpRohinData.cs
@@ -5,20 +5,22 @@
    public string id { get; set; }
    public string Eid { get; set; }
    public string? FBillNo { get; set; }
    public string? F_UNW_Text_xsddh { get; set; }
    public string? FDEMANDBILLNO { get; set; }
    public string? FSEQ { get; set; }
    public string? FMaterialId { get; set; }
    public string? FMaterialName { get; set; }
    public string? FModel { get; set; }
    public string? FUnitId { get; set; }
    public string? FQty { get; set; }
    public string? FStockUnitID { get; set; }
    public string? FPriceUnitId { get; set; }
    public string? FPriceUnitQty { get; set; }
    public string? FDeliveryDate { get; set; }
    public string? FDeliveryEarlyDate { get; set; }
    public string? FDeliveryLastDate { get; set; }
    public string? FRequireOrgId { get; set; }
    public string? FRequireDeptId { get; set; }
    public string? FReceiveOrgId { get; set; }
    public string? FReceiveDeptId { get; set; }
    public string? FSETTLEORGID { get; set; }
    public string? FGiveAway { get; set; }
    public string? FEntryNote { get; set; }
    public string? Fnote { get; set; }
    public string? FSupMatId { get; set; }
    public string? FSupMatName { get; set; }
    public string? FSUBREQBILLNO { get; set; }
@@ -43,10 +45,8 @@
    public string? FMtoNo { get; set; }
    public string? FChangeFlag { get; set; }
    public string? FDEMANDTYPE { get; set; }
    public string? FDEMANDBILLNO { get; set; }
    //public string? FDEMANDBILLNO { get; set; }
    public string? FDEMANDBILLENTRYSEQ { get; set; }
    public string? PurchaseOrderLineNumber { get; set; }
    public string? Demand { get; set; }
    public string? Receiving { get; set; }
    public string? Settlement { get; set; }
    public string? fentryid { get; set; }
}
MES.Service/Dto/webApi/ErpStaff.cs
@@ -12,4 +12,8 @@
    public string? FStaffStartDate { get; set; }
    public string? FDescription { get; set; }
    public string? FForbidStatus { get; set; }
    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }
}
MES.Service/Dto/webApi/ErpSupplier.cs
@@ -11,4 +11,9 @@
    public string? F_UNW_LXRDH { get; set; }
    public string? FStaffId { get; set; }
    public string? FForbidStatus { get; set; }
    public string? Fumbrella { get; set; }
    public string? Fsubsidiary { get; set; }
    public string? Fremarks { get; set; }
}
MES.Service/Modes/MesCustomer.cs
@@ -141,18 +141,22 @@
    public string? Fseller { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段1
    ///     å‚™è¨»
    /// </summary>
    [SugarColumn(ColumnName = "REMARK1")]
    public string? Remark1 { get; set; }
    [SugarColumn(ColumnName = "fremarks")]
    public string? fremarks { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段2
    ///     ä½¿ç”¨çµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "REMARK2")]
    public string? Remark2 { get; set; }
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }
   /* /// <summary>
    ///     è‡ªå®šä¹‰å­—段3
    /// </summary>
    [SugarColumn(ColumnName = "REMARK3")]
@@ -169,6 +173,6 @@
    /// </summary>
    [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }
*/
    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
MES.Service/Modes/MesDepots.cs
@@ -147,34 +147,22 @@
    public string? MaterialProperti { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段1
    ///     ä½¿ç”¨çµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "REMARK1")]
    public string? Remark1 { get; set; }
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段2
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "REMARK2")]
    public string? Remark2 { get; set; }
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段3
    /// </summary>
    [SugarColumn(ColumnName = "REMARK3")]
    public string? Remark3 { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段4
    /// </summary>
    [SugarColumn(ColumnName = "REMARK4")]
    public string? Remark4 { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段5
    /// </summary>
    [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }
    [SugarColumn(ColumnName = "FSTOCKSTATUSTYPE")]
    public string? FStockStatusType { get; set; }
    [SugarColumn(ColumnName = "FSUPPLIERID")]
    public string? FSUPPLIERID { get; set; }
    [SugarColumn(ColumnName = "Fdeptid")]
    public string? Fdeptid { get; set; }
    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
MES.Service/Modes/MesItemType.cs
@@ -83,7 +83,16 @@
    /// </summary>
    [SugarColumn(ColumnName = "PGROUP")]
    public string? Pgroup { get; set; }
    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }
    /// <summary>
    ///     æè¿°
    /// </summary>
MES.Service/Modes/MesItems.cs
@@ -167,8 +167,8 @@
    /// <summary>
    ///     ç‰©æ–™åˆ†ç±»ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "PPBOM00019124")]
    public string? Ppbom00019124 { get; set; }
  /*  [SugarColumn(ColumnName = "PPBOM00019124")]
    public string? Ppbom00019124 { get; set; }*/
    /// <summary>
    ///     ç‰©æ–™åˆ†ç»„
@@ -266,5 +266,26 @@
    [SugarColumn(ColumnName = "SUBCON_UNIT")]
    public string? SubconUnit { get; set; }
    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }
    [SugarColumn(ColumnName = "FLOSSPERCENT")]
    public string? FLOSSPERCENT { get; set; }
    [SugarColumn(ColumnName = "FMnemonicCode")]
    public string? FMnemonicCode { get; set; }
    [SugarColumn(ColumnName = "FExpPeriod")]
    public string? FExpPeriod { get; set; }
    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
MES.Service/Modes/MesPosition.cs
@@ -62,29 +62,15 @@
    public string? Fforbidstatus { get; set; }
    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "REMARK1")]
    public string? Remark1 { get; set; }
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "REMARK2")]
    public string? Remark2 { get; set; }
    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "REMARK3")]
    public string? Remark3 { get; set; }
    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "REMARK4")]
    public string? Remark4 { get; set; }
    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }
    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
MES.Service/Modes/MesRohIn.cs
@@ -228,12 +228,6 @@
    public string? CheckBy { get; set; }
    /// <summary>
    ///     å®¡æ ¸æ ‡è¯†
    /// </summary>
    [SugarColumn(ColumnName = "CHECK_FALG")]
    public short? CheckFalg { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段1
    /// </summary>
    [SugarColumn(ColumnName = "changereason")]
MES.Service/Modes/MesRohInData.cs
@@ -347,4 +347,16 @@
    /// </summary>
    [SugarColumn(ColumnName = "SETTLEMENT")]
    public string? Settlement { get; set; }
    /// <summary>
    ///     éœ€æ±‚部门
    /// </summary>
    [SugarColumn(ColumnName = "DEMAND_DEPARTMENT")]
    public string? DemandDepartment { get; set; }
    /// <summary>
    ///     æ”¶æ–™éƒ¨é—¨
    /// </summary>
    [SugarColumn(ColumnName = "RECEIVING_DEPARTMENT")]
    public string? ReceivingDepartment { get; set; }
}
MES.Service/Modes/MesStaff.cs
@@ -147,4 +147,15 @@
    public string FforbidStatus { get; set; }
    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }
}
MES.Service/Modes/MesSupplier.cs
@@ -143,32 +143,32 @@
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段1
    /// </summary>
    [SugarColumn(ColumnName = "REMARK1")]
    public string? Remark1 { get; set; }
    [SugarColumn(ColumnName = "TYPE")]
    public string? type { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段2
    /// </summary>
    [SugarColumn(ColumnName = "REMARK2")]
    public string? Remark2 { get; set; }
    [SugarColumn(ColumnName = "fremarks")]
    public string? fremarks { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段3
    /// </summary>
    [SugarColumn(ColumnName = "REMARK3")]
    public string? Remark3 { get; set; }
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段4
    /// </summary>
    [SugarColumn(ColumnName = "REMARK4")]
    public string? Remark4 { get; set; }
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段5
    /// </summary>
    [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }
   /* [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }*/
    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
MES.Service/Modes/Organize.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// ç»„织
    ///</summary>
    [SugarTable("ORGANIZE")]
    public class Organize
    {
        /// <summary>
        /// ç¼–码
        ///</summary>
         [SugarColumn(ColumnName="FNUMBER"    )]
         public string Fnumber { get; set; }
        /// <summary>
        /// åç§°
        ///</summary>
         [SugarColumn(ColumnName="FNAME"    )]
         public string Fname { get; set; }
        /// <summary>
        ///
        ///</summary>
        // [SugarColumn(ColumnName="ID"    )]
        [SugarColumn(IsPrimaryKey = true)]
        public string Id { get; set; }
        /// <summary>
        /// ç¦ç”¨çŠ¶æ€
        ///</summary>
         [SugarColumn(ColumnName="FFORBIDSTATUS"    )]
         public string Fforbidstatus { get; set; }
        /// <summary>
        /// æ“ä½œç±»åž‹
        ///</summary>
         [SugarColumn(ColumnName="TYPE"    )]
         public string Type { get; set; }
    }
}
MES.Service/Modes/SysDepartment.cs
@@ -136,8 +136,20 @@
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段1
    /// </summary>
    [SugarColumn(ColumnName = "REMARK1")]
    public string? Remark1 { get; set; }
    [SugarColumn(ColumnName = "FParentID")]
    public string? FParentID { get; set; }
    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段2
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/MesCustomerManager.cs
@@ -120,6 +120,9 @@
    private MesCustomer GetSysDepartment(ErpCustomer customer)
    {
        //ERP傳輸的接口數據轉換為MES數據庫字段
        return new MesCustomer
        {
            Id = Convert.ToDecimal(customer.Id),
@@ -130,6 +133,9 @@
            Telf1 = customer.Fmobilephone,
            Fseller = customer.Fseller,
            Fforbidstatus = customer.FForbidStatus,
            fremarks             =customer.Fremarks,
            FSubsidiary          =customer.FSubsidiary,
            Fumbrella = customer.Fumbrella,
            Company = "1000",
            Factory = "1000"
        };
MES.Service/service/BasicData/MesDepotsManager.cs
@@ -1,4 +1,5 @@
using MES.Service.DB;
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -113,7 +114,11 @@
            Depottype = depots.FStockProperty,
            IsNg = depots.FForbidStatus,
            Zuid = depots.FGroup,
            Company = "1000",
            FSubsidiary = depots.FSubsidiary,
            Fumbrella = depots.Fumbrella,
            FSUPPLIERID   = depots.FSUPPLIERID,
           Fdeptid        = depots.Fdeptid,
           Company = "1000",
            Factory = "1000"
        };
    }
MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -1,4 +1,5 @@
using MES.Service.DB;
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
@@ -57,6 +58,8 @@
            Tcode = department.FNumber,
            Tname = department.FName,
            Description = department.FDescription,
            FSubsidiary = department.FSubsidiary,
            Fumbrella = department.Fumbrella,
            Company = "1000",
            Factory = "1000"
        };
MES.Service/service/BasicData/MesItemsManager.cs
@@ -1,4 +1,5 @@
using MES.Service.DB;
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -128,7 +129,7 @@
            Highlimit = item.FMaxStock,
            PrdPack = item.FMinPackCount,
            DepotCode = item.FStockId,
            Ppbom00019124 = item.PPBOM00019124,
            //Ppbom00019124 = item.PPBOM00019124,
            Fmaterialgroup = item.FMaterialGroup,
            Remarks = item.FDescription,
            Ffinishreceiptoverrate = item.FFinishReceiptOverRate,
@@ -143,6 +144,11 @@
            ProductionWorkshop = item.FWorkShopId,
            ProduceUnit = item.FPRODUCEUNITID,
            SubconUnit = item.FSUBCONUNITID,
            FSubsidiary = item.FSubsidiary,
            Fumbrella = item.Fumbrella,
            FLOSSPERCENT  = item.FLOSSPERCENT ,
            FMnemonicCode = item.FMnemonicCode,
            FExpPeriod = item.FExpPeriod      ,
            Company = "1000",
            Factory = "1000"
        };
MES.Service/service/BasicData/MesPositionManager.cs
@@ -1,4 +1,5 @@
using MES.Service.DB;
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -102,6 +103,8 @@
            PositionDescription = position.FDESCRIPTIONS,
            Department = position.FDept,
            Fforbidstatus = position.FForbidStatus,
            FSubsidiary = position.FSubsidiary,
            Fumbrella = position.Fumbrella,
            CreationDate = position.FCreateDate != null
                ? DateTime.ParseExact(position.FCreateDate,
                    "yyyy-MM-dd HH:mm:ss", null)
MES.Service/service/BasicData/MesRohInManager.cs
@@ -14,25 +14,18 @@
    {
        var rohInErpRohIn = rohIn.ErpRohIn;
        var mesRohIn = GetMesRohIn(rohInErpRohIn);
        var mesRohInDatas =
            GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
        var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
        return UseTransaction(db =>
        {
            switch (rohInErpRohIn.Type)
            {
                // case "2":
                //     return InsertData(db, mesRohIn, mesRohInDatas,
                //         rohInErpRohIn.FBILLTYPE)
                //         ? 1
                //         : 0;
                case "3":
                    return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
                case "2":
                case "4":
                    return SaveOrUpdateData(db, mesRohIn, mesRohInDatas)
                        ? 1
                        : 0;
                case "5":
                    return SaveOrUpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
                case "3":
                    return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
                default:
                    throw new NotImplementedException(
                        $"type没有{rohInErpRohIn.Type}这个类型");
@@ -147,13 +140,13 @@
        mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId;
        mesRohIn.QtyAcceptance = rohIn.Facctype;
        mesRohIn.Purchaser = rohIn.FPurchaserId;
        mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;
        //mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;
        mesRohIn.SettlementParty = rohIn.FSettleId;
        mesRohIn.PaymentParty = rohIn.FChargeId;
        mesRohIn.Email = rohIn.FProviderEMail;
        mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;
        mesRohIn.Remarks = rohIn.F_UNW_BZ;
        mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;
       // mesRohIn.Email = rohIn.FProviderEMail;
      //  mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;
      mesRohIn.Remarks = rohIn.FHEADNOTE;
      //  mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;
        mesRohIn.CancellationStatus = rohIn.FCancelStatus;
        mesRohIn.CancellationPerson = rohIn.FCancellerId;
@@ -192,13 +185,12 @@
                EbelnK3id = Convert.ToDecimal(s.id),
                ErpId = Convert.ToDecimal(s.Eid),
                BillNo = s.FBillNo,
                SalesOrderId = s.F_UNW_Text_xsddh,
                SalesOrderId=s.FDEMANDBILLNO,
                OrderLineId=s.FSEQ,
                ItemId = s.FMaterialId,
                PurchaseUnit = s.FUnitId,
                PurchaseQty = Convert.ToDecimal(s.FQty),
                InventoryUnit = s.FStockUnitID,
                PricingUnit = s.FPriceUnitId,
                PricingQty = Convert.ToDecimal(s.FPriceUnitQty),
                DeliveryDate = s.FDeliveryDate != null
                    ? DateTime.ParseExact(s.FDeliveryDate,
                        "yyyy-MM-dd HH:mm:ss", null)
@@ -212,7 +204,7 @@
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                IsGift = s.FGiveAway,
                Remarks = s.FEntryNote,
                Remarks = s.Fnote,
                SupplierItemCode = s.FSupMatId,
                SupplierItemName = s.FSupMatName,
                OutsourcingOrderId = s.FSUBREQBILLNO,
@@ -246,10 +238,15 @@
                DemandSource = s.FDEMANDTYPE,
                DemandDocumentId = s.FDEMANDBILLNO,
                DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ,
                PurchaseOrderLineNumber = s.PurchaseOrderLineNumber,
                Demand = s.Demand,
                Receiving = s.Receiving,
                Settlement = s.Settlement
                DemandOrg = s.FRequireOrgId,
                ReceivingOrg = s.FReceiveOrgId,
                SettlementOrg = s.FSETTLEORGID,
                PurchaseOrderLineNumber = s.FSEQ,
                Demand =s.FRequireOrgId,
                Receiving = s.FReceiveOrgId,
                Settlement =s.FSETTLEORGID,
                DemandDepartment = s.FRequireDeptId,
                ReceivingDepartment = s.FReceiveDeptId
            };
            var single = rohInDataManager.GetSingle(it =>
MES.Service/service/BasicData/MesStaffManager.cs
@@ -1,4 +1,5 @@
using MES.Service.DB;
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -118,7 +119,9 @@
            PositionName = staff.FPost,
            PhoneNumber = staff.FMobile,
            Remark = staff.FDescription,
            FforbidStatus = staff.FForbidStatus
            FforbidStatus = staff.FForbidStatus,
            FSubsidiary = staff.FSubsidiary,
            Fumbrella = staff.Fumbrella,
        };
        if (staff.FStaffStartDate != null)
MES.Service/service/BasicData/MesSupplierManager.cs
@@ -1,4 +1,5 @@
using MES.Service.DB;
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -127,6 +128,10 @@
            Telf1 = supplier.F_UNW_LXRDH,
            Fstaffid = supplier.FStaffId,
            Fforbidstatus = supplier.FForbidStatus,
            type= supplier.Type,
            fremarks = supplier.Fremarks,
            FSubsidiary = supplier.Fsubsidiary,
            Fumbrella = supplier.Fumbrella,
            Company = "1000",
            Factory = "1000"
        };
MES.Service/service/BasicData/OrganizeManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,257 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using MES.Service.DB;
using MES.Service.Modes;
using MES.Service.Dto.webApi;
using System.Xml.Linq;
namespace MES.Service.service
{
public class OrganizeManager : Repository<Organize>
{
        //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
        //这里面写的代码不会给覆盖,如果要重新生成请删除 OrganizeManager.cs
        public bool Save(ErpOrganize item)
        {
            var entity = GetOrganize(item);
            return UseTransaction(db =>
            {
                switch (item.Type)
                {
                    case "0":
                        if (UpdateOrganizetatus(db, entity.Id, "A"))
                            return 1;
                        break;
                    case "1":
                        if (UpdateOrganizetatus(db, entity.Id, "B"))
                            return 1;
                        break;
                    case "2":
                        if (InsertItem(db, entity))
                            return 1;
                        break;
                    case "3":
                        if (DeleteItem(db, Convert.ToDecimal(entity.Id)))
                            return 1;
                        break;
                    case "4":
                        if (InsertOrUpdate(db, entity))
                            return 1;
                        break;
                    default:
                        throw new ArgumentNullException(
                            $"type没有{item.Type}这个类型的参数");
                }
                throw new NotImplementedException("操作失败");
            }) > 0;
        }
        public bool SaveList(List<ErpOrganize> Organize)
        {
            var list = Organize.Select(GetOrganize).ToList();
            var groupBy = list.GroupBy(s => s.Type)
                .ToDictionary(g => g.Key, g => g.ToList());
            return UseTransaction(db =>
            {
                foreach (var itemGroup in groupBy)
                    switch (itemGroup.Key)
                    {
                        case "0":
                            if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "A"))
                                throw new NotImplementedException("启用失败");
                            break;
                        case "1":
                            if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B"))
                                throw new NotImplementedException("禁用失败");
                            break;
                        case "2":
                            if (!InsertItemBatch(db, itemGroup.Value))
                                throw new NotImplementedException("插入失败");
                            break;
                        case "3":
                            if (!DeleteItemBatch(db, itemGroup.Value))
                                throw new NotImplementedException("删除失败");
                            break;
                        case "4":
                            if (!InsertOrUpdateBatch(db, itemGroup.Value))
                                throw new NotImplementedException("同步失败");
                            break;
                        default:
                            throw new ArgumentNullException(
                                $"type没有{itemGroup.Key}这个类型的参数");
                    }
                return 1;
            }) > 0;
        }
        private bool UpdateOrganizetatus(SqlSugarScope db, string itemId,
            string status)
        {
            var result = db.Updateable<Organize>()
                .SetColumns(s => s.Fforbidstatus == status)
                .Where(s => s.Id == itemId).ExecuteCommand();
            if (result > 0)
                return true;
            throw new NotImplementedException(status == "A" ? "启用失败" : "禁用失败");
        }
        private bool InsertItem(SqlSugarScope db, Organize entity)
        {
            var insert = db.Insertable(entity).ExecuteCommand();
            if (insert > 0)
                return true;
            throw new NotImplementedException("插入失败");
        }
        private bool DeleteItem(SqlSugarScope db, decimal itemId)
        {
            var deleteById = db.Deleteable<Organize>().In(itemId).ExecuteCommand();
            if (deleteById > 0)
                return true;
            throw new NotImplementedException("删除失败");
        }
        private Organize GetOrganize(ErpOrganize Organize)
        {
            return new Organize
            {
                Id = Organize.Id,
                Fnumber = Organize.FNumber,
                Fname = Organize.FName,
                Fforbidstatus = Organize.FForbidStatus,
                Type = Organize.Type
            };
        }
        private bool UpdateOrganizetatusBatch(SqlSugarScope db,
            List<Organize> itemList, string status)
        {
            var ids = itemList.Select(it => it.Id).ToArray();
            var result = db.Updateable<Organize>()
                .SetColumns(s => s.Fforbidstatus == status)
                .Where(s => ids.Contains(s.Id)).ExecuteCommand();
            if (result > 0)
                return true;
            throw new NotImplementedException(status == "A" ? "启用失败" : "禁用失败");
        }
        private bool InsertItemBatch(SqlSugarScope db, List<Organize> itemList)
        {
            var insertRange = db.Insertable(itemList).ExecuteCommand();
            if (insertRange > 0)
                return true;
            throw new NotImplementedException("插入失败");
        }
        private bool DeleteItemBatch(SqlSugarScope db, List<Organize> itemList)
        {
            var ids = itemList.Select(it => it.Id).ToArray();
            var deleteByIds = db.Deleteable<Organize>().In(ids).ExecuteCommand();
            if (deleteByIds > 0)
                return true;
            throw new NotImplementedException("删除失败");
        }
        private bool InsertOrUpdate(SqlSugarScope db, Organize entity)
        {
            var exists = db.Queryable<Organize>().Any(e => e.Id == entity.Id);
            if (exists)
            {
                var update = db.Updateable(entity).ExecuteCommand();
                if (update > 0)
                    return true;
            }
            else
            {
                var insert = db.Insertable(entity).ExecuteCommand();
                if (insert > 0)
                    return true;
            }
            return false;
        }
        private bool InsertOrUpdateBatch(SqlSugarScope db, List<Organize> itemList)
        {
            foreach (var entity in itemList)
                if (!InsertOrUpdate(db, entity))
                    return false;
            return true;
        }
        #region æ•™å­¦æ–¹æ³•
        /// <summary>
        /// ä»“储方法满足不了复杂业务需求,业务代码请在这里面定义方法
        /// </summary>
        public void Study()
    {
       /*********查询*********/
        var data1 = base.GetById(1);//根据ID查询
        var data2 = base.GetList();//查询所有
        var data3 = base.GetList(it => 1 == 1);  //根据条件查询
        //var data4 = base.GetSingle(it => 1 == 1);//根据条件查询一条,如果超过一条会报错
        var p = new PageModel() { PageIndex = 1, PageSize = 2 };// åˆ†é¡µæŸ¥è¯¢
        var data5 = base.GetPageList(it => 1 == 1, p);
        Console.Write(p.TotalCount);//返回总数
        var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        Console.Write(p.TotalCount);//返回总数
        List<IConditionalModel> conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        conModels.Add(new ConditionalModel() { FieldName= typeof(Organize).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
        base.AsQueryable().Where(x => 1 == 1).ToList();//支持了转换成queryable,我们可以用queryable实现复杂功能
        /*********插入*********/
        var insertData = new Organize() { };//测试参数
        var insertArray = new Organize[] { insertData };
        base.Insert(insertData);//插入
        base.InsertRange(insertArray);//批量插入
        var id = base.InsertReturnIdentity(insertData);//插入返回自增列
        base.AsInsertable(insertData).ExecuteCommand();//我们可以转成 Insertable实现复杂插入
        /*********更新*********/
        var updateData = new Organize() {  };//测试参数
        var updateArray = new Organize[] { updateData };//测试参数
        base.Update(updateData);//根据实体更新
        base.UpdateRange(updateArray);//批量更新
        //base.Update(it => new Organize() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ›´æ–°ClassName列和CreateTime列,其它列不更新,条件id=1
        base.AsUpdateable(updateData).ExecuteCommand();  //转成Updateable可以实现复杂的插入
        /*********删除*********/
        var deldata = new Organize() {  };//测试参数
        base.Delete(deldata);//根据实体删除
        base.DeleteById(1);//根据主键删除
        base.DeleteById(new int[] { 1,2});//根据主键数组删除
        base.Delete(it=>1==2);//根据条件删除
        base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//转成Deleteable实现复杂的操作
    }
        #endregion
    }
}
MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -1,4 +1,5 @@
using MES.Service.DB;
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -117,6 +118,9 @@
            Depextr2 = department.FGroup,
            Depextr3 = department.FWIPStockID,
            Depextr4 = department.FForbidStatus,
            FParentID= department.FParentID,
            FSubsidiary = department.FSubsidiary,
            Fumbrella = department.Fumbrella,
            Company = "1000",
            Factory = "1000"
        };
MESApplication.sln.DotSettings.user
ÎļþÒÑɾ³ý
MESApplication/Controllers/BasicData/OrganizeController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,266 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Dynamic;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.util;
using MES.Service.Dto.webApi;
using MES.Service.service.BasicData;
using Newtonsoft.Json;
namespace MESApplication.Controllers
{
    [ApiController]
    [Route("api/[controller]")]
    public class OrganizeController : ControllerBase
    {
        private readonly MessageCenterManager _manager = new();
        private readonly OrganizeManager m = new();
        private readonly string METHOD = "POST";
        private readonly string TableName = "Organize";
        private readonly string URL = "http://localhost:10054/api/Organize/";
        [HttpPost("Save")]
        public ResponseResult Save(ErpOrganize unit)
        {
            var entity = new MessageCenter();
            entity.TableName = TableName;
            entity.Url = URL + "Save";
            entity.Method = METHOD;
            entity.Data = JsonConvert.SerializeObject(unit);
            entity.Status = 1;
            entity.CreateBy = "PL017";
            try
            {
                dynamic resultInfos = new ExpandoObject();
                var save = m.Save(unit);
                resultInfos.tbBillList = save;
                entity.Result = 0;
                if (save) entity.Result = 1;
                entity.DealWith = 1;
                _manager.save(entity);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                entity.Result = 0;
                entity.DealWith = 0;
                entity.ResultData = ex.Message;
                _manager.save(entity);
                return ResponseResult.ResponseError(ex);
            }
        }
        [HttpPost("SaveList")]
        public ResponseResult SaveList(List<ErpOrganize> units)
        {
            var entity = new MessageCenter();
            entity.TableName = TableName;
            entity.Url = URL + "SaveList";
            entity.Method = METHOD;
            entity.Data = JsonConvert.SerializeObject(units);
            entity.Status = 1;
            entity.CreateBy = "PL017";
            try
            {
                dynamic resultInfos = new ExpandoObject();
                var save = m.SaveList(units);
                resultInfos.tbBillList = save;
                entity.Result = 0;
                if (save) entity.Result = 1;
                entity.DealWith = 1;
                _manager.save(entity);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                entity.Result = 0;
                entity.DealWith = 0;
                entity.ResultData = ex.Message;
                _manager.save(entity);
                return ResponseResult.ResponseError(ex);
            }
        }
      //  private OrganizeManager m = new OrganizeManager();
        /***进入模版管理可以修改模版***/
        /// <summary>
        /// èŽ·å–æ‰€æœ‰
        /// </summary>
        /// <returns></returns>
        [HttpPost("GetList")]
        public ResponseResult GetList()
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.GetList();
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }
        /// <summary>
        /// æ ¹æ®ä¸»é”®èŽ·å–
        /// </summary>
        /// <returns></returns>
        [HttpPost("GetById")]
        public ResponseResult GetById(int id)
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.GetById(id);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }
        /// <summary>
        /// æ ¹æ®ä¸»é”®åˆ é™¤
        /// </summary>
        /// <returns></returns>
        [HttpPost("DeleteByIds")]
        public ResponseResult DeleteByIds([FromBody] object[] ids)
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.DeleteByIds(ids);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }
        /// <summary>
        /// æ·»åŠ 
        /// </summary>
        /// <returns></returns>
        [HttpPost("Insert")]
        public ResponseResult Add([FromBody] Organize data)
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.Insert(data);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }
        /// <summary>
        /// æ·»åŠ è¿”å›žè‡ªå¢ž
        /// </summary>
        /// <returns></returns>
        [HttpPost("InsertReturnIdentity")]
        public ResponseResult InsertReturnIdentity([FromBody] Organize data)
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.InsertReturnIdentity(data);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }
        /// <summary>
        /// ä¿®æ”¹
        /// </summary>
        /// <returns></returns>
        [HttpPost("Update")]
        public ResponseResult Update([FromBody] Organize data)
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.Update(data);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }
    }
}
MESApplication/MESApplication.csproj.user
@@ -5,6 +5,6 @@
  </PropertyGroup>
  <PropertyGroup>
    <ActiveDebugProfile>IIS Express</ActiveDebugProfile>
    <NameOfLastUsedPublishProfile>D:\Workspace\gs\RK_MESApplication\MESApplication\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Tools\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
  </PropertyGroup>
</Project>
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,8 +4,8 @@
-->
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>D:\Workspace\gs\RK_MESApplication\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
    <History>True|2024-04-10T04:55:31.3963752Z;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>D:\Tools\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
    <History>True|2024-08-07T02:32:10.3689256Z||;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/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
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-->
global.json
@@ -1,6 +1,6 @@
{
  "sdk": {
    "version": "8.0.0",
    "version": "8.0.101",
    "rollForward": "latestMajor",
    "allowPrerelease": false
  }