wbc
2025-02-14 579b5c04843d65748f3c60816ee8ec376c178d43
泰莱姆销售相关接口字段
已添加15个文件
已修改26个文件
3137 ■■■■ 文件已修改
MES.Service/Dto/webApi/ErpSalesDelivery.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesOrder.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesOrderDto.cs 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesReturn.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesReturnDto.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesDeliveryNotice.cs 236 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesDeliveryNoticeDetail.cs 174 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesOrder.cs 207 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesOrderDetail.cs 264 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesReturnNotice.cs 293 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesReturnNoticeDetail.cs 210 ●●●● 补丁 | 查看 | 原始文档 | 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/SalesDeliveryNoticeDetailManager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs 226 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/SalesOrderManager.cs 252 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/SalesReturnNoticeDetailManager.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/SalesReturnNoticeManager.cs 258 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/BasicData/SalesDeliveryNoticeController.cs 271 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/BasicData/SalesDeliveryNoticeDetailController.cs 169 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/BasicData/SalesOrderController.cs 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/MESApplication.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user 4 ●●●● 补丁 | 查看 | 原始文档 | 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.deps.json 5 ●●●● 补丁 | 查看 | 原始文档 | 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.deps.json 5 ●●●● 补丁 | 查看 | 原始文档 | 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 | 历史
MES.Service/Dto/webApi/ErpSalesDelivery.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
using MES.Service.Modes;
namespace MES.Service.Dto.webApi;
public class ErpSalesDelivery
{
    public ErpSalesDeliveryDto OrderDto { get; set; }
    public List<ErpSalesDeliveryDetailDto> Items { get; set; }
}
MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
namespace MES.Service.Dto.webApi;
public class ErpSalesDeliveryDetailDto
{
    public string? Type { get; set; }
    public string? F_UNW_Text_xsddh { get; set; }  // é”€å”®è®¢å•号
    public string? FMaterialId { get; set; }  // ç‰©æ–™ç¼–码
    //public string? FMaterialName { get; set; }  // ç‰©æ–™åç§°
    //public string? FMaterialModel { get; set; }  // è§„格型号
    public string? FUnitID { get; set; }  // é”€å”®å•位
    public string? FQty { get; set; }  // é”€å”®æ•°é‡
    public string? FIsFree { get; set; }  // æ˜¯å¦èµ å“
    public string? FDeliverydate { get; set; }  // é€€è´§æ—¥æœŸ
    public string? FStockId { get; set; }  // ä»“库
    public string? FMtoNo { get; set; }  // è®¡åˆ’跟踪号
    public string? FLot { get; set; }  // æ‰¹å·
    //public string? FEntryDescription { get; set; }  // å¤‡æ³¨
    //public string? FRmType { get; set; }  // é€€è´§ç±»åž‹
    public string? F_UNW_Base_GDY { get; set; }  // è·Ÿå•员
    public string? FStockUnitID { get; set; }  // åº“存单位
    public decimal? FStockQty { get; set; }  // åº“存数量
   // public string? FMaterialType { get; set; }  // ç‰©æ–™ç±»åˆ«
    public string? FOwnerTypeID { get; set; }  // è´§ä¸»ç±»åž‹
    public string? FOwnerId { get; set; }  // è´§ä¸»
    public string? FSrcType { get; set; }  // æºå•类型
    public string? FSrcBillNo { get; set; }  // æºå•编号
    public string? FOrderNo { get; set; }  // è®¢å•单号
    public decimal? FPriceUnitQty { get; set; }  // è®¡ä»·æ•°é‡
    public string? FOwnerIdHead { get; set; }  // è´§ä¸»
    public string? FPlanDeliveryDate { get; set; }  //计划发货日期
    public string? FOutLmtUnit { get; set; }  // è¶…发控制单位
    public decimal? FOutMaxQty { get; set; }  // å‡ºåº“上限
    public decimal? FOutMinQty { get; set; }  // å‡ºåº“下限
    public string? FDeliveryLoc { get; set; }  // äº¤è´§åœ°ç‚¹
    public string? FDeliveryLAddress { get; set; }  // äº¤è´§åœ°å€
    public string? FTerminationStatus { get; set; }  // ç»ˆæ­¢çŠ¶æ€
    public string? FTerminateDate { get; set; }  // ä¸šåŠ¡ç»ˆæ­¢æ—¥æœŸ
    public decimal? FSumOutQty { get; set; }  // ç´¯è®¡å‡ºåº“数量
    public decimal? FRemainOutQty { get; set; }  // æœªå‡ºåº“数量
    public string? ErpID { get; set; }  // ERPID
    public string? EHID { get; set; }  // ERP头ID
}
MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
namespace MES.Service.Dto.webApi;
public class ErpSalesDeliveryDto
{
    public string? Type { get; set; }
    public string? ErpID { get; set; } // ERPID
    public string? FBillTypeID { get; set; } // å•据类型
    public string? FBillNo { get; set; } // å•据编号
    public string? FDate { get; set; } // æ—¥æœŸ
    public string? FSettleCurrld { get; set; } // ç»“算币别
    public string? FSaleDeptId { get; set; } // é”€å”®éƒ¨é—¨
    public string? F_UNW_Text_KHDD { get; set; } // å®¢æˆ·è®¢å•
    public string? FCustomerID { get; set; } // å®¢æˆ·
    public string? F_UNW_LargeText_TBKHBZ { get; set; } // æ·˜å®å®¢æˆ·å¤‡æ³¨
    public string? FHeadDeliveryWay { get; set; } // äº¤è´§æ–¹å¼
    public string? FHeadLocId { get; set; } // äº¤è´§åœ°ç‚¹
    public string? FCarrierID { get; set; } // æ‰¿è¿å•†
    public string? FCarriageNO { get; set; } // è¿è¾“单号
    public string? FDeliveryDeptID { get; set; } // å‘货部门
    public string? FStockerGroupId { get; set; } // åº“存组
    public string? FStockerId { get; set; } // ä»“管员
    public string? FSaleGroupId { get; set; } // é”€å”®ç»„
    public string? FSalesManId { get; set; } // é”€å”®å‘˜
    public string? FReceiveCusId { get; set; } // æ”¶è´§æ–¹
    public string? FReceiveCusContact { get; set; } // æ”¶è´§æ–¹è”系人
    public string? FReceiveAddress { get; set; } // æ”¶è´§æ–¹åœ°å€
    public string? FLinkMan { get; set; } // æ”¶è´§æ–¹å§“名
    public string? FLinkPhone { get; set; } // è”系电话
    public string? FSettleID { get; set; } // ç»“ç®—æ–¹
    public string? FPayerID { get; set; } // ä»˜æ¬¾æ–¹
    public string? FCreatorId { get; set; } // åˆ›å»ºäºº
    public string? FCreateDate { get; set; } // åˆ›å»ºæ—¥æœŸ
    public string? FModifierId { get; set; } // æœ€åŽä¿®æ”¹äºº
    public string? FModifyDate { get; set; } // æœ€åŽä¿®æ”¹æ—¥æœŸ
    public string? FApproverId { get; set; } // å®¡æ ¸äºº
    public string? FApproveDate { get; set; } // å®¡æ ¸æ—¥æœŸ
    public string? FCloserId { get; set; } // å…³é—­äºº
    public string? FCloseReason { get; set; } // å…³é—­åŽŸå› 
    public string? FBillCloseStatus { get; set; } // å…³é—­çŠ¶æ€
    public string? FCancelStatus { get; set; } // ä½œåºŸçŠ¶æ€
    public string? FCancellerId { get; set; } // ä½œåºŸäºº
    public string? FCancelDate { get; set; } // ä½œåºŸæ—¥æœŸ
    public string? FDocumentStatus { get; set; } // å•据状态
}
MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
namespace MES.Service.Dto.webApi;
public class ErpSalesOrderDetailDto
{
    public string? Type { get; set; }
    public string? FMaterialId { get; set; }  // ç‰©æ–™ç¼–码
    public string? FUnitID { get; set; }  // é”€å”®å•位
    public string? FQty { get; set; }  // é”€å”®æ•°é‡
    public string? FPriceUnitId { get; set; }  // è®¡ä»·å•位
    public string? FPriceUnitQty { get; set; }  // è®¡ä»·æ•°é‡
    public string? FDeliveryDate { get; set; }  // è¦è´§æ—¥æœŸ
    public string? FIsFree { get; set; }  // æ˜¯å¦èµ å“
    public string? F_UNW_Text_xsddh { get; set; }  // é”€å”®è®¢å•号
    public string? F_UNW_Base_GDY { get; set; }  // è·Ÿå•员
    public string? FOwnerTypeId { get; set; }  // è´§ä¸»ç±»åž‹
    public string? FOwnerId { get; set; }  // è´§ä¸»
    public string? FEntryNote { get; set; }  // å¤‡æ³¨
    public string? FMtoNo { get; set; }  // è®¡åˆ’跟踪号
    public string? FLot { get; set; }  // æ‰¹å·
    public string? FDeliveryMaxQty { get; set; }  // å‘货上限
    public string? FDeliveryMinQty { get; set; }  // å‘货下限
    public string? FOutLmtUnitID { get; set; }  // è¶…发控制单位
    public string? FMrpCloseStatus { get; set; }  // ä¸šåС关闭
    public string? FMrpTerminateStatus { get; set; }  // ä¸šåŠ¡ç»ˆæ­¢
    public string? FTerminateDate { get; set; }  // ç»ˆæ­¢æ—¥æœŸ
    public string? FTerminatorId { get; set; }  // ç»ˆæ­¢äºº
    public string? FSrcType { get; set; }  // æºå•类型
    public string? FSrcBillNo { get; set; }  // æºå•单号
    public string? FDeliQty { get; set; }  // ç´¯è®¡å‘货通知数量
    public string? FStockOutQty { get; set; }  // ç´¯è®¡å‡ºåº“数量
    public string? FBaseRetNoticeQty { get; set; }  // ç´¯è®¡é€€è´§é€šçŸ¥æ•°é‡ï¼ˆé”€å”®åŸºæœ¬ï¼‰
    public string? FBaseReturnQty { get; set; }  // ç´¯è®¡é€€è´§æ•°é‡ï¼ˆé”€å”®åŸºæœ¬ï¼‰
    public string? FBaseRemainOutQty { get; set; }  // å‰©ä½™æœªå‡ºæ•°é‡ï¼ˆé”€å”®åŸºæœ¬ï¼‰
    public string? FBASEARQTY { get; set; }  // ç´¯è®¡åº”收数量(销售基本)
    public string? ErpID { get; set; }  // ERPID
    public string? EHID { get; set; }  // ERP头ID
}
MES.Service/Dto/webApi/ErpSalesOrder.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
namespace MES.Service.Dto.webApi;
public class ErpSalesOrder
{
    public ErpSalesOrderDto OrderDto { get; set; }
    public List<ErpSalesOrderDetailDto> Items { get; set; }
}
MES.Service/Dto/webApi/ErpSalesOrderDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
namespace MES.Service.Dto.webApi;
public class ErpSalesOrderDto
{
    public string? Type { get; set; }
    public string? ErpID { get; set; } // ERPID
    public string? FBillNo { get; set; } // å•据编号
    public string? FBillTypeID { get; set; } // å•据类型
    public string? FDocumentStatus { get; set; } // å•据状态
    public string? FDate { get; set; } // å•据日期
    public string? FBusinessType { get; set; } // ä¸šåŠ¡ç±»åž‹
    public string? FHeadDeliveryWay { get; set; } // äº¤è´§æ–¹å¼
    public string? FHEADLOCID { get; set; } // äº¤è´§åœ°ç‚¹
    public string? F_UNW_Text_KHDD { get; set; } // å®¢æˆ·è®¢å•
    public string? F_UNW_Date_KHXQ { get; set; } // å®¢æˆ·éœ€æ±‚交期
    public string? F_UNW_BaseProperty_KHDJ { get; set; } // å®¢æˆ·ç­‰çº§
    public string? FCustId { get; set; } // å®¢æˆ·
    public string? F_UNW_LargeText_TBKHBZ { get; set; } // æ·˜å®å®¢æˆ·å¤‡æ³¨
    public string? FCloseStatus { get; set; } // å…³é—­çŠ¶æ€
    public string? FSaleDeptId { get; set; } // é”€å”®éƒ¨é—¨
    public string? FSalerId { get; set; } // é”€å”®å‘˜
    public string? FChangeReason { get; set; } // å˜æ›´åŽŸå› 
    public string? FNote { get; set; } // å¤‡æ³¨
    public string? F_UNW_Remarks_KHJHDD { get; set; } // å®¢æˆ·äº¤è´§åœ°ç‚¹
    public string? FSettleId { get; set; } // ç»“ç®—æ–¹
    public string? FApproverId { get; set; } // å®¡æ ¸äºº
    public string? FLinkMan { get; set; } // æ”¶è´§äººå§“名
    public string? FChargeId { get; set; } // ä»˜æ¬¾æ–¹
    public string? FLinkPhone { get; set; } // è”系电话
    public string? FCreatorId { get; set; } // åˆ›å»ºäºº
    public string? FCreateDate { get; set; } // åˆ›å»ºæ—¥æœŸ
    public string? FModifierId { get; set; } // æœ€åŽä¿®æ”¹äºº
    public string? FModifyDate { get; set; } // æœ€åŽä¿®æ”¹æ—¥æœŸ
    public string? FApproveDate { get; set; } // å®¡æ ¸æ—¥æœŸ
    public string? FCloserId { get; set; } // å…³é—­äºº
    public string? FCloseDate { get; set; } // å…³é—­æ—¥æœŸ
    public string? FChangeDate { get; set; } // å˜æ›´æ—¥æœŸ
    public string? FCancelStatus { get; set; } // ä½œåºŸçŠ¶æ€
    public string? FCancellerId { get; set; } // ä½œåºŸäºº
    public string? FVersionNo { get; set; } // ç‰ˆæœ¬å·
    public string? FChangerId { get; set; } // å˜æ›´äºº
    public string? FEntryNote { get; set; } // å¤‡æ³¨
}
MES.Service/Dto/webApi/ErpSalesReturn.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
using MES.Service.Modes;
namespace MES.Service.Dto.webApi;
public class ErpSalesRerurn
{
    public ErpSalesReturnDto OrderDto { get; set; }
    public List<ErpSalesReturnDetailDto> Items { get; set; }
}
MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
namespace MES.Service.Dto.webApi;
public class ErpSalesReturnDetailDto
{
    public string? Type { get; set; }
    public string? F_UNW_Text_xsddh { get; set; }  // é”€å”®è®¢å•号
    public string? FMaterialId { get; set; }  // ç‰©æ–™ç¼–码
    public string? FMaterialName { get; set; }  // ç‰©æ–™åç§°
    public string? FMaterialModel { get; set; }  // è§„格型号
    public string? FUnitID { get; set; }  // é”€å”®å•位
    public string? FQty { get; set; }  // é”€å”®æ•°é‡
    public string? FIsFree { get; set; }  // æ˜¯å¦èµ å“
    public string? FDeliverydate { get; set; }  // é€€è´§æ—¥æœŸ
    public string? FStockId { get; set; }  // ä»“库
    public string? FMtoNo { get; set; }  // è®¡åˆ’跟踪号
    public string? FLot { get; set; }  // æ‰¹å·
    public string? FEntryDescription { get; set; }  // å¤‡æ³¨
    public string? FRmType { get; set; }  // é€€è´§ç±»åž‹
    public string? F_UNW_Base_GDY { get; set; }  // è·Ÿå•员
    public string? FStockUnitID { get; set; }  // åº“存单位
    public decimal? FStockQty { get; set; }  // åº“存数量
    public string? FMaterialType { get; set; }  // ç‰©æ–™ç±»åˆ«
    public string? FOwnerTypeID { get; set; }  // è´§ä¸»ç±»åž‹
    public string? FOwnerId { get; set; }  // è´§ä¸»
    public string? FSrcType { get; set; }  // æºå•类型
    public string? FSrcBillNo { get; set; }  // æºå•编号
    public string? FOrderNo { get; set; }  // è®¢å•单号
    public string? ErpID { get; set; }  // ERPID
    public string? EHID { get; set; }  // ERP头ID
}
MES.Service/Dto/webApi/ErpSalesReturnDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
namespace MES.Service.Dto.webApi;
public class ErpSalesReturnDto
{
    public string? Type { get; set; }
    public string? ErpID { get; set; } // ERPID
    public string? FBillTypeID { get; set; } // å•据类型
    public string? FBillNo { get; set; } // å•据编号
    public string? FDate { get; set; } // æ—¥æœŸ
    public string? FSettleCurrld { get; set; } // ç»“算币别
    public string? FSaleDeptId { get; set; } // é”€å”®éƒ¨é—¨
    public string? FRetcustId { get; set; } // é€€è´§å®¢æˆ·
    public string? F_UNW_LargeText_TBKHBZ { get; set; } // æ·˜å®å®¢æˆ·å¤‡æ³¨
    public string? FRetcustReason { get; set; } // é€€è´§åŽŸå› 
    public string? FHeadLocId { get; set; } // äº¤è´§åœ°ç‚¹
    public string? FRetDeptId { get; set; } // åº“存部门
    public string? FStockerGroupId { get; set; } // åº“存组
    public string? FStockerId { get; set; } // ä»“管员
    public string? FSaleGroupId { get; set; } // é”€å”®ç»„
    public string? FSalesManId { get; set; } // é”€å”®å‘˜
    public string? F_UNW_Text_KDDH { get; set; } // å¿«é€’单号
    public string? FReceiveCusId { get; set; } // æ”¶è´§æ–¹
    public string? FReceiveCusContact { get; set; } // æ”¶è´§æ–¹è”系人
    public string? FReceiveAddress { get; set; } // æ”¶è´§æ–¹åœ°å€
    public string? FLinkMan { get; set; } // æ”¶è´§æ–¹å§“名
    public string? FSettleCusId { get; set; } // ç»“ç®—æ–¹
    public string? FCreatorId { get; set; } // åˆ›å»ºäºº
    public string? FCreateDate { get; set; } // åˆ›å»ºæ—¥æœŸ
    public string? FModifierId { get; set; } // æœ€åŽä¿®æ”¹äºº
    public string? FModifyDate { get; set; } // æœ€åŽä¿®æ”¹æ—¥æœŸ
    public string? FCloserId { get; set; } // å…³é—­äºº
    public string? FCloseReason { get; set; } // å…³é—­åŽŸå› 
    public string? FCloseDate { get; set; } // å…³é—­æ—¥æœŸ
    public string? FApproverId { get; set; } // å®¡æ ¸äºº
    public string? FApproveDate { get; set; } // å®¡æ ¸æ—¥æœŸ
    public string? FCancelStatus { get; set; } // ä½œåºŸçŠ¶æ€
    public string? FCancellerId { get; set; } // ä½œåºŸäºº
    public string? FCancelDate { get; set; } // ä½œåºŸæ—¥æœŸ
    public string? FBillCloseStatus { get; set; } // å…³é—­çŠ¶æ€
    public string? FDocumentStatus { get; set; } // å•据状态
}
MES.Service/Modes/SalesDeliveryNotice.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,236 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// é”€å”®å‘货通知单
    ///</summary>
    [SugarTable("SALES_DELIVERY_NOTICE")]
    public class SalesDeliveryNotice
    {
        /// <summary>
        ///
        ///</summary>
         [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
         public decimal? Id { get; set; }
        /// <summary>
        /// å•据类型
        ///</summary>
         [SugarColumn(ColumnName="BILL_TYPE"    )]
         public string BillType { get; set; }
        /// <summary>
        /// å•据编号
        ///</summary>
         [SugarColumn(ColumnName="BILL_NO"    )]
         public string BillNo { get; set; }
        /// <summary>
        /// æ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="F_DATE"    )]
         public DateTime? FDate { get; set; }
        /// <summary>
        /// ç»“算币别
        ///</summary>
         [SugarColumn(ColumnName="CURRENCY"    )]
         public string Currency { get; set; }
        /// <summary>
        /// é”€å”®ç»„织
        ///</summary>
         [SugarColumn(ColumnName="SALES_ORG"    )]
         public string SalesOrg { get; set; }
        /// <summary>
        /// é”€å”®éƒ¨é—¨
        ///</summary>
         [SugarColumn(ColumnName="SALES_DEPT"    )]
         public string SalesDept { get; set; }
        /// <summary>
        /// å®¢æˆ·è®¢å•
        ///</summary>
         [SugarColumn(ColumnName="CUSTOMER_ORDER_NO"    )]
         public string CustomerOrderNo { get; set; }
        /// <summary>
        /// å®¢æˆ·
        ///</summary>
         [SugarColumn(ColumnName="CUSTOMER"    )]
         public string Customer { get; set; }
        /// <summary>
        /// æ·˜å®å®¢æˆ·å¤‡æ³¨
        ///</summary>
         [SugarColumn(ColumnName="TAOBAO_REMARK"    )]
         public string TaobaoRemark { get; set; }
        /// <summary>
        /// äº¤è´§æ–¹å¼
        ///</summary>
         [SugarColumn(ColumnName="DELIVERY_METHOD"    )]
         public string DeliveryMethod { get; set; }
        /// <summary>
        /// äº¤è´§åœ°ç‚¹
        ///</summary>
         [SugarColumn(ColumnName="DELIVERY_LOCATION"    )]
         public string DeliveryLocation { get; set; }
        /// <summary>
        /// æ‰¿è¿å•†
        ///</summary>
         [SugarColumn(ColumnName="CARRIER"    )]
         public string Carrier { get; set; }
        /// <summary>
        /// è¿è¾“单号
        ///</summary>
         [SugarColumn(ColumnName="TRANSPORT_NO"    )]
         public string TransportNo { get; set; }
        /// <summary>
        /// å•据状态
        ///</summary>
         [SugarColumn(ColumnName="BILL_NO_TYPE"    )]
         public string BillNoType { get; set; }
        /// <summary>
        /// å‘货组织
        ///</summary>
         [SugarColumn(ColumnName="DELIVERY_ORG"    )]
         public string DeliveryOrg { get; set; }
        /// <summary>
        /// å‘货部门
        ///</summary>
         [SugarColumn(ColumnName="DELIVERY_DEPT"    )]
         public string DeliveryDept { get; set; }
        /// <summary>
        /// åº“存组
        ///</summary>
         [SugarColumn(ColumnName="INVENTORY_GROUP"    )]
         public string InventoryGroup { get; set; }
        /// <summary>
        /// ä»“管员
        ///</summary>
         [SugarColumn(ColumnName="WAREHOUSE_MANAGER"    )]
         public string WarehouseManager { get; set; }
        /// <summary>
        /// é”€å”®ç»„
        ///</summary>
         [SugarColumn(ColumnName="SALES_GROUP"    )]
         public string SalesGroup { get; set; }
        /// <summary>
        /// é”€å”®å‘˜
        ///</summary>
         [SugarColumn(ColumnName="SALES_PERSON"    )]
         public string SalesPerson { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹
        ///</summary>
         [SugarColumn(ColumnName="RECEIVER"    )]
         public string Receiver { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹è”系人
        ///</summary>
         [SugarColumn(ColumnName="RECEIVER_CONTACT"    )]
         public string ReceiverContact { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹åœ°å€
        ///</summary>
         [SugarColumn(ColumnName="RECEIVER_ADDRESS"    )]
         public string ReceiverAddress { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹å§“名
        ///</summary>
         [SugarColumn(ColumnName="RECEIVER_NAME"    )]
         public string ReceiverName { get; set; }
        /// <summary>
        /// è”系电话
        ///</summary>
         [SugarColumn(ColumnName="LINK_PHONE"    )]
         public string LinkPhone { get; set; }
        /// <summary>
        /// ç»“ç®—æ–¹
        ///</summary>
         [SugarColumn(ColumnName="SETTLE_PARTY"    )]
         public string SettleParty { get; set; }
        /// <summary>
        /// ä»˜æ¬¾æ–¹
        ///</summary>
         [SugarColumn(ColumnName="PAYER_PARTY"    )]
         public string PayerParty { get; set; }
        /// <summary>
        /// åˆ›å»ºäºº
        ///</summary>
         [SugarColumn(ColumnName="CREATED_BY"    )]
         public string CreatedBy { get; set; }
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        ///</summary>
         [SugarColumn(ColumnName="CREATED_DATE"    )]
         public DateTime? CreatedDate { get; set; }
        /// <summary>
        /// ä¿®æ”¹äºº
        ///</summary>
         [SugarColumn(ColumnName="MODIFIED_BY"    )]
         public string ModifiedBy { get; set; }
        /// <summary>
        /// ä¿®æ”¹æ—¶é—´
        ///</summary>
         [SugarColumn(ColumnName="MODIFIED_DATE"    )]
         public DateTime? ModifiedDate { get; set; }
        /// <summary>
        /// å…³é—­äºº
        ///</summary>
         [SugarColumn(ColumnName="CLOSED_BY"    )]
         public string ClosedBy { get; set; }
        /// <summary>
        /// å…³é—­åŽŸå› 
        ///</summary>
         [SugarColumn(ColumnName="CLOSE_REASON"    )]
         public string CloseReason { get; set; }
        /// <summary>
        /// å…³é—­æ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="CLOSE_DATE"    )]
         public DateTime? CloseDate { get; set; }
        /// <summary>
        /// å®¡æ ¸äºº
        ///</summary>
         [SugarColumn(ColumnName="APPROVED_BY"    )]
         public string ApprovedBy { get; set; }
        /// <summary>
        /// å®¡æ ¸æ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="APPROVED_DATE"    )]
         public DateTime? ApprovedDate { get; set; }
        /// <summary>
        /// ä½œåºŸçŠ¶æ€
        ///</summary>
         [SugarColumn(ColumnName="CANCEL_STATUS"    )]
         public string CancelStatus { get; set; }
        /// <summary>
        /// ä½œåºŸäºº
        ///</summary>
         [SugarColumn(ColumnName="CANCELLED_BY"    )]
         public string CancelledBy { get; set; }
        /// <summary>
        /// ä½œåºŸæ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="CANCEL_DATE"    )]
         public DateTime? CancelDate { get; set; }
        /// <summary>
        /// å…³é—­çŠ¶æ€
        ///</summary>
         [SugarColumn(ColumnName="CLOSE_STATUS"    )]
         public string CloseStatus { get; set; }
        /// <summary>
        /// æ˜¯å¦æ‰‹åЍ关闭
        ///</summary>
         [SugarColumn(ColumnName="MANUAL_CLOSE_FLAG"    )]
         public string ManualCloseFlag { get; set; }
        /// <summary>
        /// ERP头ID
        ///</summary>
         [SugarColumn(ColumnName="ERP_ID"    )]
         public string ErpId { get; set; }
        /// <summary>
        /// å•据状态
        ///</summary>
        [SugarColumn(ColumnName = "BILL_STATUS")]
        public string BillStatus { get; set; }
    }
}
MES.Service/Modes/SalesDeliveryNoticeDetail.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,174 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// é”€å”®å‘货通知单明细表
    ///</summary>
    [SugarTable("SALES_DELIVERY_NOTICE_DETAIL")]
    public class SalesDeliveryNoticeDetail
    {
        /// <summary>
        ///
        ///</summary>
         [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
         public decimal? Id { get; set; }
        /// <summary>
        /// é”€å”®è®¢å•号
        ///</summary>
         [SugarColumn(ColumnName="SALES_ORDER_ID"    )]
         public string SalesOrderId { get; set; }
        /// <summary>
        /// ç‰©æ–™ç¼–码
        ///</summary>
         [SugarColumn(ColumnName="MATERIAL_ID"    )]
         public string MaterialId { get; set; }
        /// <summary>
        /// ç‰©æ–™åç§°
        ///</summary>
         [SugarColumn(ColumnName="MATERIAL_NAME"    )]
         public string MaterialName { get; set; }
        /// <summary>
        /// ç‰©æ–™è§„æ ¼
        ///</summary>
         [SugarColumn(ColumnName="MATERIAL_SPECIFICATION"    )]
         public string MaterialSpecification { get; set; }
        /// <summary>
        /// é”€å”®å•位
        ///</summary>
         [SugarColumn(ColumnName="SALES_UNIT_ID"    )]
         public string SalesUnitId { get; set; }
        /// <summary>
        /// é”€å”®æ•°é‡
        ///</summary>
         [SugarColumn(ColumnName="SALES_QUANTITY"    )]
         public decimal? SalesQuantity { get; set; }
        /// <summary>
        /// æ˜¯å¦èµ å“
        ///</summary>
         [SugarColumn(ColumnName="IS_FREE"    )]
         public string IsFree { get; set; }
        /// <summary>
        /// è¦è´§æ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="DELIVERY_DATE"    )]
         public DateTime? DeliveryDate { get; set; }
        /// <summary>
        /// å‡ºè´§ä»“库
        ///</summary>
         [SugarColumn(ColumnName="WAREHOUSE"    )]
         public string Warehouse { get; set; }
        /// <summary>
        /// è®¡åˆ’跟踪号
        ///</summary>
         [SugarColumn(ColumnName="PLAN_TRACKING_NUMBER"    )]
         public string PlanTrackingNumber { get; set; }
        /// <summary>
        /// æ‰¹å·
        ///</summary>
         [SugarColumn(ColumnName="LOT_NUMBER"    )]
         public string LotNumber { get; set; }
        /// <summary>
        /// æºå•编号
        ///</summary>
         [SugarColumn(ColumnName="SRC_BILL_NO"    )]
         public string SrcBillNo { get; set; }
        /// <summary>
        /// è®¡ä»·æ•°é‡
        ///</summary>
         [SugarColumn(ColumnName="PRICE_QTY"    )]
         public decimal? PriceQty { get; set; }
        /// <summary>
        /// è´§ä¸»
        ///</summary>
         [SugarColumn(ColumnName="OWNER_ID"    )]
         public string OwnerId { get; set; }
        /// <summary>
        /// åº“存单位
        ///</summary>
         [SugarColumn(ColumnName="INVENTORY_UNIT"    )]
         public string InventoryUnit { get; set; }
        /// <summary>
        /// åº“存数量
        ///</summary>
         [SugarColumn(ColumnName="INVENTORY_QUANTITY"    )]
         public decimal? InventoryQuantity { get; set; }
        /// <summary>
        /// ç‰©æ–™ç±»åˆ«
        ///</summary>
         [SugarColumn(ColumnName="MATERIAL_CATEGORY"    )]
         public string MaterialCategory { get; set; }
        /// <summary>
        /// è®¡åˆ’发货日期
        ///</summary>
         [SugarColumn(ColumnName="PLAN_DELIVERY_DATE"    )]
         public DateTime? PlanDeliveryDate { get; set; }
        /// <summary>
        /// è¶…发控制单位
        ///</summary>
         [SugarColumn(ColumnName="OUT_LMT_UNIT"    )]
         public string OutLmtUnit { get; set; }
        /// <summary>
        /// å‡ºåº“上限
        ///</summary>
         [SugarColumn(ColumnName="OUT_MAX_QTY"    )]
         public decimal? OutMaxQty { get; set; }
        /// <summary>
        /// å‡ºåº“下限
        ///</summary>
         [SugarColumn(ColumnName="OUT_MIN_QTY"    )]
         public decimal? OutMinQty { get; set; }
        /// <summary>
        /// äº¤è´§åœ°ç‚¹
        ///</summary>
         [SugarColumn(ColumnName="DELIVERY_LOC"    )]
         public string DeliveryLoc { get; set; }
        /// <summary>
        /// äº¤è´§åœ°å€
        ///</summary>
         [SugarColumn(ColumnName="DELIVERYL_ADDRESS"    )]
         public string DeliverylAddress { get; set; }
        /// <summary>
        /// æºå•单号
        ///</summary>
         [SugarColumn(ColumnName="SOURCE_BILL_NO"    )]
         public string SourceBillNo { get; set; }
        /// <summary>
        /// è®¢å•单号
        ///</summary>
         [SugarColumn(ColumnName="ORDER_BILL_NO"    )]
         public string OrderBillNo { get; set; }
        /// <summary>
        /// ç»ˆæ­¢çŠ¶æ€
        ///</summary>
         [SugarColumn(ColumnName="TERMINATION_STATUS"    )]
         public string TerminationStatus { get; set; }
        /// <summary>
        /// ç»ˆæ­¢æ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="TERMINATION_DATE"    )]
         public DateTime? TerminationDate { get; set; }
        /// <summary>
        /// ç´¯è®¡å‡ºåº“数量
        ///</summary>
         [SugarColumn(ColumnName="SUM_OUT_QTY"    )]
         public decimal? SumOutQty { get; set; }
        /// <summary>
        /// æœªå‡ºåº“数量
        ///</summary>
         [SugarColumn(ColumnName="REMAIN_OUT_QTY"    )]
         public decimal? RemainOutQty { get; set; }
        /// <summary>
        /// ERP行ID
        ///</summary>
         [SugarColumn(ColumnName="ERP_LINE_ID"    )]
         public string ErpLineId { get; set; }
        /// <summary>
        /// ERP头ID
        ///</summary>
         [SugarColumn(ColumnName="ERP_HEAD_ID"    )]
         public string ErpHeadId { get; set; }
    }
}
MES.Service/Modes/SalesOrder.cs
@@ -13,101 +13,118 @@
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }
    public decimal? Id { get; set; }
    /// <summary>
    ///     è®¢å•单号
    /// </summary>
    [SugarColumn(ColumnName = "ORDER_ID")]
    public string OrderId { get; set; }
    /// <summary>
    ///     è®¢å•单别
    /// </summary>
    [SugarColumn(ColumnName = "ORDER_TYPE")]
    public string OrderType { get; set; }
    /// <summary>
    ///     å—订日期
    /// </summary>
    [SugarColumn(ColumnName = "ORDER_DATE")]
    public DateTime? OrderDate { get; set; }
    /// <summary>
    ///     å•据版本
    /// </summary>
    [SugarColumn(ColumnName = "DOCUMENT_VERSION")]
    public long? DocumentVersion { get; set; }
    /// <summary>
    ///     å•据日期
    /// </summary>
    [SugarColumn(ColumnName = "DOCUMENT_DATE")]
    public DateTime? DocumentDate { get; set; }
    /// <summary>
    ///     å·¥åŽ‚ç¼–å·
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY_ID")]
    public string FactoryId { get; set; }
    /// <summary>
    ///     å·¥åŽ‚ç®€ç§°
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY_NAME")]
    public string FactoryName { get; set; }
    /// <summary>
    ///     å®¢æˆ·ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "CUSTOMER_ID")]
    public string CustomerId { get; set; }
    /// <summary>
    ///     å®¢æˆ·ç®€ç§°
    /// </summary>
    [SugarColumn(ColumnName = "CUSTOMER_NAME")]
    public string CustomerName { get; set; }
    /// <summary>
    ///     å®¢æˆ·å•号
    /// </summary>
    [SugarColumn(ColumnName = "CUSTOMER_ORDER_ID")]
    public string CustomerOrderId { get; set; }
    /// <summary>
    ///     éƒ¨é—¨ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "DEPARTMENT_ID")]
    public string DepartmentId { get; set; }
    /// <summary>
    ///     æ€»æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "TOTAL_QUANTITY")]
    public decimal? TotalQuantity { get; set; }
    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "REMARKS")]
    public string Remarks { get; set; }
    /// <summary>
    ///     erp审核日期
    /// </summary>
    [SugarColumn(ColumnName = "APPROVAL_DATE")]
    public DateTime? ApprovalDate { get; set; }
    /// <summary>
    ///     erp审核者
    /// </summary>
    [SugarColumn(ColumnName = "APPROVER")]
    public string Approver { get; set; }
    /// <summary>
    ///     ERPID
    /// </summary>
    [SugarColumn(ColumnName = "ERP_ID")]
    public string ErpId { get; set; }
    public decimal? ErpID { get; set; } // ERPID
    [SugarColumn(ColumnName = "BILL_NO")]
    public string? BillNo { get; set; } // å•据编号
    [SugarColumn(ColumnName = "BILL_TYPE_ID")]
    public string? BillTypeId { get; set; } // å•据类型
    [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
    public string? DocumentStatus { get; set; } // å•据状态
    [SugarColumn(ColumnName = "F_DATE")]
    public DateTime? FDate { get; set; } // æ—¥æœŸ
    [SugarColumn(ColumnName = "BUSINESS_TYPE")]
    public string? BusinessType { get; set; } // ä¸šåŠ¡ç±»åž‹
    [SugarColumn(ColumnName = "HEAD_DELIVERY_WAY")]
    public string? HeadDeliveryWay { get; set; } // äº¤è´§æ–¹å¼
    [SugarColumn(ColumnName = "HEAD_LOC_ID")]
    public string? HeadLocId { get; set; } // äº¤è´§åœ°ç‚¹
    [SugarColumn(ColumnName = "UNW_TEXT_KHDD")]
    public string? UnWTextKhdd { get; set; } // å®¢æˆ·è®¢å•
    [SugarColumn(ColumnName = "UNW_DATE_KHXQ")]
    public DateTime? UnWDateKhxq { get; set; } // å®¢æˆ·éœ€æ±‚交期
    [SugarColumn(ColumnName = "UNW_BASE_PROPERTY_KHDJ")]
    public string? UnWBasePropertyKhdj { get; set; } // å®¢æˆ·ç­‰çº§
    [SugarColumn(ColumnName = "CUST_ID")]
    public string? CustId { get; set; } // å®¢æˆ·
    [SugarColumn(ColumnName = "UNW_LARGE_TEXT_TBKHBZ")]
    public string? UnWLargetextTbkhbz { get; set; } // æ·˜å®å®¢æˆ·å¤‡æ³¨
    [SugarColumn(ColumnName = "CLOSE_STATUS")]
    public string? CloseStatus { get; set; } // å…³é—­çŠ¶æ€
    [SugarColumn(ColumnName = "SALE_DEPT_ID")]
    public string? SaleDeptId { get; set; } // é”€å”®éƒ¨é—¨
    [SugarColumn(ColumnName = "SALER_ID")]
    public string? SalerId { get; set; } // é”€å”®å‘˜
    [SugarColumn(ColumnName = "CHANGE_REASON")]
    public string? ChangeReason { get; set; } // å˜æ›´åŽŸå› 
    [SugarColumn(ColumnName = "NOTE")]
    public string? Note { get; set; } // å¤‡æ³¨
    [SugarColumn(ColumnName = "UNW_REMARKS_KHJHDD")]
    public string? UnWRemarksKhjHdd { get; set; } // å®¢æˆ·äº¤è´§åœ°ç‚¹
    [SugarColumn(ColumnName = "SETTLE_ID")]
    public string? SettleId { get; set; } // ç»“ç®—æ–¹
    [SugarColumn(ColumnName = "APPROVER_ID")]
    public string? ApproverId { get; set; } // å®¡æ ¸äºº
    [SugarColumn(ColumnName = "LINK_MAN")]
    public string? LinkMan { get; set; } // æ”¶è´§äººå§“名
    [SugarColumn(ColumnName = "CHARGE_ID")]
    public string? ChargeId { get; set; } // ä»˜æ¬¾æ–¹
    [SugarColumn(ColumnName = "LINK_PHONE")]
    public string? LinkPhone { get; set; } // è”系电话
    [SugarColumn(ColumnName = "CREATOR_ID")]
    public string? CreatorId { get; set; } // åˆ›å»ºäºº
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; } // åˆ›å»ºæ—¥æœŸ
    [SugarColumn(ColumnName = "MODIFIER_ID")]
    public string? ModifierId { get; set; } // æœ€åŽä¿®æ”¹äºº
    [SugarColumn(ColumnName = "MODIFY_DATE")]
    public DateTime? ModifyDate { get; set; } // æœ€åŽä¿®æ”¹æ—¥æœŸ
    [SugarColumn(ColumnName = "APPROVE_DATE")]
    public DateTime? ApproveDate { get; set; } // å®¡æ ¸æ—¥æœŸ
    [SugarColumn(ColumnName = "CLOSER_ID")]
    public string? CloserId { get; set; } // å…³é—­äºº
    [SugarColumn(ColumnName = "CLOSE_DATE")]
    public DateTime? CloseDate { get; set; } // å…³é—­æ—¥æœŸ
    [SugarColumn(ColumnName = "CHANGE_DATE")]
    public DateTime? ChangeDate { get; set; } // å˜æ›´æ—¥æœŸ
    [SugarColumn(ColumnName = "CANCEL_STATUS")]
    public string? CancelStatus { get; set; } // ä½œåºŸçŠ¶æ€
    [SugarColumn(ColumnName = "CANCELLER_ID")]
    public string? CancellerId { get; set; } // ä½œåºŸäºº
    [SugarColumn(ColumnName = "VERSION_NO")]
    public double? VersionNo { get; set; } // ç‰ˆæœ¬å·
    [SugarColumn(ColumnName = "CHANGER_ID")]
    public string? ChangerId { get; set; } // å˜æ›´äºº
    [SugarColumn(ColumnName = "ENTRY_NOTE")]
    public string? EntryNote { get; set; } // å¤‡æ³¨
}
MES.Service/Modes/SalesOrderDetail.cs
@@ -16,98 +16,188 @@
    public decimal Id { get; set; }
    /// <summary>
    ///     è®¢å•单号
    /// </summary>
    [SugarColumn(ColumnName = "ORDER_ID")]
    public string OrderId { get; set; }
    /// <summary>
    ///     åºå·
    /// </summary>
    [SugarColumn(ColumnName = "LINE_NUMBER")]
    public long? LineNumber { get; set; }
    /// <summary>
    ///     äº§å“ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "PRODUCT_CODE")]
    public string ProductCode { get; set; }
    /// <summary>
    ///     äº§å“åç§°
    /// </summary>
    [SugarColumn(ColumnName = "PRODUCT_NAME")]
    public string ProductName { get; set; }
    /// <summary>
    ///     äº§å“è§„æ ¼
    /// </summary>
    [SugarColumn(ColumnName = "PRODUCT_SPEC")]
    public string ProductSpec { get; set; }
    /// <summary>
    ///     é¢„交货日期
    /// </summary>
    [SugarColumn(ColumnName = "SCHEDULED_DELIVERY_DATE")]
    public DateTime? ScheduledDeliveryDate { get; set; }
    /// <summary>
    ///     è®¢å•数量
    /// </summary>
    [SugarColumn(ColumnName = "ORDER_QUANTITY")]
    public decimal? OrderQuantity { get; set; }
    /// <summary>
    ///     å•位
    /// </summary>
    [SugarColumn(ColumnName = "UNIT")]
    public string Unit { get; set; }
    /// <summary>
    ///     å•ä»·
    /// </summary>
    [SugarColumn(ColumnName = "UNIT_PRICE")]
    public decimal? UnitPrice { get; set; }
    /// <summary>
    ///     é‡‘额
    /// </summary>
    [SugarColumn(ColumnName = "AMOUNT")]
    public decimal? Amount { get; set; }
    /// <summary>
    ///     å®¢æˆ·äº§å“ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "CUSTOMER_PRODUCT_CODE")]
    public string CustomerProductCode { get; set; }
    /// <summary>
    ///     å·²äº¤è´§æ•°
    /// </summary>
    [SugarColumn(ColumnName = "DELIVERED_QUANTITY")]
    public decimal? DeliveredQuantity { get; set; }
    /// <summary>
    ///     ç»“束
    /// </summary>
    [SugarColumn(ColumnName = "IS_CLOSED")]
    public string IsClosed { get; set; }
    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "REMARKS")]
    public string Remarks { get; set; }
    /// <summary>
    ///     ERPID
    /// </summary>
    [SugarColumn(ColumnName = "ERP_ID")]
    public string ErpId { get; set; }
    public decimal? ErpID { get; set; }
    /// <summary>
    ///     ERP头ID
    /// </summary>
    [SugarColumn(ColumnName = "ERP_HEAD_ID")]
    public string ErpHeadId { get; set; }
    [SugarColumn(ColumnName = "E_HID")]
    public decimal? EHID { get; set; }
    /// <summary>
    ///     ç‰©æ–™ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "MATERIAL_ID")]
    public string? MaterialId { get; set; }
    /// <summary>
    ///     é”€å”®å•位
    /// </summary>
    [SugarColumn(ColumnName = "UNIT_ID")]
    public string? UnitId { get; set; }
    /// <summary>
    ///     é”€å”®æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "QTY")]
    public decimal? Qty { get; set; }
    /// <summary>
    ///     è®¡ä»·å•位
    /// </summary>
    [SugarColumn(ColumnName = "PRICE_UNIT_ID")]
    public string? PriceUnitId { get; set; }
    /// <summary>
    ///     è®¡ä»·æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "PRICE_UNIT_QTY")]
    public decimal? PriceUnitQty { get; set; }
    /// <summary>
    ///     è¦è´§æ—¥æœŸ
    /// </summary>
    [SugarColumn(ColumnName = "DELIVERY_DATE")]
    public DateTime? DeliveryDate { get; set; }
    /// <summary>
    ///     æ˜¯å¦èµ å“
    /// </summary>
    [SugarColumn(ColumnName = "IS_FREE")]
    public string? IsFree { get; set; }
    /// <summary>
    ///     é”€å”®è®¢å•号
    /// </summary>
    [SugarColumn(ColumnName = "UNW_TEXT_XSDDH")]
    public string? SalesOrderNo { get; set; }
    /// <summary>
    ///     è·Ÿå•员
    /// </summary>
    [SugarColumn(ColumnName = "UNW_BASE_GDY")]
    public string? SalesFollowUp { get; set; }
    /// <summary>
    ///     è´§ä¸»ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "OWNER_TYPE_ID")]
    public string? OwnerTypeId { get; set; }
    /// <summary>
    ///     è´§ä¸»
    /// </summary>
    [SugarColumn(ColumnName = "OWNER_ID")]
    public string? OwnerId { get; set; }
    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "ENTRY_NOTE")]
    public string? EntryNote { get; set; }
    /// <summary>
    ///     è®¡åˆ’跟踪号
    /// </summary>
    [SugarColumn(ColumnName = "MTO_NO")]
    public string? MtoNo { get; set; }
    /// <summary>
    ///     æ‰¹å·
    /// </summary>
    [SugarColumn(ColumnName = "LOT")]
    public string? Lot { get; set; }
    /// <summary>
    ///     å‘货上限
    /// </summary>
    [SugarColumn(ColumnName = "DELIVERY_MAX_QTY")]
    public decimal? DeliveryMaxQty { get; set; }
    /// <summary>
    ///     å‘货下限
    /// </summary>
    [SugarColumn(ColumnName = "DELIVERY_MIN_QTY")]
    public decimal? DeliveryMinQty { get; set; }
    /// <summary>
    ///     è¶…发控制单位
    /// </summary>
    [SugarColumn(ColumnName = "OUT_LMT_UNIT_ID")]
    public string? OutLmtUnitId { get; set; }
    /// <summary>
    ///     ä¸šåС关闭
    /// </summary>
    [SugarColumn(ColumnName = "MRP_CLOSE_STATUS")]
    public string? MrpCloseStatus { get; set; }
    /// <summary>
    ///     ä¸šåŠ¡ç»ˆæ­¢
    /// </summary>
    [SugarColumn(ColumnName = "MRP_TERMINATE_STATUS")]
    public string? MrpTerminateStatus { get; set; }
    /// <summary>
    ///     ç»ˆæ­¢æ—¥æœŸ
    /// </summary>
    [SugarColumn(ColumnName = "TERMINATE_DATE")]
    public DateTime? TerminateDate { get; set; }
    /// <summary>
    ///     ç»ˆæ­¢äºº
    /// </summary>
    [SugarColumn(ColumnName = "TERMINATER_ID")]
    public string? TerminaterId { get; set; }
    /// <summary>
    ///     æºå•类型
    /// </summary>
    [SugarColumn(ColumnName = "SRC_TYPE")]
    public string? SrcType { get; set; }
    /// <summary>
    ///     æºå•单号
    /// </summary>
    [SugarColumn(ColumnName = "SRC_BILL_NO")]
    public string? SrcBillNo { get; set; }
    /// <summary>
    ///     ç´¯è®¡å‘货通知数量
    /// </summary>
    [SugarColumn(ColumnName = "DELI_QTY")]
    public decimal? DeliQty { get; set; }
    /// <summary>
    ///     ç´¯è®¡å‡ºåº“数量
    /// </summary>
    [SugarColumn(ColumnName = "STOCK_OUT_QTY")]
    public decimal? StockOutQty { get; set; }
    /// <summary>
    ///     ç´¯è®¡é€€è´§é€šçŸ¥æ•°é‡ï¼ˆé”€å”®åŸºæœ¬ï¼‰
    [SugarColumn(ColumnName = "BASE_RET_NOTICE_QTY")]
    public decimal? BaseRetNoticeQty { get; set; } /// </summary>
    /// <summary>
    ///     ç´¯è®¡é€€è´§æ•°é‡ï¼ˆé”€å”®åŸºæœ¬ï¼‰
    /// </summary>
    [SugarColumn(ColumnName = "BASE_RETURN_QTY")]
    public decimal? BaseReturnQty { get; set; }
    /// <summary>
    ///     å‰©ä½™æœªå‡ºæ•°é‡ï¼ˆé”€å”®åŸºæœ¬ï¼‰
    /// </summary>
    [SugarColumn(ColumnName = "BASE_REMAIN_OUT_QTY")]
    public decimal? BaseRemainOutQty { get; set; }
    /// <summary>
    ///     ç´¯è®¡åº”收数量(销售基本)
    /// </summary>
    [SugarColumn(ColumnName = "BASEARQTY")]
    public decimal? BASEARQTY { get; set; }
}
MES.Service/Modes/SalesReturnNotice.cs
@@ -1,83 +1,214 @@
using SqlSugar;
namespace MES.Service.Modes;
/// <summary>
///     é”€å”®é€€è´§é€šçŸ¥å•表
/// </summary>
[SugarTable("SALES_RETURN_NOTICE")]
public class SalesReturnNotice
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    ///     SEQ_sales
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }
    /// <summary>
    ///     åˆ¶å•人
    /// </summary>
    [SugarColumn(ColumnName = "CREATED_BY")]
    public string CreatedBy { get; set; }
    /// <summary>
    ///     å•据编号
    /// </summary>
    [SugarColumn(ColumnName = "DOCUMENT_ID")]
    public string DocumentId { get; set; }
    /// <summary>
    ///     å®¡æ ¸äººåç§°
    /// </summary>
    [SugarColumn(ColumnName = "APPROVED_BY")]
    public string ApprovedBy { get; set; }
    /// <summary>
    ///     åˆ¶å•/审核日期
    /// </summary>
    [SugarColumn(ColumnName = "CREATED_OR_APPROVED_DATE")]
    public DateTime? CreatedOrApprovedDate { get; set; }
    /// <summary>
    ///     éƒ¨é—¨ä»£ç 
    /// </summary>
    [SugarColumn(ColumnName = "DEPARTMENT_CODE")]
    public string DepartmentCode { get; set; }
    /// <summary>
    ///     éƒ¨é—¨åç§°
    /// </summary>
    [SugarColumn(ColumnName = "DEPARTMENT_NAME")]
    public string DepartmentName { get; set; }
    /// <summary>
    ///     è´­è´§å•位代码
    /// </summary>
    [SugarColumn(ColumnName = "PURCHASER_CODE")]
    public string PurchaserCode { get; set; }
    /// <summary>
    ///     è´­è´§å•位名称
    /// </summary>
    [SugarColumn(ColumnName = "PURCHASER_NAME")]
    public string PurchaserName { get; set; }
    /// <summary>
    ///     ä¸šåŠ¡å‘˜ä»£ç 
    /// </summary>
    [SugarColumn(ColumnName = "SALESPERSON_CODE")]
    public string SalespersonCode { get; set; }
    /// <summary>
    ///     ä¸šåŠ¡å‘˜åç§°
    /// </summary>
    [SugarColumn(ColumnName = "SALESPERSON_NAME")]
    public string SalespersonName { get; set; }
    /// <summary>
    ///     ERPID
    /// </summary>
    [SugarColumn(ColumnName = "ERP_ID")]
    public string ErpId { get; set; }
}
    /// é”€å”®é€€è´§é€šçŸ¥å•表
    ///</summary>
    [SugarTable("SALES_RETURN_NOTICE")]
    public class SalesReturnNotice
    {
        /// <summary>
        ///
        ///</summary>
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
        public decimal? Id { get; set; }
        /// <summary>
        /// å•据类型
        ///</summary>
        [SugarColumn(ColumnName = "BILL_TYPE")]
        public string BillType { get; set; }
        /// <summary>
        /// å•据编号
        ///</summary>
        [SugarColumn(ColumnName = "BILL_NO")]
        public string BillNo { get; set; }
        /// <summary>
        /// æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "F_DATE")]
        public DateTime? FDate { get; set; }
        /// <summary>
        /// ç»“算币别
        ///</summary>
        [SugarColumn(ColumnName = "CURRENCY")]
        public string Currency { get; set; }
        /// <summary>
        /// é”€å”®ç»„织
        ///</summary>
        [SugarColumn(ColumnName = "SALES_ORG")]
        public string SalesOrg { get; set; }
        /// <summary>
        /// é”€å”®éƒ¨é—¨
        ///</summary>
        [SugarColumn(ColumnName = "SALES_DEPT")]
        public string SalesDept { get; set; }
        /// <summary>
        /// å®¢æˆ·è®¢å•
        ///</summary>
        [SugarColumn(ColumnName = "CUSTOMER_ORDER_NO")]
        public string CustomerOrderNo { get; set; }
        /// <summary>
        /// é€€è´§å®¢æˆ·
        ///</summary>
        [SugarColumn(ColumnName = "RETURN_CUSTOMER")]
        public string ReturnCustomer { get; set; }
        /// <summary>
        /// æ·˜å®å®¢æˆ·å¤‡æ³¨
        ///</summary>
        [SugarColumn(ColumnName = "TAOBAO_REMARK")]
        public string TaobaoRemark { get; set; }
        /// <summary>
        /// é€€è´§åŽŸå› 
        ///</summary>
        [SugarColumn(ColumnName = "RETURN_REASON")]
        public string ReturnReason { get; set; }
        /// <summary>
        /// äº¤è´§åœ°ç‚¹
        ///</summary>
        [SugarColumn(ColumnName = "DELIVERY_LOCATION")]
        public string DeliveryLocation { get; set; }
        /// <summary>
        /// åº“存组织
        ///</summary>
        [SugarColumn(ColumnName = "INVENTORY_ORG")]
        public string InventoryOrg { get; set; }
        /// <summary>
        /// åº“存部门
        ///</summary>
        [SugarColumn(ColumnName = "INVENTORY_DEPT")]
        public string InventoryDept { get; set; }
        /// <summary>
        /// åº“存组
        ///</summary>
        [SugarColumn(ColumnName = "INVENTORY_GROUP")]
        public string InventoryGroup { get; set; }
        /// <summary>
        /// ä»“管员
        ///</summary>
        [SugarColumn(ColumnName = "WAREHOUSE_MANAGER")]
        public string WarehouseManager { get; set; }
        /// <summary>
        /// é”€å”®ç»„
        ///</summary>
        [SugarColumn(ColumnName = "SALES_GROUP")]
        public string SalesGroup { get; set; }
        /// <summary>
        /// é”€å”®å‘˜
        ///</summary>
        [SugarColumn(ColumnName = "SALES_PERSON")]
        public string SalesPerson { get; set; }
        /// <summary>
        /// å¿«é€’单号
        ///</summary>
        [SugarColumn(ColumnName = "EXPRESS_NO")]
        public string ExpressNo { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹
        ///</summary>
        [SugarColumn(ColumnName = "RECEIVER")]
        public string Receiver { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹è”系人
        ///</summary>
        [SugarColumn(ColumnName = "RECEIVER_CONTACT")]
        public string ReceiverContact { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹åœ°å€
        ///</summary>
        [SugarColumn(ColumnName = "RECEIVER_ADDRESS")]
        public string ReceiverAddress { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹å§“名
        ///</summary>
        [SugarColumn(ColumnName = "RECEIVER_NAME")]
        public string ReceiverName { get; set; }
        /// <summary>
        /// ç»“ç®—æ–¹
        ///</summary>
        [SugarColumn(ColumnName = "SETTLE_PARTY")]
        public string SettleParty { get; set; }
        /// <summary>
        /// åˆ›å»ºäºº
        ///</summary>
        [SugarColumn(ColumnName = "CREATED_BY")]
        public string CreatedBy { get; set; }
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        ///</summary>
        [SugarColumn(ColumnName = "CREATED_DATE")]
        public DateTime? CreatedDate { get; set; }
        /// <summary>
        /// ä¿®æ”¹äºº
        ///</summary>
        [SugarColumn(ColumnName = "MODIFIED_BY")]
        public string ModifiedBy { get; set; }
        /// <summary>
        /// ä¿®æ”¹æ—¶é—´
        ///</summary>
        [SugarColumn(ColumnName = "MODIFIED_DATE")]
        public DateTime? ModifiedDate { get; set; }
        /// <summary>
        /// å…³é—­äºº
        ///</summary>
        [SugarColumn(ColumnName = "CLOSED_BY")]
        public string ClosedBy { get; set; }
        /// <summary>
        /// å…³é—­åŽŸå› 
        ///</summary>
        [SugarColumn(ColumnName = "CLOSE_REASON")]
        public string CloseReason { get; set; }
        /// <summary>
        /// å…³é—­æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "CLOSE_DATE")]
        public DateTime? CloseDate { get; set; }
        /// <summary>
        /// å®¡æ ¸äºº
        ///</summary>
        [SugarColumn(ColumnName = "APPROVED_BY")]
        public string ApprovedBy { get; set; }
        /// <summary>
        /// å®¡æ ¸æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "APPROVED_DATE")]
        public DateTime? ApprovedDate { get; set; }
        /// <summary>
        /// ä½œåºŸçŠ¶æ€
        ///</summary>
        [SugarColumn(ColumnName = "CANCEL_STATUS")]
        public string CancelStatus { get; set; }
        /// <summary>
        /// ä½œåºŸäºº
        ///</summary>
        [SugarColumn(ColumnName = "CANCELLED_BY")]
        public string CancelledBy { get; set; }
        /// <summary>
        /// ä½œåºŸæ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "CANCEL_DATE")]
        public DateTime? CancelDate { get; set; }
        /// <summary>
        /// å…³é—­çŠ¶æ€
        ///</summary>
        [SugarColumn(ColumnName = "CLOSE_STATUS")]
        public string CloseStatus { get; set; }
        /// <summary>
        /// æ˜¯å¦æ‰‹åЍ关闭
        ///</summary>
        [SugarColumn(ColumnName = "MANUAL_CLOSE_FLAG")]
        public string ManualCloseFlag { get; set; }
        /// <summary>
        /// ERP头ID
        ///</summary>
        [SugarColumn(ColumnName = "ERP_ID")]
        public string ErpId { get; set; }
        /// <summary>
        /// å•据状态
        ///</summary>
        [SugarColumn(ColumnName = "BILL_STATUS")]
        public string BillStatus { get; set; }
    }
}
MES.Service/Modes/SalesReturnNoticeDetail.cs
@@ -11,145 +11,151 @@
    /// <summary>
    ///     SEQ_sales
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
        IsPrimaryKey = true)]
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
    public decimal Id { get; set; }
    /// <summary>
    ///     å•据行号
    /// </summary>
    [SugarColumn(ColumnName = "LINE_NUMBER")]
    public long? LineNumber { get; set; }
    /// <summary>
    ///     äº§å“ä»£ç 
    /// </summary>
    [SugarColumn(ColumnName = "PRODUCT_CODE")]
    public string ProductCode { get; set; }
    /// <summary>
    ///     äº§å“åç§°
    /// </summary>
    [SugarColumn(ColumnName = "PRODUCT_NAME")]
    public string ProductName { get; set; }
    /// <summary>
    ///     äº§å“è§„æ ¼
    /// </summary>
    [SugarColumn(ColumnName = "PRODUCT_SPEC")]
    public string ProductSpec { get; set; }
    /// <summary>
    ///     é‡‘额
    /// </summary>
    [SugarColumn(ColumnName = "AMOUNT")]
    public decimal? Amount { get; set; }
    /// <summary>
    ///     å•ä»·
    /// </summary>
    [SugarColumn(ColumnName = "UNIT_PRICE")]
    public decimal? UnitPrice { get; set; }
    /// <summary>
    ///     æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "QUANTITY")]
    public decimal? Quantity { get; set; }
    /// <summary>
    ///     å‡ºåº“数量
    /// </summary>
    [SugarColumn(ColumnName = "OUT_QUANTITY")]
    public decimal? OutQuantity { get; set; }
    /// <summary>
    ///     æ‰¹å·
    /// </summary>
    [SugarColumn(ColumnName = "BATCH_NUMBER")]
    public string BatchNumber { get; set; }
    /// <summary>
    ///     é€€è´§æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "RETURN_QUANTITY")]
    public decimal? ReturnQuantity { get; set; }
    /// <summary>
    ///     å‘货数量
    /// </summary>
    [SugarColumn(ColumnName = "DELIVERY_QUANTITY")]
    public decimal? DeliveryQuantity { get; set; }
    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "REMARKS")]
    public string Remarks { get; set; }
    /// <summary>
    ///     é”€å”®è®¢å•单号
    ///     é”€å”®è®¢å•号
    /// </summary>
    [SugarColumn(ColumnName = "SALES_ORDER_ID")]
    public string SalesOrderId { get; set; }
    /// <summary>
    ///     é”€å”®è®¢å•分录
    ///     ç‰©æ–™ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "SALES_ORDER_ENTRY")]
    public string SalesOrderEntry { get; set; }
    [SugarColumn(ColumnName = "MATERIAL_ID")]
    public string MaterialId { get; set; }
    /// <summary>
    ///     é”€å”®è®¢å•ID
    ///     ç‰©æ–™åç§°
    /// </summary>
    [SugarColumn(ColumnName = "SALES_ORDER_DETAIL_ID")]
    public string SalesOrderDetailId { get; set; }
    [SugarColumn(ColumnName = "MATERIAL_NAME")]
    public string MaterialName { get; set; }
    /// <summary>
    ///     åŸºæœ¬å•ä»·
    ///     ç‰©æ–™è§„æ ¼
    /// </summary>
    [SugarColumn(ColumnName = "BASE_UNIT_PRICE")]
    public decimal? BaseUnitPrice { get; set; }
    [SugarColumn(ColumnName = "MATERIAL_SPECIFICATION")]
    public string MaterialSpecification { get; set; }
    /// <summary>
    ///     åŸºæœ¬å•位数量
    ///     é”€å”®å•位
    /// </summary>
    [SugarColumn(ColumnName = "BASE_UNIT_QUANTITY")]
    public decimal? BaseUnitQuantity { get; set; }
    [SugarColumn(ColumnName = "SALES_UNIT_ID")]
    public string SalesUnitId { get; set; }
    /// <summary>
    ///     ä»“库代码
    ///     é”€å”®æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "WAREHOUSE_CODE")]
    public string WarehouseCode { get; set; }
    [SugarColumn(ColumnName = "SALES_QUANTITY")]
    public decimal SalesQuantity { get; set; }
    /// <summary>
    ///     ä»“库名称
    ///     æ˜¯å¦èµ å“
    /// </summary>
    [SugarColumn(ColumnName = "WAREHOUSE_NAME")]
    public string WarehouseName { get; set; }
    [SugarColumn(ColumnName = "IS_FREE")]
    public string IsFree { get; set; }
    /// <summary>
    ///     åŸºæœ¬å•位出库数量
    ///     é€€è´§æ—¥æœŸ
    /// </summary>
    [SugarColumn(ColumnName = "BASE_UNIT_OUT_QUANTITY")]
    public decimal? BaseUnitOutQuantity { get; set; }
    [SugarColumn(ColumnName = "RETURN_DATE")]
    public DateTime? ReturnDate { get; set; }
    /// <summary>
    ///     å•位
    ///     ä»“库
    /// </summary>
    [SugarColumn(ColumnName = "UNIT")]
    public string Unit { get; set; }
    [SugarColumn(ColumnName = "WAREHOUSE")]
    public string Warehouse { get; set; }
    /// <summary>
    ///     ERPID
    ///     è®¡åˆ’跟踪号
    /// </summary>
    [SugarColumn(ColumnName = "ERP_ID")]
    public string ErpId { get; set; }
    [SugarColumn(ColumnName = "PLAN_TRACKING_NUMBER")]
    public string PlanTrackingNumber { get; set; }
    /// <summary>
    ///     æ‰¹å·
    /// </summary>
    [SugarColumn(ColumnName = "LOT_NUMBER")]
    public string LotNumber { get; set; }
    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "NOTE")]
    public string Note { get; set; }
    /// <summary>
    ///     é€€è´§ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "RETURN_TYPE")]
    public string ReturnType { get; set; }
    /// <summary>
    ///     è·Ÿå•员
    /// </summary>
    [SugarColumn(ColumnName = "SALES_CLERK")]
    public string SalesClerk { get; set; }
    /// <summary>
    ///     åº“存单位
    /// </summary>
    [SugarColumn(ColumnName = "INVENTORY_UNIT")]
    public string InventoryUnit { get; set; }
    /// <summary>
    ///     åº“存数量
    /// </summary>
    [SugarColumn(ColumnName = "INVENTORY_QUANTITY")]
    public decimal InventoryQuantity { get; set; }
    /// <summary>
    ///     ç‰©æ–™ç±»åˆ«
    /// </summary>
    [SugarColumn(ColumnName = "MATERIAL_CATEGORY")]
    public string MaterialCategory { get; set; }
    /// <summary>
    ///     è´§ä¸»ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "OWNER_TYPE_ID")]
    public string OwnerTypeId { get; set; }
    /// <summary>
    ///     è´§ä¸»
    /// </summary>
    [SugarColumn(ColumnName = "OWNER_ID")]
    public string OwnerId { get; set; }
    /// <summary>
    ///     æºå•类型
    /// </summary>
    [SugarColumn(ColumnName = "SOURCE_BILL_TYPE")]
    public string SourceBillType { get; set; }
    /// <summary>
    ///     æºå•单号
    /// </summary>
    [SugarColumn(ColumnName = "SOURCE_BILL_NO")]
    public string SourceBillNo { get; set; }
    /// <summary>
    ///     è®¢å•单号
    /// </summary>
    [SugarColumn(ColumnName = "ORDER_BILL_NO")]
    public string OrderBillNo { get; set; }
    /// <summary>
    ///     ERP行ID
    /// </summary>
    [SugarColumn(ColumnName = "ERP_LINE_ID")]
    public string ErpLineId { get; set; }
    /// <summary>
    ///     ERP头ID
    /// </summary>
    [SugarColumn(ColumnName = "ERP_HEAD_ID")]
    public string ErpHeadId { get; set; }
}
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/SalesDeliveryNoticeDetailManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using MES.Service.DB;
using MES.Service.Modes;
namespace MES.Service.service
{
public class SalesDeliveryNoticeDetailManager : Repository<SalesDeliveryNoticeDetail>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
    //这里面写的代码不会给覆盖,如果要重新生成请删除 SalesDeliveryNoticeDetailManager.cs
    #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(SalesDeliveryNoticeDetail).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 SalesDeliveryNoticeDetail() { };//测试参数
        var insertArray = new SalesDeliveryNoticeDetail[] { insertData };
        base.Insert(insertData);//插入
        base.InsertRange(insertArray);//批量插入
        var id = base.InsertReturnIdentity(insertData);//插入返回自增列
        base.AsInsertable(insertData).ExecuteCommand();//我们可以转成 Insertable实现复杂插入
        /*********更新*********/
        var updateData = new SalesDeliveryNoticeDetail() {  };//测试参数
        var updateArray = new SalesDeliveryNoticeDetail[] { updateData };//测试参数
        base.Update(updateData);//根据实体更新
        base.UpdateRange(updateArray);//批量更新
        //base.Update(it => new SalesDeliveryNoticeDetail() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ›´æ–°ClassName列和CreateTime列,其它列不更新,条件id=1
        base.AsUpdateable(updateData).ExecuteCommand();  //转成Updateable可以实现复杂的插入
        /*********删除*********/
        var deldata = new SalesDeliveryNoticeDetail() {  };//测试参数
        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/SalesDeliveryNoticeManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,226 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using MES.Service.DB;
using MES.Service.Modes;
using MES.Service.Dto.webApi;
using MES.Service.service.BasicData;
using System.Globalization;
namespace MES.Service.service
{
    public class SalesDeliveryNoticeManager : Repository<SalesDeliveryNotice>
    {
        //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
        private readonly SalesDeliveryNoticeDetailManager _SalesDeliveryDetailManager =
            new();
        //ErpSalesRerurn
        public bool Save(ErpSalesDelivery SalesDelivery)
        {
            var erpSalesDeliveryDto = SalesDelivery.OrderDto;
            var mesSalesDelivery = ConvertErpToSalesDelivery(SalesDelivery.OrderDto);
            var mesSalesDeliveryDatas = ConvertErpToSalesDeliveryDetail(SalesDelivery.Items);
            return UseTransaction(db =>
            {
                switch (erpSalesDeliveryDto.Type)
                {
                    // case "2":
                    //     return InsertData(db, mesSalesReturn, mesSalesReturnDatas,
                    //         rohInErpRohIn.FBILLTYPE)
                    //         ? 1
                    //         : 0;
                    case "3":
                        return UpdateData(db, mesSalesDelivery, mesSalesDeliveryDatas) ? 1 : 0;
                    case "2":
                    case "4":
                        return SaveOrUpdateData(db, mesSalesDelivery, mesSalesDeliveryDatas, erpSalesDeliveryDto.Type)
                            ? 1
                            : 0;
                    default:
                        throw new NotImplementedException(
                            $"type没有{erpSalesDeliveryDto.Type}这个类型");
                }
            }) > 0;
        }
        private bool UpdateData(SqlSugarScope db, SalesDeliveryNotice mesSalesDelivery,
            List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas)
        {
            var decimals = mesSalesDeliveryDatas.Select(s => s.Id).ToArray();
            var update = base.DeleteById(mesSalesDelivery.Id);
            var insertOrUpdate = db
                .Deleteable<SalesDeliveryNoticeDetail>().In(decimals)
                .ExecuteCommand() > 0;
            if (update && insertOrUpdate) return true;
            throw new NotImplementedException("更新失败");
        }
        // æ’入或更新数据的方法
        private bool SaveOrUpdateData(SqlSugarScope db, SalesDeliveryNotice mesSalesDelivery,
            List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas, string type)
        {
            if (mesSalesDelivery.Id != null) base.DeleteById(mesSalesDelivery.Id);
            if (mesSalesDeliveryDatas.Count > 0)
                db.Deleteable<SalesDeliveryNoticeDetail>()
                    .Where(s => s.ErpHeadId == mesSalesDelivery.ErpId).ExecuteCommand();
            var orUpdate = base.Insert(mesSalesDelivery);
            var baOrUpdate = _SalesDeliveryDetailManager.InsertRange(mesSalesDeliveryDatas);
            if (orUpdate && baOrUpdate) return true;
            throw new NotImplementedException("插入或更新失败");
        }
        // æ‰¹é‡ä¿å­˜è®°å½•的方法
        public bool SaveList(List<ErpSalesDelivery> salesOrder)
        {
            var result = salesOrder.Select(Save).ToList();
            return result.All(b => b);
        }
        private SalesDeliveryNotice ConvertErpToSalesDelivery(
            ErpSalesDeliveryDto erpDto)
        {
            DateTime parsedDate;
            // æ—¶é—´æ ¼å¼è½¬æ¢å‡½æ•°ï¼ŒERP时间格式为 "yyyy-MM-dd HH:mm:ss"
            DateTime? ParseDateTime(string dateStr)
            {
                if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
                        CultureInfo.InvariantCulture,
                        DateTimeStyles.None,
                        out parsedDate))
                    return parsedDate;
                return null; // å¦‚果转换失败,返回null
            }
            var salesOrder = new SalesDeliveryNotice
            {
                BillNo = erpDto.FBillNo,
                ErpId = erpDto.ErpID,
                FDate = ParseDateTime(erpDto.FDate) ?? null,
                BillType = erpDto.FBillTypeID, // å•据类型
                Currency = erpDto.FSettleCurrld, // ç»“算币别
                SalesDept = erpDto.FSaleDeptId, //销售部门
                CustomerOrderNo = erpDto.F_UNW_Text_KHDD, // å®¢æˆ·è®¢å•
                Customer = erpDto.FCustomerID, // å®¢æˆ·
                TaobaoRemark = erpDto.F_UNW_LargeText_TBKHBZ, // æ·˜å®å®¢æˆ·å¤‡æ³¨
                DeliveryMethod = erpDto.FHeadDeliveryWay, // äº¤è´§æ–¹å¼
                DeliveryLocation = erpDto.FHeadLocId, // äº¤è´§åœ°ç‚¹
                Carrier = erpDto.FCarrierID, // æ‰¿è¿å•†
                TransportNo = erpDto.FCarriageNO, // è¿è¾“单号
                BillNoType = erpDto.FCarriageNO, // å•据状态
                DeliveryDept = erpDto.FDeliveryDeptID, // å‘货部门
                InventoryGroup = erpDto.FStockerGroupId, // åº“存组
                WarehouseManager = erpDto.FStockerId, // ä»“管员
                SalesGroup = erpDto.FSaleGroupId, // é”€å”®ç»„
                SalesPerson = erpDto.FSalesManId,//销售员
                Receiver = erpDto.FReceiveCusId, // æ”¶è´§æ–¹
                ReceiverContact = erpDto.FReceiveCusContact, // æ”¶è´§æ–¹è”系人
                ReceiverAddress = erpDto.FReceiveAddress, // æ”¶è´§æ–¹åœ°å€
                ReceiverName = erpDto.FLinkMan, // æ”¶è´§æ–¹å§“名
                LinkPhone    = erpDto.FLinkPhone,//联系电话
                SettleParty = erpDto.FSettleID, // ç»“ç®—æ–¹
                PayerParty = erpDto.FPayerID,//付款方
                CreatedBy = erpDto.FCreatorId, // åˆ›å»ºäºº
                CreatedDate = ParseDateTime(erpDto.FCreateDate) ?? null, // åˆ›å»ºæ—¶é—´
                ModifiedBy = erpDto.FModifierId, // ä¿®æ”¹äºº
                ModifiedDate = ParseDateTime(erpDto.FModifyDate) ?? null, // ä¿®æ”¹æ—¶é—´
                ClosedBy = erpDto.FCloserId, // å…³é—­äºº
                CloseReason = erpDto.FCloseReason, // å…³é—­åŽŸå› 
               // CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // å…³é—­æ—¥æœŸ
                ApprovedBy = erpDto.FApproverId, // å®¡æ ¸äºº
                ApprovedDate = ParseDateTime(erpDto.FApproveDate) ?? null, // å®¡æ ¸æ—¥æœŸ
                CancelStatus = erpDto.FCancelStatus, // ä½œåºŸçŠ¶æ€
                CancelledBy = erpDto.FCancellerId, // ä½œåºŸäºº
                CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // ä½œåºŸæ—¥æœŸ
                CloseStatus = erpDto.FBillCloseStatus, // å…³é—­çŠ¶æ€
                BillStatus = erpDto.FDocumentStatus //单据状态
            };
            var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
            if (single != null) salesOrder.Id = single.Id;
            return salesOrder;
        }
        private List<SalesDeliveryNoticeDetail> ConvertErpToSalesDeliveryDetail(
            List<ErpSalesDeliveryDetailDto> erpDtoList)
        {
            var salesOrderSubList =
                new List<SalesDeliveryNoticeDetail>();
            DateTime parsedDate;
            // æ—¶é—´æ ¼å¼è½¬æ¢å‡½æ•°ï¼ŒERP时间格式为 "yyyy-MM-dd HH:mm:ss"
            DateTime? ParseDateTime(string dateStr)
            {
                if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
                        CultureInfo.InvariantCulture,
                        DateTimeStyles.None,
                        out parsedDate))
                    return parsedDate;
                return null; // å¦‚果转换失败,返回null
            }
            foreach (var erpDto in erpDtoList)
            {
                var salesOrderSub = new SalesDeliveryNoticeDetail
                {
                    ErpLineId = erpDto.ErpID,//ERP行ID
                    ErpHeadId = erpDto.EHID,//ERP头ID
                    SalesOrderId = erpDto.F_UNW_Text_xsddh,//销售订单号
                    MaterialId = erpDto.FMaterialId,//物料编号
                   // MaterialName = erpDto.FMaterialName,// ç‰©æ–™åç§°
                    //MaterialSpecification = erpDto.FMaterialModel,//规格型号
                    SalesUnitId = erpDto.FUnitID,//销售单位
                    SalesQuantity = Convert.ToDecimal(erpDto.FQty),//销售数量
                    IsFree = erpDto.FIsFree,//是否赠品
                    DeliveryDate = ParseDateTime(erpDto.FDeliverydate),//要货日期
                    Warehouse = erpDto.FStockId,//出货仓库
                    PlanTrackingNumber = erpDto.FMtoNo,//计划跟踪号
                    LotNumber = erpDto.FLot,//批号
                    SrcBillNo = erpDto.FSrcBillNo,//源单编号
                    PriceQty = erpDto.FPriceUnitQty,//计价数量
                    OwnerId = erpDto.FOwnerIdHead,//货主
                    InventoryUnit = erpDto.FStockUnitID,//库存单位
                    InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty),//库存数量
                    //MaterialCategory = erpDto.FMaterialType,//物料类别
                    PlanDeliveryDate = ParseDateTime(erpDto.FPlanDeliveryDate),//计划发货日期
                    OutLmtUnit = erpDto.FOutLmtUnit,//超发控制单位
                    OutMaxQty = erpDto.FOutMaxQty,//出库上限
                    OutMinQty = erpDto.FOutMinQty,//出库下限
                    DeliveryLoc = erpDto.FDeliveryLoc,//交货地点
                    DeliverylAddress = erpDto.FDeliveryLAddress,//交货地址
                    SourceBillNo = erpDto.FSrcBillNo,//原单单号
                    OrderBillNo = erpDto.FOrderNo,//订单单号
                    TerminationStatus = erpDto.FTerminationStatus,//终止状态
                    TerminationDate = ParseDateTime(erpDto.FTerminateDate),//业务终止日期
                    SumOutQty = erpDto.FSumOutQty,//累计出库数量
                    RemainOutQty = erpDto.FRemainOutQty//未出库数量
                };
                var single = _SalesDeliveryDetailManager.GetSingle(it =>
                    it.ErpLineId == salesOrderSub.ErpLineId);
                if (single != null) salesOrderSub.Id = single.Id;
                salesOrderSubList.Add(salesOrderSub);
            }
            return salesOrderSubList;
        }
    }
}
MES.Service/service/BasicData/SalesOrderManager.cs
@@ -1,6 +1,10 @@
using MES.Service.DB;
using System.Data;
using System.Globalization;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
using DbType = System.Data.DbType;
namespace MES.Service.service.BasicData;
@@ -8,71 +12,195 @@
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
    //这里面写的代码不会给覆盖,如果要重新生成请删除 SalesOrderManager.cs
    #region æ•™å­¦æ–¹æ³•
    /// <summary>
    ///     ä»“储方法满足不了复杂业务需求,业务代码请在这里面定义方法
    /// </summary>
    public void Study()
    private readonly SalesOrderDetailManager _SalesOrderDetailManager =
        new();
    //ErpSalesOrder
    public bool Save(ErpSalesOrder SalesOrder)
    {
        /*********查询*********/
        var erpSalesOrderDto = SalesOrder.OrderDto;
        var mesSalesOrder = ConvertErpToSalesOrder(SalesOrder.OrderDto);
        var mesSalesOrderDatas = ConvertErpToSalesOrderDetail(SalesOrder.Items);
        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()); // åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        Console.Write(p.TotalCount); //返回总数
        var conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        conModels.Add(new ConditionalModel
        return UseTransaction(db =>
        {
            FieldName = typeof(SalesOrder).GetProperties()[0].Name,
            ConditionalType = ConditionalType.Equal, FieldValue = "1"
        }); //id=1
        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
        AsQueryable().Where(x => 1 == 1)
            .ToList(); //支持了转换成queryable,我们可以用queryable实现复杂功能
        /*********插入*********/
        var insertData = new SalesOrder(); //测试参数
        var insertArray = new[] { insertData };
        base.Insert(insertData); //插入
        base.InsertRange(insertArray); //批量插入
        var id = base.InsertReturnIdentity(insertData); //插入返回自增列
        AsInsertable(insertData).ExecuteCommand(); //我们可以转成 Insertable实现复杂插入
        /*********更新*********/
        var updateData = new SalesOrder(); //测试参数
        var updateArray = new[] { updateData }; //测试参数
        base.Update(updateData); //根据实体更新
        base.UpdateRange(updateArray); //批量更新
        //base.Update(it => new SalesOrder() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ›´æ–°ClassName列和CreateTime列,其它列不更新,条件id=1
        AsUpdateable(updateData).ExecuteCommand(); //转成Updateable可以实现复杂的插入
        /*********删除*********/
        var deldata = new SalesOrder(); //测试参数
        base.Delete(deldata); //根据实体删除
        base.DeleteById(1); //根据主键删除
        base.DeleteById(new[] { 1, 2 }); //根据主键数组删除
        base.Delete(it => 1 == 2); //根据条件删除
        AsDeleteable().Where(it => 1 == 2)
            .ExecuteCommand(); //转成Deleteable实现复杂的操作
            switch (erpSalesOrderDto.Type)
            {
                // case "2":
                //     return InsertData(db, mesSalesOrder, mesSalesOrderDatas,
                //         rohInErpRohIn.FBILLTYPE)
                //         ? 1
                //         : 0;
                case "3":
                    return UpdateData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
                case "2":
                case "4":
                    return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)
                        ? 1
                        : 0;
                default:
                    throw new NotImplementedException(
                        $"type没有{erpSalesOrderDto.Type}这个类型");
            }
        }) > 0;
    }
    #endregion
    private bool UpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,
        List<SalesOrderDetail> mesSalesOrderDatas)
    {
        var decimals = mesSalesOrderDatas.Select(s => s.Id).ToArray();
        var update = base.DeleteById(mesSalesOrder.Id);
        var insertOrUpdate = db
            .Deleteable<SalesOrderDetail>().In(decimals)
            .ExecuteCommand() > 0;
        if (update && insertOrUpdate) return true;
        throw new NotImplementedException("更新失败");
    }
    // æ’入或更新数据的方法
    private bool SaveOrUpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,
        List<SalesOrderDetail> mesSalesOrderDatas,string type)
    {
        if (mesSalesOrder.Id != null) base.DeleteById(mesSalesOrder.Id);
        if (mesSalesOrderDatas.Count > 0)
            db.Deleteable<SalesOrderDetail>()
                .Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
        var orUpdate = base.Insert(mesSalesOrder);
        var baOrUpdate = _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);
        if (orUpdate && baOrUpdate) return true;
        throw new NotImplementedException("插入或更新失败");
    }
    // æ‰¹é‡ä¿å­˜è®°å½•的方法
    public bool SaveList(List<ErpSalesOrder> salesOrder)
    {
        var result = salesOrder.Select(Save).ToList();
        return result.All(b => b);
    }
    private SalesOrder ConvertErpToSalesOrder(
        ErpSalesOrderDto erpDto)
    {
        DateTime parsedDate;
        // æ—¶é—´æ ¼å¼è½¬æ¢å‡½æ•°ï¼ŒERP时间格式为 "yyyy-MM-dd HH:mm:ss"
        DateTime? ParseDateTime(string dateStr)
        {
            if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
                    CultureInfo.InvariantCulture,
                    DateTimeStyles.None,
                    out parsedDate))
                return parsedDate;
            return null; // å¦‚果转换失败,返回null
        }
        var salesOrder = new SalesOrder
        {
            BillNo = erpDto.FBillNo,
            ErpID = Convert.ToDecimal(erpDto.ErpID),
            FDate = ParseDateTime(erpDto.FDate) ?? null,
            BillTypeId = erpDto.FBillTypeID, // å•据类型
            DocumentStatus = erpDto.FDocumentStatus, // å•据状态
            BusinessType = erpDto.FBusinessType, // ä¸šåŠ¡ç±»åž‹
            HeadDeliveryWay = erpDto.FHeadDeliveryWay, // äº¤è´§æ–¹å¼
            HeadLocId = erpDto.FHEADLOCID, // äº¤è´§åœ°ç‚¹
            UnWTextKhdd = erpDto.F_UNW_Text_KHDD, // å®¢æˆ·è®¢å•
            UnWDateKhxq = ParseDateTime(erpDto.F_UNW_Date_KHXQ) ?? null, // å®¢æˆ·éœ€æ±‚交期
            UnWBasePropertyKhdj = erpDto.F_UNW_BaseProperty_KHDJ, // å®¢æˆ·ç­‰çº§
            CustId = erpDto.FCustId, // å®¢æˆ·
            UnWLargetextTbkhbz = erpDto.F_UNW_LargeText_TBKHBZ, // æ·˜å®å®¢æˆ·å¤‡æ³¨
            CloseStatus = erpDto.FCloseStatus, // å…³é—­çŠ¶æ€
            SaleDeptId = erpDto.FSaleDeptId, // é”€å”®éƒ¨é—¨
            SalerId = erpDto.FSalerId, // é”€å”®å‘˜
            ChangeReason = erpDto.FChangeReason, // å˜æ›´åŽŸå› 
            Note = erpDto.FNote, // å¤‡æ³¨
            UnWRemarksKhjHdd = erpDto.F_UNW_Remarks_KHJHDD, // å®¢æˆ·äº¤è´§åœ°ç‚¹
            SettleId = erpDto.FSettleId, // ç»“ç®—æ–¹
            ApproverId = erpDto.FApproverId, // å®¡æ ¸äºº
            LinkMan = erpDto.FLinkMan, // æ”¶è´§äººå§“名
            ChargeId = erpDto.FChargeId, // ä»˜æ¬¾æ–¹
            LinkPhone = erpDto.FLinkPhone, // è”系电话
            CreatorId = erpDto.FCreatorId, // åˆ›å»ºäºº
            CreateDate = ParseDateTime(erpDto.FCreateDate) ?? null, // åˆ›å»ºæ—¥æœŸ
            ModifierId = erpDto.FModifierId, // æœ€åŽä¿®æ”¹äºº
            ModifyDate = ParseDateTime(erpDto.FModifyDate) ?? null, // æœ€åŽä¿®æ”¹æ—¥æœŸ
            ApproveDate = ParseDateTime(erpDto.FApproveDate) ?? null, // å®¡æ ¸æ—¥æœŸ
            CloserId = erpDto.FCloserId, // å…³é—­äºº
            CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // å…³é—­æ—¥æœŸ
            ChangeDate = ParseDateTime(erpDto.FChangeDate) ?? null, // å˜æ›´æ—¥æœŸ
            CancelStatus = erpDto.FCancelStatus, // ä½œåºŸçŠ¶æ€
            CancellerId = erpDto.FCancellerId, // ä½œåºŸäºº
            VersionNo = Convert.ToDouble(erpDto.FVersionNo), // ç‰ˆæœ¬å·
            ChangerId = erpDto.FChangerId, // å˜æ›´äºº
            EntryNote = erpDto.FEntryNote // å¤‡æ³¨
            //ParseDateTime() ?? null
            //long.Parse()
            //Convert.ToDecimal()
            //Convert.ToDouble()
        };
        var single = base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
        if (single != null) salesOrder.Id = single.Id;
        return salesOrder;
    }
    private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(
        List<ErpSalesOrderDetailDto> erpDtoList)
    {
        var salesOrderSubList =
            new List<SalesOrderDetail>();
        foreach (var erpDto in erpDtoList)
        {
            var salesOrderSub = new SalesOrderDetail
            {
                ErpID = Convert.ToDecimal(erpDto.ErpID),
                EHID = Convert.ToDecimal(erpDto.EHID),
                MaterialId = erpDto.FMaterialId,
                UnitId = erpDto.FUnitID,
                Qty = Convert.ToDecimal(erpDto.FQty),
                PriceUnitId = erpDto.FPriceUnitId,
                PriceUnitQty = Convert.ToDecimal(erpDto.FPriceUnitQty),
                DeliveryDate = Convert.ToDateTime(erpDto.FDeliveryDate),
                IsFree = erpDto.FIsFree,
                SalesOrderNo = erpDto.F_UNW_Text_xsddh,
                SalesFollowUp = erpDto.F_UNW_Base_GDY,
                OwnerTypeId = erpDto.FOwnerTypeId,
                OwnerId = erpDto.FOwnerId,
                EntryNote = erpDto.FEntryNote,
                MtoNo = erpDto.FMtoNo,
                Lot = erpDto.FLot,
                DeliveryMaxQty = Convert.ToDecimal(erpDto.FDeliveryMaxQty),
                DeliveryMinQty = Convert.ToDecimal(erpDto.FDeliveryMinQty),
                OutLmtUnitId = erpDto.FOutLmtUnitID,
                MrpCloseStatus = erpDto.FMrpCloseStatus,
                MrpTerminateStatus = erpDto.FMrpTerminateStatus,
                TerminateDate = Convert.ToDateTime(erpDto.FTerminateDate),
                TerminaterId = erpDto.FTerminatorId,
                SrcType = erpDto.FSrcType,
                SrcBillNo = erpDto.FSrcBillNo,
                DeliQty = Convert.ToDecimal(erpDto.FDeliQty),
                StockOutQty = Convert.ToDecimal(erpDto.FStockOutQty),
                BaseRetNoticeQty = Convert.ToDecimal(erpDto.FBaseRetNoticeQty),
                BaseReturnQty = Convert.ToDecimal(erpDto.FBaseReturnQty),
                BaseRemainOutQty = Convert.ToDecimal(erpDto.FBaseRemainOutQty),
                BASEARQTY = Convert.ToDecimal(erpDto.FBASEARQTY),
            };
            var single = _SalesOrderDetailManager.GetSingle(it =>
                it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
            if (single != null) salesOrderSub.Id = single.Id;
            salesOrderSubList.Add(salesOrderSub);
        }
        return salesOrderSubList;
    }
}
MES.Service/service/BasicData/SalesReturnNoticeDetailManager.cs
@@ -5,7 +5,7 @@
namespace MES.Service.service.BasicData;
public class
    SalesReturnNoticeDetailManager : Repository<SalesReturnNoticeDetail>
    SalesReturnDetailManager : Repository<SalesReturnNoticeDetail>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
MES.Service/service/BasicData/SalesReturnNoticeManager.cs
@@ -1,6 +1,10 @@
using MES.Service.DB;
using System.Data;
using System.Globalization;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
using DbType = System.Data.DbType;
namespace MES.Service.service.BasicData;
@@ -8,71 +12,201 @@
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
    //这里面写的代码不会给覆盖,如果要重新生成请删除 SalesReturnNoticeManager.cs
    #region æ•™å­¦æ–¹æ³•
    /// <summary>
    ///     ä»“储方法满足不了复杂业务需求,业务代码请在这里面定义方法
    /// </summary>
    public void Study()
    private readonly SalesReturnDetailManager _SalesReturnDetailManager =
        new();
    //ErpSalesRerurn
    public bool Save(ErpSalesRerurn SalesReturn)
    {
        /*********查询*********/
        var erpSalesReturnDto = SalesReturn.OrderDto;
        var mesSalesReturn = ConvertErpToSalesReturn(SalesReturn.OrderDto);
        var mesSalesReturnDatas = ConvertErpToSalesReturnDetail(SalesReturn.Items);
        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()); // åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        Console.Write(p.TotalCount); //返回总数
        var conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        conModels.Add(new ConditionalModel
        return UseTransaction(db =>
        {
            FieldName = typeof(SalesReturnNotice).GetProperties()[0].Name,
            ConditionalType = ConditionalType.Equal, FieldValue = "1"
        }); //id=1
        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
        AsQueryable().Where(x => 1 == 1)
            .ToList(); //支持了转换成queryable,我们可以用queryable实现复杂功能
        /*********插入*********/
        var insertData = new SalesReturnNotice(); //测试参数
        var insertArray = new[] { insertData };
        base.Insert(insertData); //插入
        base.InsertRange(insertArray); //批量插入
        var id = base.InsertReturnIdentity(insertData); //插入返回自增列
        AsInsertable(insertData).ExecuteCommand(); //我们可以转成 Insertable实现复杂插入
        /*********更新*********/
        var updateData = new SalesReturnNotice(); //测试参数
        var updateArray = new[] { updateData }; //测试参数
        base.Update(updateData); //根据实体更新
        base.UpdateRange(updateArray); //批量更新
        //base.Update(it => new SalesReturnNotice() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ›´æ–°ClassName列和CreateTime列,其它列不更新,条件id=1
        AsUpdateable(updateData).ExecuteCommand(); //转成Updateable可以实现复杂的插入
        /*********删除*********/
        var deldata = new SalesReturnNotice(); //测试参数
        base.Delete(deldata); //根据实体删除
        base.DeleteById(1); //根据主键删除
        base.DeleteById(new[] { 1, 2 }); //根据主键数组删除
        base.Delete(it => 1 == 2); //根据条件删除
        AsDeleteable().Where(it => 1 == 2)
            .ExecuteCommand(); //转成Deleteable实现复杂的操作
            switch (erpSalesReturnDto.Type)
            {
                // case "2":
                //     return InsertData(db, mesSalesReturn, mesSalesReturnDatas,
                //         rohInErpRohIn.FBILLTYPE)
                //         ? 1
                //         : 0;
                case "3":
                    return UpdateData(db, mesSalesReturn, mesSalesReturnDatas) ? 1 : 0;
                case "2":
                case "4":
                    return SaveOrUpdateData(db, mesSalesReturn, mesSalesReturnDatas, erpSalesReturnDto.Type)
                        ? 1
                        : 0;
                default:
                    throw new NotImplementedException(
                        $"type没有{erpSalesReturnDto.Type}这个类型");
            }
        }) > 0;
    }
    #endregion
    private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
        List<SalesReturnNoticeDetail> mesSalesReturnDatas)
    {
        var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
        var update = base.DeleteById(mesSalesReturn.Id);
        var insertOrUpdate = db
            .Deleteable<SalesReturnNoticeDetail>().In(decimals)
            .ExecuteCommand() > 0;
        if (update && insertOrUpdate) return true;
        throw new NotImplementedException("更新失败");
    }
    // æ’入或更新数据的方法
    private bool SaveOrUpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
        List<SalesReturnNoticeDetail> mesSalesReturnDatas,string type)
    {
        if (mesSalesReturn.Id != null) base.DeleteById(mesSalesReturn.Id);
        if (mesSalesReturnDatas.Count > 0)
            db.Deleteable<SalesReturnNoticeDetail>()
                .Where(s => s.ErpHeadId == mesSalesReturn.ErpId).ExecuteCommand();
        var orUpdate = base.Insert(mesSalesReturn);
        var baOrUpdate = _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
        if (orUpdate && baOrUpdate) return true;
        throw new NotImplementedException("插入或更新失败");
    }
    // æ‰¹é‡ä¿å­˜è®°å½•的方法
    public bool SaveList(List<ErpSalesRerurn> salesOrder)
    {
        var result = salesOrder.Select(Save).ToList();
        return result.All(b => b);
    }
    private SalesReturnNotice ConvertErpToSalesReturn(
        ErpSalesReturnDto erpDto)
    {
        DateTime parsedDate;
        // æ—¶é—´æ ¼å¼è½¬æ¢å‡½æ•°ï¼ŒERP时间格式为 "yyyy-MM-dd HH:mm:ss"
        DateTime? ParseDateTime(string dateStr)
        {
            if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
                    CultureInfo.InvariantCulture,
                    DateTimeStyles.None,
                    out parsedDate))
                return parsedDate;
            return null; // å¦‚果转换失败,返回null
        }
        var salesOrder = new SalesReturnNotice
        {
            BillNo = erpDto.FBillNo,
            ErpId = erpDto.ErpID,
            FDate = ParseDateTime(erpDto.FDate) ?? null,
            BillType = erpDto.FBillTypeID, // å•据类型
            Currency = erpDto.FSettleCurrld, // ç»“算币别
            SalesDept = erpDto.FSaleDeptId, //销售部门
            ReturnCustomer = erpDto.FRetcustId, // é€€è´§å®¢æˆ·
            TaobaoRemark = erpDto.F_UNW_LargeText_TBKHBZ, // æ·˜å®å®¢æˆ·å¤‡æ³¨
            ReturnReason = erpDto.FRetcustReason, // é€€è´§åŽŸå› 
            DeliveryLocation = erpDto.FHeadLocId, // äº¤è´§åœ°ç‚¹
            InventoryDept = erpDto.FRetDeptId, // åº“存部门
            InventoryGroup = erpDto.FStockerGroupId, // åº“存组
            WarehouseManager = erpDto.FStockerId, // ä»“管员
            SalesGroup = erpDto.FSaleGroupId, // é”€å”®ç»„
            SalesPerson = erpDto.FSalesManId,//销售员
            ExpressNo = erpDto.F_UNW_Text_KDDH, // å¿«é€’单号
            Receiver = erpDto.FReceiveCusId, // æ”¶è´§æ–¹
            ReceiverContact = erpDto.FReceiveCusContact, // æ”¶è´§æ–¹è”系人
            ReceiverAddress = erpDto.FReceiveAddress, // æ”¶è´§æ–¹åœ°å€
            ReceiverName = erpDto.FLinkMan, // æ”¶è´§æ–¹å§“名
            SettleParty = erpDto.FSettleCurrld, // ç»“ç®—æ–¹
            CreatedBy = erpDto.FCreatorId, // åˆ›å»ºäºº
            CreatedDate = ParseDateTime(erpDto.FCreateDate) ?? null, // åˆ›å»ºæ—¶é—´
            ModifiedBy = erpDto.FModifierId, // ä¿®æ”¹äºº
            ModifiedDate = ParseDateTime(erpDto.FModifyDate) ?? null, // ä¿®æ”¹æ—¶é—´
            ClosedBy = erpDto.FCloserId, // å…³é—­äºº
            CloseReason = erpDto.FCloseReason, // å…³é—­åŽŸå› 
            CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // å…³é—­æ—¥æœŸ
            ApprovedBy = erpDto.FApproverId, // å®¡æ ¸äºº
            ApprovedDate = ParseDateTime(erpDto.FApproveDate) ?? null, // å®¡æ ¸æ—¥æœŸ
            CancelStatus = erpDto.FCancelStatus, // ä½œåºŸçŠ¶æ€
            CancelledBy = erpDto.FCancellerId, // ä½œåºŸäºº
            CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // ä½œåºŸæ—¥æœŸ
            CloseStatus = erpDto.FBillCloseStatus, // å…³é—­çŠ¶æ€
            BillStatus  = erpDto.FDocumentStatus //单据状态
        };
        var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
        if (single != null) salesOrder.Id = single.Id;
        return salesOrder;
    }
    private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(
        List<ErpSalesReturnDetailDto> erpDtoList)
    {
        var salesOrderSubList =
            new List<SalesReturnNoticeDetail>();
        DateTime parsedDate;
        // æ—¶é—´æ ¼å¼è½¬æ¢å‡½æ•°ï¼ŒERP时间格式为 "yyyy-MM-dd HH:mm:ss"
        DateTime? ParseDateTime(string dateStr)
        {
            if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
                    CultureInfo.InvariantCulture,
                    DateTimeStyles.None,
                    out parsedDate))
                return parsedDate;
            return null; // å¦‚果转换失败,返回null
        }
        foreach (var erpDto in erpDtoList)
        {
            var salesOrderSub = new SalesReturnNoticeDetail
            {
                ErpLineId = erpDto.ErpID,//ERP行ID
                ErpHeadId = erpDto.EHID,//ERP头ID
                SalesOrderId = erpDto.F_UNW_Text_xsddh,//销售订单号
                MaterialId = erpDto.FMaterialId,//物料编号
                MaterialName = erpDto.FMaterialName,// ç‰©æ–™åç§°
                MaterialSpecification = erpDto.FMaterialModel,//规格型号
                SalesUnitId = erpDto.FUnitID,//销售单位
                SalesQuantity = Convert.ToDecimal(erpDto.FQty),//销售数量
                IsFree = erpDto.FIsFree,//是否赠品
                ReturnDate = ParseDateTime(erpDto.FDeliverydate),//退货日期
                Warehouse = erpDto.FStockId,//仓库
                PlanTrackingNumber = erpDto.FMtoNo,//计划跟踪号
                LotNumber = erpDto.FLot,//批号
                Note = erpDto.FEntryDescription,//备注
                ReturnType = erpDto.FRmType,//退货类型
                SalesClerk = erpDto.F_UNW_Base_GDY,//跟单员
                InventoryUnit = erpDto.FStockUnitID,//库存单位
                InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty),//库存数量
                MaterialCategory = erpDto.FMaterialType,//物料类别
                OwnerTypeId = erpDto.FOwnerTypeID,//货主类型
                OwnerId = erpDto.FOwnerId,//货主
                SourceBillType = erpDto.FSrcType,
                SourceBillNo = erpDto.FSrcBillNo,
                OrderBillNo = erpDto.FOrderNo
            };
            var single = _SalesReturnDetailManager.GetSingle(it =>
                it.ErpLineId == salesOrderSub.ErpLineId);
            if (single != null) salesOrderSub.Id = single.Id;
            salesOrderSubList.Add(salesOrderSub);
        }
        return salesOrderSubList;
    }
}
MESApplication/Controllers/BasicData/SalesDeliveryNoticeController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,271 @@
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.service.BasicData;
using MES.Service.Dto.webApi;
using Newtonsoft.Json;
namespace MESApplication.Controllers
{
    [ApiController]
    [Route("api/[controller]")]
    public class SalesDeliveryNoticeController : ControllerBase
    {
        private readonly MessageCenterManager _manager = new();
        private SalesDeliveryNoticeManager m = new SalesDeliveryNoticeManager();
        private readonly string METHOD = "POST";
        private readonly string TableName = "SALES_DELIVERY_NOTICE";
        private readonly string URL = "http://localhost:10054/api/SalesDeliveryNotice/";
        //
        [HttpPost("Save")]
        public ResponseResult Save(ErpSalesDelivery salesOrder)
        {
            var entity = new MessageCenter();
            entity.TableName = TableName;
            entity.Url = URL + "Save";
            entity.Method = METHOD;
            entity.Data = JsonConvert.SerializeObject(salesOrder);
            entity.Status = 1;
            entity.CreateBy = "PL017";
            try
            {
                dynamic resultInfos = new ExpandoObject();
                var save = m.Save(salesOrder);
                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<ErpSalesDelivery> 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);
            }
        }
        /***进入模版管理可以修改模版***/
        /// <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] SalesDeliveryNotice 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] SalesDeliveryNotice 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] SalesDeliveryNotice 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/Controllers/BasicData/SalesDeliveryNoticeDetailController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,169 @@
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;
namespace MESApplication.Controllers
{
    [ApiController]
    [Route("api/[controller]")]
    public class SalesDeliveryNoticeDetailController : ControllerBase
    {
        private SalesDeliveryNoticeDetailManager m = new SalesDeliveryNoticeDetailManager();
        /***进入模版管理可以修改模版***/
        /// <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] SalesDeliveryNoticeDetail 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] SalesDeliveryNoticeDetail 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] SalesDeliveryNoticeDetail 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/Controllers/BasicData/SalesOrderController.cs
@@ -1,5 +1,8 @@
using System.Dynamic;
using MES.Service.Dto.webApi;
using Newtonsoft.Json;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
@@ -10,10 +13,105 @@
[Route("api/[controller]")]
public class SalesOrderController : ControllerBase
{
    private readonly MessageCenterManager _manager = new();
    private readonly SalesOrderManager m = new();
    private readonly string METHOD = "POST";
    /***进入模版管理可以修改模版***/
    private readonly string TableName = "SALES_ORDER";
    private readonly string URL =
        "http://localhost:10054/api/SalesOrder/";
    //
    [HttpPost("Save")]
    public ResponseResult Save(ErpSalesOrder salesOrder)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "Save";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(salesOrder);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.Save(salesOrder);
            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<ErpSalesOrder> 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);
        }
    }
    /// <summary>
    ///     èŽ·å–æ‰€æœ‰
MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs
@@ -1,8 +1,11 @@
using System.Dynamic;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
namespace MESApplication.Controllers.BasicData;
@@ -10,8 +13,109 @@
[Route("api/[controller]")]
public class SalesReturnNoticeController : ControllerBase
{
   private readonly MessageCenterManager _manager = new();
    private readonly SalesReturnNoticeManager m = new();
    private readonly string METHOD = "POST";
    private readonly string TableName = "SALES_RETURN_NOTICE";
    private readonly string URL = "http://localhost:10054/api/SalesReturnNotice/";
    //
    [HttpPost("Save")]
    public ResponseResult Save(ErpSalesRerurn salesOrder)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "Save";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(salesOrder);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.Save(salesOrder);
            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<ErpSalesRerurn> 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);
        }
    }
    /***进入模版管理可以修改模版***/
MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs
@@ -8,9 +8,9 @@
[ApiController]
[Route("api/[controller]")]
public class SalesReturnNoticeDetailController : ControllerBase
public class SalesReturnDetailController : ControllerBase
{
    private readonly SalesReturnNoticeDetailManager m = new();
    private readonly SalesReturnDetailManager m = new();
    /***进入模版管理可以修改模版***/
MESApplication/MESApplication.csproj.user
@@ -5,6 +5,6 @@
  </PropertyGroup>
  <PropertyGroup>
    <ActiveDebugProfile>IIS Express</ActiveDebugProfile>
    <NameOfLastUsedPublishProfile>E:\Tool\LTS\PDA_NEW\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>F:\F盘桌面专属\项目代码管理文件夹\泰莱姆项目1\TLM\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
  </PropertyGroup>
</Project>
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,8 +4,8 @@
-->
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>E:\Tool\LTS\PDA_NEW\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
    <History>True|2024-12-28T01:06:17.0669698Z||;True|2024-12-26T14:45:42.2002555+08:00||;True|2024-12-26T13:03:07.9325085+08:00||;True|2024-12-26T11:43:04.0852484+08:00||;True|2024-12-21T22:33:39.6121285+08:00||;True|2024-12-16T14:40:36.9800141+08:00||;True|2024-12-14T16:23:42.9536129+08:00||;True|2024-12-11T15:50:13.8959852+08:00||;True|2024-12-11T10:47:42.1561088+08:00||;True|2024-12-08T18:32:27.3909077+08:00||;True|2024-12-06T16:30:29.0031886+08:00||;True|2024-12-05T16:20:00.9907217+08:00||;True|2024-12-05T16:19:41.4441561+08:00||;True|2024-12-05T16:19:22.9404769+08:00||;True|2024-12-05T11:07:30.6547548+08:00||;True|2024-12-03T17:12:24.9349522+08:00||;True|2024-11-27T11:05:24.9761937+08:00||;True|2024-11-19T08:57:10.9008301+08:00||;True|2024-11-18T21:02:57.0481324+08:00||;True|2024-11-05T17:25:48.6360448+08:00||;True|2024-11-05T17:16:08.2144948+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
    <_PublishTargetUrl>F:\F盘桌面专属\项目代码管理文件夹\泰莱姆项目1\TLM\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
    <History>True|2025-02-12T10:28:32.5741267Z;True|2024-12-28T09:06:17.0669698+08:00;True|2024-12-26T14:45:42.2002555+08:00;True|2024-12-26T13:03:07.9325085+08:00;True|2024-12-26T11:43:04.0852484+08:00;True|2024-12-21T22:33:39.6121285+08:00;True|2024-12-16T14:40:36.9800141+08:00;True|2024-12-14T16:23:42.9536129+08:00;True|2024-12-11T15:50:13.8959852+08:00;True|2024-12-11T10:47:42.1561088+08:00;True|2024-12-08T18:32:27.3909077+08:00;True|2024-12-06T16:30:29.0031886+08:00;True|2024-12-05T16:20:00.9907217+08:00;True|2024-12-05T16:19:41.4441561+08:00;True|2024-12-05T16:19:22.9404769+08:00;True|2024-12-05T11:07:30.6547548+08:00;True|2024-12-03T17:12:24.9349522+08:00;True|2024-11-27T11:05:24.9761937+08:00;True|2024-11-19T08:57:10.9008301+08:00;True|2024-11-18T21:02:57.0481324+08:00;True|2024-11-05T17:25:48.6360448+08:00;True|2024-11-05T17:16:08.2144948+08:00;True|2024-10-28T11:56:24.2694762+08:00;True|2024-10-28T11:40:56.4512491+08:00;True|2024-10-28T11:28:42.4509497+08:00;True|2024-10-28T11:11:11.1286907+08:00;True|2024-10-28T10:09:42.4378313+08:00;True|2024-10-28T09:57:51.0792947+08:00;True|2024-10-23T17:07:23.7741858+08:00;True|2024-10-22T14:34:55.4526970+08:00;True|2024-10-17T16:37:53.4763504+08:00;True|2024-10-13T14:04:45.3666662+08:00;True|2024-10-13T12:30:16.7294894+08:00;True|2024-10-13T12:22:13.5740642+08:00;True|2024-09-26T17:43:56.9592414+08:00;True|2024-09-25T09:56:59.0722612+08:00;True|2024-09-20T16:35:40.9416105+08:00;True|2024-09-13T15:42:08.2824743+08:00;True|2024-08-20T17:12:00.2924570+08:00;True|2024-08-17T10:57:05.6670396+08:00;True|2024-08-17T10:56:46.8068041+08:00;True|2024-08-16T14:09:17.0526491+08:00;True|2024-08-15T08:40:32.8134665+08:00;True|2024-08-14T10:00:27.7017207+08:00;True|2024-08-14T08:54:44.8284031+08:00;True|2024-08-07T10:32:10.3689256+08:00;True|2024-08-05T15:45:03.0864530+08:00;True|2024-08-03T09:59:13.7916520+08:00;True|2024-07-31T17:27:28.1965929+08:00;True|2024-07-31T15:27:34.7943845+08:00;True|2024-07-30T15:04:50.5849235+08:00;True|2024-07-30T14:09:06.2877325+08:00;True|2024-07-29T16:11:30.4493940+08:00;True|2024-07-23T14:30:34.4591002+08:00;True|2024-07-22T14:17:39.8186158+08:00;True|2024-04-10T12:55:31.3963752+08:00;True|2024-04-08T13:59:25.5487203+08:00;True|2024-04-06T09:30:09.5350539+08:00;True|2024-04-06T08:46:05.8814658+08:00;True|2024-04-05T14:06:52.0448024+08:00;True|2024-04-05T12:47:46.0561601+08:00;True|2024-02-26T08:46:22.0988887+08:00;True|2024-02-24T19:17:13.6770376+08:00;True|2024-02-24T14:32:37.4450337+08:00;True|2024-02-23T10:22:06.5150173+08:00;True|2024-02-22T13:19:56.6997993+08:00;True|2024-02-22T10:53:17.7929585+08:00;True|2024-02-21T17:08:06.5553444+08:00;True|2024-02-19T16:24:37.4912012+08:00;True|2024-02-02T10:07:23.2726075+08:00;True|2024-02-02T08:36:49.2904460+08:00;True|2024-01-29T17:44:43.6800769+08:00;True|2024-01-23T09:47:26.7811926+08:00;True|2024-01-18T16:23:30.3373836+08:00;True|2024-01-17T14:22:04.2552286+08:00;True|2024-01-16T16:54:42.2316892+08:00;True|2024-01-16T16:37:23.8028858+08:00;True|2024-01-16T09:25:24.4007775+08:00;True|2024-01-15T10:18:57.3362616+08:00;True|2024-01-15T10:07:14.2044763+08:00;True|2024-01-10T14:03:36.4451130+08:00;True|2024-01-09T16:45:32.9601815+08:00;True|2024-01-06T14:16:34.2732220+08:00;True|2024-01-06T14:11:45.2134717+08:00;True|2024-01-06T11:30:58.9198887+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>
MESApplication/bin/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.deps.json
@@ -1412,10 +1412,7 @@
          "SqlSugarCore": "5.1.4.158"
        },
        "runtime": {
          "MES.Service.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.0.0"
          }
          "MES.Service.dll": {}
        }
      }
    }
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.deps.json
@@ -1160,10 +1160,7 @@
          "SqlSugarCore": "5.1.4.158"
        },
        "runtime": {
          "MES.Service.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.0.0"
          }
          "MES.Service.dll": {}
        }
      }
    }
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