zyf
2025-08-09 50dbc470a87899ba07a42206f8c28e754baa3f60
完成销售订单、销售退货、销售出库接口
已重命名3个文件
已修改9个文件
已删除22个文件
已添加20个文件
5875 ■■■■■ 文件已修改
MES.Service/Dto/webApi/ErpSalesDeliveryNotice.cs 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesDeliveryNoticeDetail.cs 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesOrder.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesOrderDetail.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesReturnNotice.cs 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesReturnNoticeDetail.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/SaleDeliveryNotice.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/SaleReturnNotice.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/SalesDeliveryNotice/ErpSalesDelivery.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/SalesDeliveryNotice/ErpSalesDeliveryDetailDto.cs 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/SalesDeliveryNotice/ErpSalesDeliveryDto.cs 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/SalesOrder/ErpSalesOrdeDetailDto.cs 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/SalesOrder/ErpSalesOrder.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/SalesOrder/ErpSalesOrderDto.cs 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/SalesOrders.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/SalesReturnNotice/ErpSalesReturn.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/SalesReturnNotice/ErpSalesReturnDetailDto.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/SalesReturnNotice/ErpSalesReturnDto.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesDeliveryNotice.cs 276 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesDeliveryNotice/SalesDeliveryNotice.cs 209 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesDeliveryNotice/SalesDeliveryNoticeDetail.cs 144 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesDeliveryNoticeDetail.cs 211 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesOrder.cs 210 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesOrder/SalesOrder.cs 204 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesOrder/SalesOrderDetail.cs 186 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesOrderDetail.cs 210 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesReturnNotice.cs 258 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesReturnNotice/SalesReturnNotice.cs 189 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesReturnNotice/SalesReturnNoticeDetail.cs 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesReturnNoticeDetail.cs 161 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Debug/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Debug/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/SalesDeliveryNoticeDetailManager.cs 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs 262 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/SalesOrderManager.cs 264 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/SalesReturnNoticeManager.cs 257 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/SaleDeliveryNotice/SalesDeliveryNoticeDetailManager.cs 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/SaleDeliveryNotice/SalesDeliveryNoticeManager.cs 257 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/SalesOrder/SalesOrderManager.cs 210 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/SalesReturnNotice/SalesReturnNoticeDetailManager.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/SalesReturnNotice/SalesReturnNoticeManager.cs 234 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/BasicData/SalesDeliveryNoticeController.cs 278 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/BasicData/SalesDeliveryNoticeDetailController.cs 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/SalesDeliveryNotice/SalesDeliveryNoticeController.cs 272 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/SalesOrder/SalesOrderController.cs 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/SalesReturnNotice/SalesReturnNoticeController.cs 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.deps.json 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.xml 331 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpSalesDeliveryNotice.cs
ÎļþÒÑɾ³ý
MES.Service/Dto/webApi/ErpSalesDeliveryNoticeDetail.cs
ÎļþÒÑɾ³ý
MES.Service/Dto/webApi/ErpSalesOrder.cs
ÎļþÒÑɾ³ý
MES.Service/Dto/webApi/ErpSalesOrderDetail.cs
ÎļþÒÑɾ³ý
MES.Service/Dto/webApi/ErpSalesReturnNotice.cs
ÎļþÒÑɾ³ý
MES.Service/Dto/webApi/ErpSalesReturnNoticeDetail.cs
ÎļþÒÑɾ³ý
MES.Service/Dto/webApi/SaleDeliveryNotice.cs
ÎļþÒÑɾ³ý
MES.Service/Dto/webApi/SaleReturnNotice.cs
ÎļþÒÑɾ³ý
MES.Service/Dto/webApi/SalesDeliveryNotice/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/SalesDeliveryNotice/ErpSalesDeliveryDetailDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
using MES.Service.Modes;
namespace MES.Service.Dto.webApi;
using MES.Service.Modes.SalesDeliveryNotice;
public class ErpSalesDeliveryDetailDto : SalesDeliveryNoticeDetail
{
   /* 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
    public string? FEntrynote { get; set; }  // å¤‡æ³¨*/
}
MES.Service/Dto/webApi/SalesDeliveryNotice/ErpSalesDeliveryDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,47 @@
using MES.Service.Modes;
using MES.Service.Modes.SalesDeliveryNotice;
namespace MES.Service.Dto.webApi;
public class ErpSalesDeliveryDto : SalesDeliveryNotice
{
    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/SalesOrder/ErpSalesOrdeDetailDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
using MES.Service.Modes;
namespace MES.Service.Dto.webApi;
public class ErpSalesOrderDetailDto : SalesOrderDetail
{/*
    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
    public string? FCUST_INO { get; set; }  // å®¢æˆ·ç‰©æ–™ç¼–码
    public string? FCUST_INM { get; set; }  // å®¢æˆ·ç‰©æ–™åç§°
    public string? FCUST_IMD { get; set; }  // å®¢æˆ·ç‰©æ–™è§„æ ¼*/
}
MES.Service/Dto/webApi/SalesOrder/ErpSalesOrder.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
using MES.Service.Modes;
namespace MES.Service.Dto.webApi;
public class ErpSalesOrder
{
    public ErpSalesOrderDto OrderDto { get; set; }
    public List<SalesOrderDetail> Items { get; set; }
}
MES.Service/Dto/webApi/SalesOrder/ErpSalesOrderDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
using MES.Service.Modes;
namespace MES.Service.Dto.webApi;
public class ErpSalesOrderDto : SalesOrder
{
    public string? Type { get; set; }
    /*
    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; } // å¤‡æ³¨
    public string? FBILLTYPE { get; set; } // å•据类型 A新增 B变更*/
}
MES.Service/Dto/webApi/SalesOrders.cs
ÎļþÒÑɾ³ý
MES.Service/Dto/webApi/SalesReturnNotice/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/SalesReturnNotice/ErpSalesReturnDetailDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
using MES.Service.Modes;
namespace MES.Service.Dto.webApi;
public class ErpSalesReturnDetailDto : SalesReturnNoticeDetail
{
    /*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/SalesReturnNotice/ErpSalesReturnDto.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
using MES.Service.Modes;
namespace MES.Service.Dto.webApi;
public class ErpSalesReturnDto : SalesReturnNotice
{
    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; } // å•据状态
    public string? F_UNW_Text_THYY { get; set; } // é€€è´§åŽŸå› */
}
MES.Service/Modes/SalesDeliveryNotice.cs
ÎļþÒÑɾ³ý
MES.Service/Modes/SalesDeliveryNotice/SalesDeliveryNotice.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,209 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes.SalesDeliveryNotice
{
    /// <summary>
    ///
    ///</summary>
    [SugarTable("SALES_DELIVERY_NOTICE")]
    public class SalesDeliveryNotice
    {
        /// <summary>
        ///
        ///</summary>
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_DELIVERY", IsPrimaryKey = true)]
        public decimal? Id { get; set; }
        /// <summary>
        /// ERP ID
        ///</summary>
        [SugarColumn(ColumnName = "ERPID")]
        public decimal? Erpid { get; set; }
        /// <summary>
        /// å•据类型
        ///</summary>
        [SugarColumn(ColumnName = "FBILLTYPEID")]
        public string? Fbilltypeid { get; set; }
        /// <summary>
        /// å•据编号
        ///</summary>
        [SugarColumn(ColumnName = "FBILLNO")]
        public string? Fbillno { get; set; }
        /// <summary>
        /// æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FDATE")]
        public DateTime? Fdate { get; set; }
        /// <summary>
        /// ç»“算币别
        ///</summary>
        [SugarColumn(ColumnName = "FSETTLECURRID")]
        public string? Fsettlecurrid { get; set; }
        /// <summary>
        /// é”€å”®ç»„织
        ///</summary>
        [SugarColumn(ColumnName = "FSALEORGID")]
        public string? Fsaleorgid { get; set; }
        /// <summary>
        /// é”€å”®éƒ¨é—¨
        ///</summary>
        [SugarColumn(ColumnName = "FSALEDEPTID")]
        public string? Fsaledeptid { get; set; }
        /// <summary>
        /// å®¢æˆ·
        ///</summary>
        [SugarColumn(ColumnName = "FCUSTOMERID")]
        public string? Fcustomerid { get; set; }
        /// <summary>
        /// äº¤è´§æ–¹å¼
        ///</summary>
        [SugarColumn(ColumnName = "FHEADDELIVERYWAY")]
        public string? Fheaddeliveryway { get; set; }
        /// <summary>
        /// äº¤è´§åœ°ç‚¹
        ///</summary>
        [SugarColumn(ColumnName = "FHEADLOCID")]
        public string? Fheadlocid { get; set; }
        /// <summary>
        /// æ‰¿è¿å•†
        ///</summary>
        [SugarColumn(ColumnName = "FCARRIERID")]
        public string? Fcarrierid { get; set; }
        /// <summary>
        /// è¿è¾“单号
        ///</summary>
        [SugarColumn(ColumnName = "FCARRIAGENO")]
        public string? Fcarriageno { get; set; }
        /// <summary>
        /// å•据状态
        ///</summary>
        [SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
        public string? Fdocumentstatus { get; set; }
        /// <summary>
        /// å‘货组织
        ///</summary>
        [SugarColumn(ColumnName = "FDELIVERYORGID")]
        public string? Fdeliveryorgid { get; set; }
        /// <summary>
        /// å‘货部门
        ///</summary>
        [SugarColumn(ColumnName = "FDELIVERYDEPTID")]
        public string? Fdeliverydeptid { get; set; }
        /// <summary>
        /// åº“存组
        ///</summary>
        [SugarColumn(ColumnName = "FSTOCKERGROUPID")]
        public string? Fstockergroupid { get; set; }
        /// <summary>
        /// ä»“管员
        ///</summary>
        [SugarColumn(ColumnName = "FSTOCKERID")]
        public string? Fstockerid { get; set; }
        /// <summary>
        /// é”€å”®ç»„
        ///</summary>
        [SugarColumn(ColumnName = "FSALEGROUPID")]
        public string? Fsalegroupid { get; set; }
        /// <summary>
        /// é”€å”®å‘˜
        ///</summary>
        [SugarColumn(ColumnName = "FSALESMANID")]
        public string? Fsalesmanid { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹
        ///</summary>
        [SugarColumn(ColumnName = "FRECEIVERID")]
        public string? Freceiverid { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹è”系人
        ///</summary>
        [SugarColumn(ColumnName = "FRECEIVERCONTACTID")]
        public string? Freceivercontactid { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹åœ°å€
        ///</summary>
        [SugarColumn(ColumnName = "FRECEIVEADDRESS")]
        public string? Freceiveaddress { get; set; }
        /// <summary>
        /// æ”¶è´§äººå§“名
        ///</summary>
        [SugarColumn(ColumnName = "FLINKMAN")]
        public string? Flinkman { get; set; }
        /// <summary>
        /// è”系电话
        ///</summary>
        [SugarColumn(ColumnName = "FLINKPHONE")]
        public string? Flinkphone { get; set; }
        /// <summary>
        /// ç»“ç®—æ–¹
        ///</summary>
        [SugarColumn(ColumnName = "FSETTLEID")]
        public string? Fsettleid { get; set; }
        /// <summary>
        /// ä»˜æ¬¾æ–¹
        ///</summary>
        [SugarColumn(ColumnName = "FPAYERID")]
        public string? Fpayerid { get; set; }
        /// <summary>
        /// åˆ›å»ºäºº
        ///</summary>
        [SugarColumn(ColumnName = "FCREATORID")]
        public string? Fcreatorid { get; set; }
        /// <summary>
        /// åˆ›å»ºæ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FCREATEDATE")]
        public DateTime? Fcreatedate { get; set; }
        /// <summary>
        /// æœ€åŽä¿®æ”¹äºº
        ///</summary>
        [SugarColumn(ColumnName = "FMODIFIERID")]
        public string? Fmodifierid { get; set; }
        /// <summary>
        /// æœ€åŽä¿®æ”¹æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FMODIFYDATE")]
        public DateTime? Fmodifydate { get; set; }
        /// <summary>
        /// å®¡æ ¸äºº
        ///</summary>
        [SugarColumn(ColumnName = "FAPPROVERID")]
        public string? Fapproverid { get; set; }
        /// <summary>
        /// å®¡æ ¸æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FAPPROVEDATE")]
        public DateTime? Fapprovedate { get; set; }
        /// <summary>
        /// å…³é—­äºº
        ///</summary>
        [SugarColumn(ColumnName = "FCLOSERID")]
        public string? Fcloserid { get; set; }
        /// <summary>
        /// å…³é—­åŽŸå› 
        ///</summary>
        [SugarColumn(ColumnName = "FCLOSEREASON")]
        public string? Fclosereason { get; set; }
        /// <summary>
        /// å…³é—­çŠ¶æ€
        ///</summary>
        [SugarColumn(ColumnName = "FCLOSESTATUS")]
        public string? Fclosestatus { get; set; }
        /// <summary>
        /// ä½œåºŸäºº
        ///</summary>
        [SugarColumn(ColumnName = "FCANCELLERID")]
        public string? Fcancellerid { get; set; }
        /// <summary>
        /// ä½œåºŸæ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FCANCELDATE")]
        public DateTime? Fcanceldate { get; set; }
        /// <summary>
        /// ä½œåºŸçŠ¶æ€
        ///</summary>
        [SugarColumn(ColumnName = "FCANCELSTATUS")]
        public string? Fcancelstatus { get; set; }
    }
}
MES.Service/Modes/SalesDeliveryNotice/SalesDeliveryNoticeDetail.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,144 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes.SalesDeliveryNotice
{
    /// <summary>
    /// é”€å”®å‘货通知明细表
    ///</summary>
    [SugarTable("SALES_DELIVERY_NOTICE_DETAIL")]
    public class SalesDeliveryNoticeDetail
    {
        /// <summary>
        ///  ID
        ///</summary>
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_DELIVERY", IsPrimaryKey = true)]
        public decimal Id { get; set; }
        /// <summary>
        /// ERP行ID
        ///</summary>
        [SugarColumn(ColumnName = "ERPID")]
        public decimal? Erpid { get; set; }
        /// <summary>
        /// ERP头ID
        ///</summary>
        [SugarColumn(ColumnName = "EHID")]
        public decimal? Ehid { get; set; }
        /// <summary>
        /// ç‰©æ–™ç¼–码
        ///</summary>
        [SugarColumn(ColumnName = "FMATERIALID")]
        public string? Fmaterialid { get; set; }
        /// <summary>
        /// é”€å”®å•位
        ///</summary>
        [SugarColumn(ColumnName = "FUNITID")]
        public string? Funitid { get; set; }
        /// <summary>
        /// é”€å”®æ•°é‡
        ///</summary>
        [SugarColumn(ColumnName = "FQTY")]
        public decimal? Fqty { get; set; }
        /// <summary>
        /// æ˜¯å¦èµ å“ï¼ˆY/N)
        ///</summary>
        [SugarColumn(ColumnName = "FISFREE")]
        public string? Fisfree { get; set; }
        /// <summary>
        /// è¦è´§æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FDELIVERYDATE")]
        public DateTime? Fdeliverydate { get; set; }
        /// <summary>
        /// å‡ºè´§ä»“库
        ///</summary>
        [SugarColumn(ColumnName = "FSTOCKID")]
        public string? Fstockid { get; set; }
        /// <summary>
        /// è®¡åˆ’跟踪号
        ///</summary>
        [SugarColumn(ColumnName = "FMTONO")]
        public string? Fmtono { get; set; }
        /// <summary>
        /// æ‰¹å·
        ///</summary>
        [SugarColumn(ColumnName = "FLOT")]
        public string? Flot { get; set; }
        /// <summary>
        /// æºå•单号
        ///</summary>
        [SugarColumn(ColumnName = "FSRCBILLNO")]
        public string? Fsrcbillno { get; set; }
        /// <summary>
        /// è®¡ä»·æ•°é‡
        ///</summary>
        [SugarColumn(ColumnName = "FPRICEUNITQTY")]
        public decimal? Fpriceunitqty { get; set; }
        /// <summary>
        /// è´§ä¸»
        ///</summary>
        [SugarColumn(ColumnName = "FOWNERIDHEAD")]
        public string? Fowneridhead { get; set; }
        /// <summary>
        /// åº“存单位
        ///</summary>
        [SugarColumn(ColumnName = "FSTOCKUNITID")]
        public string? Fstockunitid { get; set; }
        /// <summary>
        /// åº“存数量
        ///</summary>
        [SugarColumn(ColumnName = "FSTOCKQTY")]
        public decimal? Fstockqty { get; set; }
        /// <summary>
        /// ç‰©æ–™ç±»åˆ«
        ///</summary>
        [SugarColumn(ColumnName = "FMATERIATYPE")]
        public string? Fmateriatype { get; set; }
        /// <summary>
        /// è¶…发控制单位
        ///</summary>
        [SugarColumn(ColumnName = "FOUTLMTUNIT")]
        public string? Foutlmtunit { get; set; }
        /// <summary>
        /// å‡ºåº“上限
        ///</summary>
        [SugarColumn(ColumnName = "FOUTMAXQTY")]
        public decimal? Foutmaxqty { get; set; }
        /// <summary>
        /// å‡ºåº“下限
        ///</summary>
        [SugarColumn(ColumnName = "FOUTMINQTY")]
        public decimal? Foutminqty { get; set; }
        /// <summary>
        /// äº¤è´§åœ°ç‚¹
        ///</summary>
        [SugarColumn(ColumnName = "FDELIVERYLOC")]
        public string? Fdeliveryloc { get; set; }
        /// <summary>
        /// äº¤è´§åœ°å€
        ///</summary>
        [SugarColumn(ColumnName = "FDELIVERYLADDRESS")]
        public string? Fdeliveryladdress { get; set; }
        /// <summary>
        /// ç»ˆæ­¢çŠ¶æ€
        ///</summary>
        [SugarColumn(ColumnName = "FTERMINATIONSTATUS")]
        public string? Fterminationstatus { get; set; }
        /// <summary>
        /// ä¸šåŠ¡ç»ˆæ­¢æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FTERMINATEDATE")]
        public DateTime? Fterminatedate { get; set; }
        /// <summary>
        /// ç´¯è®¡å‡ºåº“数量
        ///</summary>
        [SugarColumn(ColumnName = "FSUMOUTQTY")]
        public decimal? Fsumoutqty { get; set; }
        /// <summary>
        /// æœªå‡ºåº“数量
        ///</summary>
        [SugarColumn(ColumnName = "FREMAINOUTQTY")]
        public decimal? Fremainoutqty { get; set; }
    }
}
MES.Service/Modes/SalesDeliveryNoticeDetail.cs
ÎļþÒÑɾ³ý
MES.Service/Modes/SalesOrder.cs
ÎļþÒÑɾ³ý
MES.Service/Modes/SalesOrder/SalesOrder.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,204 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    ///
    ///</summary>
    [SugarTable("SALES_ORDER")]
    public class SalesOrder
    {
        /// <summary>
        ///
        ///</summary>
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_ORDER")]
        public decimal? Id { get; set; }
        /// <summary>
        ///
        ///</summary>
        [SugarColumn(ColumnName = "ERPID")]
        public decimal? Erpid { get; set; }
        /// <summary>
        /// å•据编号
        ///</summary>
        [SugarColumn(ColumnName = "FBILLNO")]
        public string Fbillno { get; set; }
        /// <summary>
        /// å•据类型
        ///</summary>
        [SugarColumn(ColumnName = "FBILLTYPEID")]
        public string Fbilltypeid { get; set; }
        /// <summary>
        /// å•据状态
        ///</summary>
        [SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
        public string Fdocumentstatus { get; set; }
        /// <summary>
        /// æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FDATE")]
        public DateTime? Fdate { get; set; }
        /// <summary>
        /// ä¸šåŠ¡ç±»åž‹
        ///</summary>
        [SugarColumn(ColumnName = "FBUSINESSTYPE")]
        public string Fbusinesstype { get; set; }
        /// <summary>
        /// äº¤è´§æ–¹å¼
        ///</summary>
        [SugarColumn(ColumnName = "FHEADDELIVERYWAY")]
        public string Fheaddeliveryway { get; set; }
        /// <summary>
        /// äº¤è´§åœ°ç‚¹
        ///</summary>
        [SugarColumn(ColumnName = "FHEADLOCID")]
        public string Fheadlocid { get; set; }
        /// <summary>
        /// é”€å”®ç»„织
        ///</summary>
        [SugarColumn(ColumnName = "FSALEORGID")]
        public string? Fsaleorgid { get; set; }
        /// <summary>
        /// å®¢æˆ·
        ///</summary>
        [SugarColumn(ColumnName = "FCUSTID")]
        public string Fcustid { get; set; }
        /// <summary>
        /// å…³é—­çŠ¶æ€
        ///</summary>
        [SugarColumn(ColumnName = "FCLOSESTATUS")]
        public string Fclosestatus { get; set; }
        /// <summary>
        /// é”€å”®éƒ¨é—¨
        ///</summary>
        [SugarColumn(ColumnName = "FSALEDEPTID")]
        public string Fsaledeptid { get; set; }
        /// <summary>
        /// é”€å”®å‘˜
        ///</summary>
        [SugarColumn(ColumnName = "FSALERID")]
        public string Fsalerid { get; set; }
        /// <summary>
        /// å˜æ›´åŽŸå› 
        ///</summary>
        [SugarColumn(ColumnName = "FCHANGEREASON")]
        public string Fchangereason { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        ///</summary>
        [SugarColumn(ColumnName = "FNOTE")]
        public string Fnote { get; set; }
        /// <summary>
        /// ç»“ç®—æ–¹
        ///</summary>
        [SugarColumn(ColumnName = "FSETTLEID")]
        public string Fsettleid { get; set; }
        /// <summary>
        /// å®¡æ ¸äºº
        ///</summary>
        [SugarColumn(ColumnName = "FAPPROVERID")]
        public string Fapproverid { get; set; }
        /// <summary>
        /// æ”¶è´§äººå§“名
        ///</summary>
        [SugarColumn(ColumnName = "FLINKMAN")]
        public string Flinkman { get; set; }
        /// <summary>
        /// ä»˜æ¬¾æ–¹
        ///</summary>
        [SugarColumn(ColumnName = "FCHARGEID")]
        public string Fchargeid { get; set; }
        /// <summary>
        /// è”系电话
        ///</summary>
        [SugarColumn(ColumnName = "FLINKPHONE")]
        public string Flinkphone { get; set; }
        /// <summary>
        /// åˆ›å»ºäºº
        ///</summary>
        [SugarColumn(ColumnName = "FCREATORID")]
        public string Fcreatorid { get; set; }
        /// <summary>
        /// åˆ›å»ºæ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FCREATEDATE")]
        public DateTime? Fcreatedate { get; set; }
        /// <summary>
        /// æœ€åŽä¿®æ”¹äºº
        ///</summary>
        [SugarColumn(ColumnName = "FMODIFIERID")]
        public string Fmodifierid { get; set; }
        /// <summary>
        /// æœ€åŽä¿®æ”¹æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FMODIFYDATE")]
        public DateTime? Fmodifydate { get; set; }
        /// <summary>
        /// å®¡æ ¸æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FAPPROVEDATE")]
        public DateTime? Fapprovedate { get; set; }
        /// <summary>
        /// å…³é—­äºº
        ///</summary>
        [SugarColumn(ColumnName = "FCLOSERID")]
        public string Fcloserid { get; set; }
        /// <summary>
        /// å…³é—­æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FCLOSEDATE")]
        public DateTime? Fclosedate { get; set; }
        /// <summary>
        /// å˜æ›´æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FCHANGEDATE")]
        public DateTime? Fchangedate { get; set; }
        /// <summary>
        /// ä½œåºŸçŠ¶æ€
        ///</summary>
        [SugarColumn(ColumnName = "FCANCELSTATUS")]
        public string Fcancelstatus { get; set; }
        /// <summary>
        /// ä½œåºŸäºº
        ///</summary>
        [SugarColumn(ColumnName = "FCANCELLERID")]
        public string Fcancellerid { get; set; }
        /// <summary>
        /// ç‰ˆæœ¬å·
        ///</summary>
        [SugarColumn(ColumnName = "FVERSIONNO")]
        public string Fversionno { get; set; }
        /// <summary>
        /// å˜æ›´äºº
        ///</summary>
        [SugarColumn(ColumnName = "FCHANGERID")]
        public string Fchangerid { get; set; }
        /// <summary>
        /// å‘货日期
        ///</summary>
        [SugarColumn(ColumnName = "F_WWC_DATE")]
        public DateTime? FWwcDate { get; set; }
        /// <summary>
        /// æ˜¯å¦è¯„审
        ///</summary>
        [SugarColumn(ColumnName = "F_WWC_CHECKBOX")]
        public string? FWwcCheckbox { get; set; }
        /// <summary>
        /// æŠ€æœ¯è¯„审
        ///</summary>
        [SugarColumn(ColumnName = "F_WWC_LARGETEXT")]
        public string? FWwcLargetext { get; set; }
        /// <summary>
        /// PMC评审
        ///</summary>
        [SugarColumn(ColumnName = "F_WWC_LARGETEXT1")]
        public string? FWwcLargetext1 { get; set; }
        /// <summary>
        /// å¤‡æ³¨ï¼ˆæ˜Žç»†ï¼‰
        ///</summary>
        [SugarColumn(ColumnName = "FENTRYNOTE")]
        public string? Fentrynote { get; set; }
    }
}
MES.Service/Modes/SalesOrder/SalesOrderDetail.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,186 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    ///
    ///</summary>
    [SugarTable("SALES_ORDER_DETAIL")]
    public class SalesOrderDetail
    {
        /// <summary>
        ///
        ///</summary>
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_ORDER")]
        public decimal Id { get; set; }
        /// <summary>
        /// ERPID
        ///</summary>
        [SugarColumn(ColumnName = "ERPID")]
        public decimal Erpid { get; set; }
        /// <summary>
        /// EHID
        ///</summary>
        [SugarColumn(ColumnName = "EHID")]
        public decimal Ehid { get; set; }
        /// <summary>
        /// ç‰©æ–™ç¼–码
        ///</summary>
        [SugarColumn(ColumnName = "FMATERIALID")]
        public string Fmaterialid { get; set; }
        /// <summary>
        /// é”€å”®å•位
        ///</summary>
        [SugarColumn(ColumnName = "FUNITID")]
        public string Funitid { get; set; }
        /// <summary>
        /// é”€å”®æ•°é‡
        ///</summary>
        [SugarColumn(ColumnName = "FQTY")]
        public decimal? Fqty { get; set; }
        /// <summary>
        /// è®¡ä»·å•位
        ///</summary>
        [SugarColumn(ColumnName = "FPRICEUNITID")]
        public string Fpriceunitid { get; set; }
        /// <summary>
        /// è®¡ä»·æ•°é‡
        ///</summary>
        [SugarColumn(ColumnName = "FPRICEUNITQTY")]
        public decimal? Fpriceunitqty { get; set; }
        /// <summary>
        /// è¦è´§æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FDELIVERYDATE")]
        public DateTime? Fdeliverydate { get; set; }
        /// <summary>
        /// æ˜¯å¦èµ å“
        ///</summary>
        [SugarColumn(ColumnName = "FISFREE")]
        public string Fisfree { get; set; }
        /// <summary>
        /// ç»“算组织
        ///</summary>
        [SugarColumn(ColumnName = "FSETTLEORGIDS")]
        public string? Fsettleorgids { get; set; }
        /// <summary>
        /// è´§ä¸»ç±»åž‹
        ///</summary>
        [SugarColumn(ColumnName = "FOWNERTYPEID")]
        public string Fownertypeid { get; set; }
        /// <summary>
        /// è´§ä¸»
        ///</summary>
        [SugarColumn(ColumnName = "FOWNERID")]
        public string Fownerid { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        ///</summary>
        [SugarColumn(ColumnName = "FENTRYNOTE")]
        public string Fentrynote { get; set; }
        /// <summary>
        /// è®¡åˆ’跟踪号
        ///</summary>
        [SugarColumn(ColumnName = "FMTONO")]
        public string Fmtono { get; set; }
        /// <summary>
        /// æ‰¹å·
        ///</summary>
        [SugarColumn(ColumnName = "FLOT")]
        public string Flot { get; set; }
        /// <summary>
        /// å‘货上限
        ///</summary>
        [SugarColumn(ColumnName = "FDELIVERYMAXQTY")]
        public decimal? Fdeliverymaxqty { get; set; }
        /// <summary>
        /// å‘货下限
        ///</summary>
        [SugarColumn(ColumnName = "FDELIVERYMINQTY")]
        public decimal? Fdeliveryminqty { get; set; }
        /// <summary>
        /// è¶…发控制单位
        ///</summary>
        [SugarColumn(ColumnName = "FOUTLMTUNITID")]
        public string Foutlmtunitid { get; set; }
        /// <summary>
        /// ä¸šåС关闭
        ///</summary>
        [SugarColumn(ColumnName = "FMRPCLOSESTATUS")]
        public string Fmrpclosestatus { get; set; }
        /// <summary>
        /// ä¸šåŠ¡ç»ˆæ­¢
        ///</summary>
        [SugarColumn(ColumnName = "FMRPTERMINATESTATUS")]
        public string Fmrpterminatestatus { get; set; }
        /// <summary>
        /// ç»ˆæ­¢æ—¥æœŸ
        ///</summary>
        [SugarColumn(ColumnName = "FTERMINATEDATE")]
        public DateTime? Fterminatedate { get; set; }
        /// <summary>
        /// ç»ˆæ­¢äºº
        ///</summary>
        [SugarColumn(ColumnName = "FTERMINATERID")]
        public string? Fterminaterid { get; set; }
        /// <summary>
        /// æºå•类型
        ///</summary>
        [SugarColumn(ColumnName = "FSRCTYPE")]
        public string Fsrctype { get; set; }
        /// <summary>
        /// æºå•单号
        ///</summary>
        [SugarColumn(ColumnName = "FSRCBILLNO")]
        public string Fsrcbillno { get; set; }
        /// <summary>
        /// ç´¯è®¡å‘货通知数量
        ///</summary>
        [SugarColumn(ColumnName = "FDELIQTY")]
        public decimal? Fdeliqty { get; set; }
        /// <summary>
        /// ç´¯è®¡å‡ºåº“数量
        ///</summary>
        [SugarColumn(ColumnName = "FSTOCKOUTQTY")]
        public decimal? Fstockoutqty { get; set; }
        /// <summary>
        /// ç´¯è®¡é€€è´§é€šçŸ¥æ•°é‡ï¼ˆé”€å”®åŸºæœ¬ï¼‰
        ///</summary>
        [SugarColumn(ColumnName = "FBASERETNOTICEQTY")]
        public decimal? Fbaseretnoticeqty { get; set; }
        /// <summary>
        /// ç´¯è®¡é€€è´§æ•°é‡ï¼ˆé”€å”®åŸºæœ¬ï¼‰
        ///</summary>
        [SugarColumn(ColumnName = "FBASERETURNQTY")]
        public decimal? Fbasereturnqty { get; set; }
        /// <summary>
        /// å‰©ä½™æœªå‡ºæ•°é‡ï¼ˆé”€å”®åŸºæœ¬ï¼‰
        ///</summary>
        [SugarColumn(ColumnName = "FBASEREMAINOUTQTY")]
        public decimal? Fbaseremainoutqty { get; set; }
        /// <summary>
        /// ç´¯è®¡åº”收数量(销售基本)
        ///</summary>
        [SugarColumn(ColumnName = "FBASEARQTY")]
        public decimal? Fbasearqty { get; set; }
        /// <summary>
        /// å®¢æˆ·ç‰©æ–™ç¼–码
        ///</summary>
        [SugarColumn(ColumnName = "FMAPID")]
        public string Fmapid { get; set; }
        /// <summary>
        /// å®¢æˆ·ç‰©æ–™åç§°
        ///</summary>
        [SugarColumn(ColumnName = "FMAPNAME")]
        public string Fmapname { get; set; }
        /// <summary>
        /// å®¢æˆ·è§„格型号
        ///</summary>
        [SugarColumn(ColumnName = "FMAPSPEC")]
        public string Fmapspec { get; set; }
    }
}
MES.Service/Modes/SalesOrderDetail.cs
ÎļþÒÑɾ³ý
MES.Service/Modes/SalesReturnNotice.cs
ÎļþÒÑɾ³ý
MES.Service/Modes/SalesReturnNotice/SalesReturnNotice.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,189 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    ///
    ///</summary>
    [SugarTable("SALES_RETURN_NOTICE")]
    public class SalesReturnNotice
    {
        /// <summary>
        /// SEQ_SALES_RETURN
        ///</summary>
         [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_SALES_RETURN", IsPrimaryKey = true)]
         public decimal Id { get; set; }
        /// <summary>
        /// ERP头ID
        ///</summary>
         [SugarColumn(ColumnName="ERPID"    )]
         public decimal? Erpid { get; set; }
        /// <summary>
        /// å•据类型
        ///</summary>
         [SugarColumn(ColumnName="FBILLTYPEID"    )]
         public string? Fbilltypeid { get; set; }
        /// <summary>
        /// å•据编号
        ///</summary>
         [SugarColumn(ColumnName="FBILLNO"    )]
         public string? Fbillno { get; set; }
        /// <summary>
        /// æ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="FDATE"    )]
         public DateTime? Fdate { get; set; }
        /// <summary>
        /// ç»“算币别
        ///</summary>
         [SugarColumn(ColumnName="FSETTLECURRID"    )]
         public string? Fsettlecurrid { get; set; }
        /// <summary>
        /// é”€å”®ç»„织
        ///</summary>
         [SugarColumn(ColumnName="FSALEORGID"    )]
         public string? Fsaleorgid { get; set; }
        /// <summary>
        /// é”€å”®éƒ¨é—¨
        ///</summary>
         [SugarColumn(ColumnName="FSALEDEPTID"    )]
         public string? Fsaledeptid { get; set; }
        /// <summary>
        /// é€€è´§å®¢æˆ·
        ///</summary>
         [SugarColumn(ColumnName="FRETCUSTID"    )]
         public string? Fretcustid { get; set; }
        /// <summary>
        /// äº¤è´§åœ°ç‚¹
        ///</summary>
         [SugarColumn(ColumnName="FHEADLOCID"    )]
         public string? Fheadlocid { get; set; }
        /// <summary>
        /// åº“存部门
        ///</summary>
         [SugarColumn(ColumnName="FRETDEPTID"    )]
         public string? Fretdeptid { get; set; }
        /// <summary>
        /// åº“存组
        ///</summary>
         [SugarColumn(ColumnName="FSTOCKERGROUPID"    )]
         public string? Fstockergroupid { get; set; }
        /// <summary>
        /// ä»“管员
        ///</summary>
         [SugarColumn(ColumnName="FSTOCKERID"    )]
         public string? Fstockerid { get; set; }
        /// <summary>
        /// é”€å”®ç»„
        ///</summary>
         [SugarColumn(ColumnName="FSALEGROUPID"    )]
         public string? Fsalegroupid { get; set; }
        /// <summary>
        /// é”€å”®å‘˜
        ///</summary>
         [SugarColumn(ColumnName="FSALESMANID"    )]
         public string? Fsalesmanid { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹
        ///</summary>
         [SugarColumn(ColumnName="FRECEIVECUSID"    )]
         public string? Freceivecusid { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹è”系人
        ///</summary>
         [SugarColumn(ColumnName="FRECEIVECUSCONTACT"    )]
         public string? Freceivecuscontact { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹åœ°å€
        ///</summary>
         [SugarColumn(ColumnName="FRECEIVEADDRESS"    )]
         public string? Freceiveaddress { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹å§“名
        ///</summary>
         [SugarColumn(ColumnName="FLINKMAN"    )]
         public string? Flinkman { get; set; }
        /// <summary>
        /// ç»“ç®—æ–¹
        ///</summary>
         [SugarColumn(ColumnName="FSETTLECUSID"    )]
         public string? Fsettlecusid { get; set; }
        /// <summary>
        /// åˆ›å»ºäºº
        ///</summary>
         [SugarColumn(ColumnName="FCREATORID"    )]
         public string? Fcreatorid { get; set; }
        /// <summary>
        /// åˆ›å»ºæ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="FCREATEDATE"    )]
         public DateTime? Fcreatedate { get; set; }
        /// <summary>
        /// æœ€åŽä¿®æ”¹äºº
        ///</summary>
         [SugarColumn(ColumnName="FMODIFIERID"    )]
         public string? Fmodifierid { get; set; }
        /// <summary>
        /// æœ€åŽä¿®æ”¹æ—¶é—´
        ///</summary>
         [SugarColumn(ColumnName="FMODIFYDATE"    )]
         public DateTime? Fmodifydate { get; set; }
        /// <summary>
        /// å…³é—­äºº
        ///</summary>
         [SugarColumn(ColumnName="FCLOSERID"    )]
         public string? Fcloserid { get; set; }
        /// <summary>
        /// å…³é—­åŽŸå› 
        ///</summary>
         [SugarColumn(ColumnName="FCLOSEREASON"    )]
         public string? Fclosereason { get; set; }
        /// <summary>
        /// å…³é—­æ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="FCLOSEDDATE"    )]
         public DateTime? Fcloseddate { get; set; }
        /// <summary>
        /// å®¡æ ¸äºº
        ///</summary>
         [SugarColumn(ColumnName="FAPPROVERID"    )]
         public string? Fapproverid { get; set; }
        /// <summary>
        /// å®¡æ ¸æ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="FAPPROVEDATE"    )]
         public DateTime? Fapprovedate { get; set; }
        /// <summary>
        /// ä½œåºŸçŠ¶æ€
        ///</summary>
         [SugarColumn(ColumnName="FCANCELSTATUS"    )]
         public string? Fcancelstatus { get; set; }
        /// <summary>
        /// ä½œåºŸäºº
        ///</summary>
         [SugarColumn(ColumnName="FCANCELLERID"    )]
         public string? Fcancellerid { get; set; }
        /// <summary>
        /// ä½œåºŸæ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="FCANCELDATE"    )]
         public DateTime? Fcanceldate { get; set; }
        /// <summary>
        /// å…³é—­çŠ¶æ€
        ///</summary>
         [SugarColumn(ColumnName="FBILLCLOSESTATUS"    )]
         public string? Fbillclosestatus { get; set; }
        /// <summary>
        /// æ˜¯å¦æ‰‹åЍ关闭
        ///</summary>
         [SugarColumn(ColumnName="FMANUALCLOSE"    )]
         public string? Fmanualclose { get; set; }
        /// <summary>
        /// å•据状态
        ///</summary>
         [SugarColumn(ColumnName="FDOCUMENTSTATUS"    )]
         public string? Fdocumentstatus { get; set; }
    }
}
MES.Service/Modes/SalesReturnNotice/SalesReturnNoticeDetail.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,115 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    ///
    ///</summary>
    [SugarTable("SALES_RETURN_NOTICE_DETAIL")]
    public class SalesReturnNoticeDetail
    {
        /// <summary>
        /// SEQ_SALES_RETURN
        ///</summary>
         [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_SALES_RETURN", IsPrimaryKey = true)]
         public decimal Id { get; set; }
        /// <summary>
        /// ERP ID
        ///</summary>
         [SugarColumn(ColumnName="ERPID"    )]
         public decimal? Erpid { get; set; }
        /// <summary>
        /// EH ID
        ///</summary>
         [SugarColumn(ColumnName="EHID"    )]
         public decimal? Ehid { get; set; }
        /// <summary>
        /// ç‰©æ–™ç¼–码
        ///</summary>
         [SugarColumn(ColumnName="FMATERIALID"    )]
         public string Fmaterialid { get; set; }
        /// <summary>
        /// é”€å”®å•位
        ///</summary>
         [SugarColumn(ColumnName="FUNITID"    )]
         public string Funitid { get; set; }
        /// <summary>
        /// é”€å”®æ•°é‡
        ///</summary>
         [SugarColumn(ColumnName="FQTY"    )]
         public decimal? Fqty { get; set; }
        /// <summary>
        /// æ˜¯å¦èµ å“
        ///</summary>
         [SugarColumn(ColumnName="FISFREE"    )]
         public string Fisfree { get; set; }
        /// <summary>
        /// é€€è´§æ—¥æœŸ
        ///</summary>
         [SugarColumn(ColumnName="FDELIVERYDATE"    )]
         public DateTime? Fdeliverydate { get; set; }
        /// <summary>
        /// ä»“库
        ///</summary>
         [SugarColumn(ColumnName="FSTOCKID"    )]
         public string Fstockid { get; set; }
        /// <summary>
        /// è®¡åˆ’跟踪号
        ///</summary>
         [SugarColumn(ColumnName="FMTONO"    )]
         public string Fmtono { get; set; }
        /// <summary>
        /// æ‰¹å·
        ///</summary>
         [SugarColumn(ColumnName="FLOT"    )]
         public string Flot { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        ///</summary>
         [SugarColumn(ColumnName="FENTRYDESCRIPTION"    )]
         public string Fentrydescription { get; set; }
        /// <summary>
        /// é€€è´§ç±»åž‹
        ///</summary>
         [SugarColumn(ColumnName="FRMTYPE"    )]
         public string Frmtype { get; set; }
        /// <summary>
        /// åº“存单位
        ///</summary>
         [SugarColumn(ColumnName="FSTOCKUNITID"    )]
         public string Fstockunitid { get; set; }
        /// <summary>
        /// åº“存数量
        ///</summary>
         [SugarColumn(ColumnName="FSTOCKQTY"    )]
         public decimal? Fstockqty { get; set; }
        /// <summary>
        /// è´§ä¸»ç±»åž‹
        ///</summary>
         [SugarColumn(ColumnName="FOWNERTYPEID"    )]
         public string Fownertypeid { get; set; }
        /// <summary>
        /// è´§ä¸»
        ///</summary>
         [SugarColumn(ColumnName="FOWNERID"    )]
         public string Fownerid { get; set; }
        /// <summary>
        /// æºå•类型
        ///</summary>
         [SugarColumn(ColumnName="FSRCTYPE"    )]
         public string Fsrctype { get; set; }
        /// <summary>
        /// æºå•编号
        ///</summary>
         [SugarColumn(ColumnName="FSRCBILLNO"    )]
         public string Fsrcbillno { get; set; }
        /// <summary>
        /// è®¢å•单号
        ///</summary>
         [SugarColumn(ColumnName="FORDERNO"    )]
         public string Forderno { get; set; }
    }
}
MES.Service/Modes/SalesReturnNoticeDetail.cs
ÎļþÒÑɾ³ý
MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
MES.Service/service/BasicData/SalesDeliveryNoticeDetailManager.cs
ÎļþÒÑɾ³ý
MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
ÎļþÒÑɾ³ý
MES.Service/service/BasicData/SalesOrderManager.cs
ÎļþÒÑɾ³ý
MES.Service/service/BasicData/SalesReturnNoticeManager.cs
ÎļþÒÑɾ³ý
MES.Service/service/SaleDeliveryNotice/SalesDeliveryNoticeDetailManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,79 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using MES.Service.DB;
using MES.Service.Modes;
using MES.Service.Modes.SalesDeliveryNotice;
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/SaleDeliveryNotice/SalesDeliveryNoticeManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,257 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using MES.Service.DB;
using MES.Service.Modes;
using MES.Service.Dto.webApi;
using MES.Service.service.BasicData;
using System.Globalization;
using MES.Service.Modes.SalesDeliveryNotice;
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.Ehid == mesSalesDelivery.Erpid).ExecuteCommand();
            var orUpdate = base.Insert(mesSalesDelivery);
            //var baOrUpdate = _SalesDeliveryDetailManager.InsertRange(mesSalesDeliveryDatas);
            foreach (var item in mesSalesDeliveryDatas)
            {
                _SalesDeliveryDetailManager.Insert(item);
            }
            //if (orUpdate && baOrUpdate) return true;
            return orUpdate;
            throw new NotImplementedException("插入或更新失败");
        }
        // æ‰¹é‡ä¿å­˜è®°å½•的方法
        public bool SaveList(List<ErpSalesDelivery> salesOrder)
        {
            var result = salesOrder.Select(Save).ToList();
            return result.All(b => b);
        }
        //自动映射字段
        public static void MapProperties<T>(T target, object source)
        {
            var targetProps = typeof(T).GetProperties();
            var sourceProps = source.GetType().GetProperties();
            foreach (var targetProp in targetProps)
            {
                var sourceProp = sourceProps.FirstOrDefault(p => p.Name == targetProp.Name && p.PropertyType == targetProp.PropertyType);
                if (sourceProp != null)
                {
                    var value = sourceProp.GetValue(source);
                    targetProp.SetValue(target, value);
                }
            }
        }
        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();
            MapProperties(salesOrder, erpDto);
            /*var salesOrder = new SalesDeliveryNotice
            {
                Id = erpDto.Id,
                Erpid = erpDto.Erpid,
                Fbilltypeid = erpDto.FBillTypeId,
                Fbillno = erpDto.FBillNo,
                Fdate = erpDto.FDate,
                Fsettlecurrid = erpDto.FSettleCurrId,
                Fsaleorgid = erpDto.FSaleOrgId,
                Fsaledeptid = erpDto.FSaleDeptId,
                Fcustomerid = erpDto.FCustomerId,
                Fheaddeliveryway = erpDto.FHeadDeliveryWay,
                Fheadlocid = erpDto.FHeadLocId,
                Fcarrierid = erpDto.FCarrierId,
                Fcarriageno = erpDto.FCarriageNo,
                Fdocumentstatus = erpDto.FDocumentStatus,
                Fdeliveryorgid = erpDto.FDeliveryOrgId,
                Fdeliverydeptid = erpDto.FDeliveryDeptId,
                Fstockergroupid = erpDto.FStockerGroupId,
                Fstockerid = erpDto.FStockerId,
                Fsalegroupid = erpDto.FSaleGroupId,
                Fsalesmanid = erpDto.FSalesManId,
                Freceiverid = erpDto.FReceiverId,
                Freceivercontactid = erpDto.FReceiverContactId,
                Freceiveaddress = erpDto.FReceiveAddress,
                Flinkman = erpDto.FLinkMan,
                Flinkphone = erpDto.FLinkPhone,
                Fsettleid = erpDto.FSettleId,
                Fpayerid = erpDto.FPayerId,
                Fcreatorid = erpDto.FCreatorId,
                Fcreatedate = erpDto.FCreateDate,
                Fmodifierid = erpDto.FModifierId,
                Fmodifydate = erpDto.FModifyDate,
                Fapproverid = erpDto.Fapproverid,
                Fapprovedate = erpDto.FApproveDate,
                Fcloserid = erpDto.FCloserId,
                Fclosereason = erpDto.FCloseReason,
                Fclosestatus = erpDto.FCloseStatus,
                Fcancellerid = erpDto.FCancellerId,
                Fcanceldate = erpDto.FCancelDate,
                Fcancelstatus = erpDto.FCancelStatus
            };*/
            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();
                MapProperties(salesOrderSub, erpDto);
                /*{
                    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,//未出库数量
                    GDY = erpDto.F_UNW_Base_GDY,//跟单员
                    NOTE = erpDto.FEntrynote//备注
                };*/
                var single = _SalesDeliveryDetailManager.GetSingle(it =>
                    it.Erpid == salesOrderSub.Erpid);
                if (single != null) salesOrderSub.Id = single.Id;
                salesOrderSubList.Add(salesOrderSub);
            }
            return salesOrderSubList;
        }
    }
}
MES.Service/service/SalesOrder/SalesOrderManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,210 @@
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;
public class SalesOrderManager : Repository<SalesOrder>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
    private readonly SalesOrderDetailManager _SalesOrderDetailManager =
        new();
    //ErpSalesOrder
    public bool Save(ErpSalesOrder SalesOrder)
    {
        var erpSalesOrderDto = SalesOrder.OrderDto;
        var mesSalesOrder = ConvertErpToSalesOrder(SalesOrder);
        var mesSalesOrderDatas = ConvertErpToSalesOrderDetail(SalesOrder);
        return UseTransaction(db =>
        {
            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;
    }
    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(
        ErpSalesOrder erpDto1)
    {
        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 erpDto = erpDto1.OrderDto;
        var salesOrder = new SalesOrder
        {
            Id = erpDto.Id,
            Erpid = erpDto.Erpid,
            Fbillno = erpDto.Fbillno,
            Fbilltypeid = erpDto.Fbilltypeid,
            Fdocumentstatus = erpDto.Fdocumentstatus,
            Fdate = erpDto.Fdate,
            Fbusinesstype = erpDto.Fbusinesstype,
            Fheaddeliveryway = erpDto.Fheaddeliveryway,
            Fheadlocid = erpDto.Fheadlocid,
            Fsaleorgid = erpDto.Fsaleorgid,
            Fcustid = erpDto.Fcustid,
            Fclosestatus = erpDto.Fclosestatus,
            Fsaledeptid = erpDto.Fsaledeptid,
            Fsalerid = erpDto.Fsalerid,
            Fchangereason = erpDto.Fchangereason,
            Fnote = erpDto.Fnote,
            Fsettleid = erpDto.Fsettleid,
            Fapproverid = erpDto.Fapproverid,
            Flinkman = erpDto.Flinkman,
            Fchargeid = erpDto.Fchargeid,
            Flinkphone = erpDto.Flinkphone,
            Fcreatorid = erpDto.Fcreatorid,
            Fcreatedate = erpDto.Fcreatedate,
            Fmodifierid = erpDto.Fmodifierid,
            Fmodifydate = erpDto.Fmodifydate,
            Fapprovedate = erpDto.Fapprovedate,
            Fcloserid = erpDto.Fcloserid,
            Fclosedate = erpDto.Fclosedate,
            Fchangedate = erpDto.Fchangedate,
            Fcancelstatus = erpDto.Fcancelstatus,
            Fcancellerid = erpDto.Fcancellerid,
            Fversionno = erpDto.Fversionno,
            Fchangerid = erpDto.Fchangerid,
            FWwcDate = erpDto.FWwcDate,
            FWwcCheckbox = erpDto.FWwcCheckbox,
            FWwcLargetext = erpDto.FWwcLargetext,
            FWwcLargetext1 = erpDto.FWwcLargetext1,
            Fentrynote = erpDto.Fentrynote
            //ParseDateTime() ?? null
            //long.Parse()
            //Convert.ToDecimal()
            //Convert.ToDouble()
        };
        var single = base.GetSingle(it => it.Erpid == erpDto.Erpid);
        if (single != null) salesOrder.Id = single.Id;
        return salesOrder;
    }
    private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(
        ErpSalesOrder erpDtoList)
    {
        var salesOrderSubList =
            new List<SalesOrderDetail>();
        foreach (var erpDto in erpDtoList.Items)
        {
            var salesOrderSub = new SalesOrderDetail
            {
                Id = erpDto.Id,
                Erpid = erpDto.Erpid,
                Ehid = erpDto.Ehid,
                Fmaterialid = erpDto.Fmaterialid,
                Funitid = erpDto.Funitid,
                Fqty = erpDto.Fqty,
                Fpriceunitid = erpDto.Fpriceunitid,
                Fpriceunitqty = erpDto.Fpriceunitqty,
                Fdeliverydate = erpDto.Fdeliverydate,
                Fisfree = erpDto.Fisfree,
                Fsettleorgids = erpDto.Fsettleorgids,
                Fownertypeid = erpDto.Fownertypeid,
                Fownerid = erpDto.Fownerid,
                Fentrynote = erpDto.Fentrynote,
                Fmtono = erpDto.Fmtono,
                Flot = erpDto.Flot,
                Fdeliverymaxqty = erpDto.Fdeliverymaxqty,
                Fdeliveryminqty = erpDto.Fdeliveryminqty,
                Foutlmtunitid = erpDto.Foutlmtunitid,
                Fmrpclosestatus = erpDto.Fmrpclosestatus,
                Fmrpterminatestatus = erpDto.Fmrpterminatestatus,
                Fterminatedate = erpDto.Fterminatedate,
                Fterminaterid = erpDto.Fterminaterid,
                Fsrctype = erpDto.Fsrctype,
                Fsrcbillno = erpDto.Fsrcbillno,
                Fdeliqty = erpDto.Fdeliqty,
                Fstockoutqty = erpDto.Fstockoutqty,
                Fbaseretnoticeqty = erpDto.Fbaseretnoticeqty,
                Fbasereturnqty = erpDto.Fbasereturnqty,
                Fbaseremainoutqty = erpDto.Fbaseremainoutqty,
                Fbasearqty = erpDto.Fbasearqty,
                Fmapid = erpDto.Fmapid,
                Fmapname = erpDto.Fmapname,
                Fmapspec = erpDto.Fmapspec
            };
            var single = _SalesOrderDetailManager.GetSingle(it =>
                it.Erpid == salesOrderSub.Erpid);
            if (single != null) salesOrderSub.Id = single.Id;
            salesOrderSubList.Add(salesOrderSub);
        }
        return salesOrderSubList;
    }
}
MES.Service/service/SalesReturnNotice/SalesReturnNoticeDetailManager.cs
ÎļþÃû´Ó 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/SalesReturnNotice/SalesReturnNoticeManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,234 @@
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;
public class SalesReturnNoticeManager : Repository<SalesReturnNotice>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
    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);
        return UseTransaction(db =>
        {
            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;
    }
    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.Ehid == 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);
    }
    //自动映射字段
    public static void MapProperties<T>(T target, object source)
    {
        var targetProps = typeof(T).GetProperties();
        var sourceProps = source.GetType().GetProperties();
        foreach (var targetProp in targetProps)
        {
            var sourceProp = sourceProps.FirstOrDefault(p => p.Name == targetProp.Name && p.PropertyType == targetProp.PropertyType);
            if (sourceProp != null)
            {
                var value = sourceProp.GetValue(source);
                targetProp.SetValue(target, value);
            }
        }
    }
    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();
        MapProperties(salesOrder, erpDto);
        /*{
            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, //单据状态
            FUNWTextTHYY = erpDto.F_UNW_Text_THYY //单据状态
        };*/
        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();
            MapProperties(salesOrderSub, erpDto);
            /*{
                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.Erpid == salesOrderSub.Erpid);
            if (single != null) salesOrderSub.Id = single.Id;
            salesOrderSubList.Add(salesOrderSub);
        }
        return salesOrderSubList;
    }
}
MESApplication/Controllers/BasicData/SalesDeliveryNoticeController.cs
ÎļþÒÑɾ³ý
MESApplication/Controllers/BasicData/SalesDeliveryNoticeDetailController.cs
ÎļþÒÑɾ³ý
MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs
ÎļþÒÑɾ³ý
MESApplication/Controllers/SalesDeliveryNotice/SalesDeliveryNoticeController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,272 @@
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;
using MES.Service.Modes.SalesDeliveryNotice;
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/SalesOrder/SalesOrderController.cs
ÎļþÃû´Ó MESApplication/Controllers/BasicData/SalesOrderController.cs ÐÞ¸Ä
@@ -1,11 +1,11 @@
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;
using Newtonsoft.Json;
namespace MESApplication.Controllers.BasicData;
@@ -13,34 +13,33 @@
[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/";
    private readonly string URL =
        "http://localhost:10054/api/SalesOrder/";
    /// <summary>
    ///     å•条主表数据保存操作
    /// </summary>
    /// <returns></returns>
    //
    [HttpPost("Save")]
    public ResponseResult Save(SalesOrders salesOrders)
    public ResponseResult Save(ErpSalesOrder salesOrder)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "Save";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(salesOrders);
        entity.Data = JsonConvert.SerializeObject(salesOrder);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.Save(salesOrders);
            var save = m.Save(salesOrder);
            resultInfos.tbBillList = save;
@@ -67,21 +66,12 @@
            _manager.save(entity);
            return  new ResponseResult
            {
                status = 1,
                message = ex.Message,
                data = ex.Message
            };
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     å¤šæ¡ä¸»è¡¨æ•°æ®ä¿å­˜æ“ä½œ
    /// </summary>
    /// <returns></returns>
    [HttpPost("SaveList")]
    public ResponseResult SaveList(List<SalesOrders> units)
    public ResponseResult SaveList(List<ErpSalesOrder> units)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
@@ -119,16 +109,9 @@
            _manager.save(entity);
            return new ResponseResult
            {
                status = 1,
                message = ex.Message,
                data = ex.Message
            };
            return ResponseResult.ResponseError(ex);
        }
    }
    /***进入模版管理可以修改模版***/
    /// <summary>
    ///     èŽ·å–æ‰€æœ‰
MESApplication/Controllers/SalesReturnNotice/SalesReturnNoticeController.cs
ÎļþÃû´Ó MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs ÐÞ¸Ä
@@ -13,7 +13,7 @@
[Route("api/[controller]")]
public class SalesReturnNoticeController : ControllerBase
{
    private readonly MessageCenterManager _manager = new();
   private readonly MessageCenterManager _manager = new();
    private readonly SalesReturnNoticeManager m = new();
@@ -23,24 +23,22 @@
    private readonly string URL = "http://localhost:10054/api/SalesReturnNotice/";
    /// <summary>
    ///     å•条主表数据保存操作
    /// </summary>
    /// <returns></returns>
    //
    [HttpPost("Save")]
    public ResponseResult Save(SaleReturnNotice saleReturnNotice)
    public ResponseResult Save(ErpSalesRerurn salesOrder)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "Save";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(saleReturnNotice);
        entity.Data = JsonConvert.SerializeObject(salesOrder);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.Save(saleReturnNotice);
            var save = m.Save(salesOrder);
            resultInfos.tbBillList = save;
@@ -67,21 +65,12 @@
            _manager.save(entity);
            return new ResponseResult
            {
                status = 1,
                message = ex.Message,
                data = ex.Message
            };
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     å¤šæ¡ä¸»è¡¨æ•°æ®ä¿å­˜æ“ä½œ
    /// </summary>
    /// <returns></returns>
    [HttpPost("SaveList")]
    public ResponseResult SaveList(List<SaleReturnNotice> units)
    public ResponseResult SaveList(List<ErpSalesRerurn> units)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
@@ -119,15 +108,15 @@
            _manager.save(entity);
            return new ResponseResult
            {
                status = 1,
                message = ex.Message,
                data = ex.Message
            };
            return ResponseResult.ResponseError(ex);
        }
    }
    /***进入模版管理可以修改模版***/
    /// <summary>
MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.deps.json
@@ -1887,10 +1887,7 @@
          "SqlSugarCore": "5.1.4.158"
        },
        "runtime": {
          "MES.Service.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.0.0"
          }
          "MES.Service.dll": {}
        }
      },
      "Kingdee.CDP.WebApi.SDK/8.0.6.0": {
MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -462,138 +462,6 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeController.Save(MES.Service.Dto.webApi.SaleDeliveryNotice)">
            <summary>
                å•条主表数据保存操作
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeController.SaveList(System.Collections.Generic.List{MES.Service.Dto.webApi.SaleDeliveryNotice})">
            <summary>
                å¤šæ¡ä¸»è¡¨æ•°æ®ä¿å­˜æ“ä½œ
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeController.GetList">
            <summary>
                èŽ·å–æ‰€æœ‰
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeController.GetById(System.Int32)">
            <summary>
                æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeController.DeleteByIds(System.Object[])">
            <summary>
                æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeController.Add(MES.Service.Modes.SalesDeliveryNotice)">
            <summary>
                æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNotice)">
            <summary>
                æ·»åŠ è¿”å›žè‡ªå¢ž
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeController.Update(MES.Service.Modes.SalesDeliveryNotice)">
            <summary>
                ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeDetailController.GetList">
            <summary>
                èŽ·å–æ‰€æœ‰
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeDetailController.GetById(System.Int32)">
            <summary>
                æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeDetailController.DeleteByIds(System.Object[])">
            <summary>
                æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeDetailController.Add(MES.Service.Modes.SalesDeliveryNoticeDetail)">
            <summary>
                æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNoticeDetail)">
            <summary>
                æ·»åŠ è¿”å›žè‡ªå¢ž
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesDeliveryNoticeDetailController.Update(MES.Service.Modes.SalesDeliveryNoticeDetail)">
            <summary>
                ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.Save(MES.Service.Dto.webApi.SalesOrders)">
            <summary>
                å•条主表数据保存操作
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.SaveList(System.Collections.Generic.List{MES.Service.Dto.webApi.SalesOrders})">
            <summary>
                å¤šæ¡ä¸»è¡¨æ•°æ®ä¿å­˜æ“ä½œ
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.GetList">
            <summary>
                èŽ·å–æ‰€æœ‰
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.GetById(System.Int32)">
            <summary>
                æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.DeleteByIds(System.Object[])">
            <summary>
                æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.Add(MES.Service.Modes.SalesOrder)">
            <summary>
                æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.InsertReturnIdentity(MES.Service.Modes.SalesOrder)">
            <summary>
                æ·»åŠ è¿”å›žè‡ªå¢ž
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.Update(MES.Service.Modes.SalesOrder)">
            <summary>
                ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderDetailController.GetList">
            <summary>
                èŽ·å–æ‰€æœ‰
@@ -625,90 +493,6 @@
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderDetailController.Update(MES.Service.Modes.SalesOrderDetail)">
            <summary>
                ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.Save(MES.Service.Dto.webApi.SaleReturnNotice)">
            <summary>
                å•条主表数据保存操作
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.SaveList(System.Collections.Generic.List{MES.Service.Dto.webApi.SaleReturnNotice})">
            <summary>
                å¤šæ¡ä¸»è¡¨æ•°æ®ä¿å­˜æ“ä½œ
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.GetList">
            <summary>
                èŽ·å–æ‰€æœ‰
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.GetById(System.Int32)">
            <summary>
                æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.DeleteByIds(System.Object[])">
            <summary>
                æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.Add(MES.Service.Modes.SalesReturnNotice)">
            <summary>
                æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNotice)">
            <summary>
                æ·»åŠ è¿”å›žè‡ªå¢ž
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.Update(MES.Service.Modes.SalesReturnNotice)">
            <summary>
                ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetList">
            <summary>
                èŽ·å–æ‰€æœ‰
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetById(System.Int32)">
            <summary>
                æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.DeleteByIds(System.Object[])">
            <summary>
                æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)">
            <summary>
                æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)">
            <summary>
                æ·»åŠ è¿”å›žè‡ªå¢ž
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)">
            <summary>
                ä¿®æ”¹
            </summary>
@@ -840,6 +624,78 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.GetList">
            <summary>
                èŽ·å–æ‰€æœ‰
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.GetById(System.Int32)">
            <summary>
                æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.DeleteByIds(System.Object[])">
            <summary>
                æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.Add(MES.Service.Modes.SalesOrder)">
            <summary>
                æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.InsertReturnIdentity(MES.Service.Modes.SalesOrder)">
            <summary>
                æ·»åŠ è¿”å›žè‡ªå¢ž
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.Update(MES.Service.Modes.SalesOrder)">
            <summary>
                ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.GetList">
            <summary>
                èŽ·å–æ‰€æœ‰
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.GetById(System.Int32)">
            <summary>
                æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.DeleteByIds(System.Object[])">
            <summary>
                æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.Add(MES.Service.Modes.SalesReturnNotice)">
            <summary>
                æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNotice)">
            <summary>
                æ·»åŠ è¿”å›žè‡ªå¢ž
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.Update(MES.Service.Modes.SalesReturnNotice)">
            <summary>
                ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.GetList">
            <summary>
            èŽ·å–æ‰€æœ‰
@@ -918,6 +774,13 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.SJController.UpdateQsItemIpiItemIsPass(Newtonsoft.Json.Linq.JObject)">
            <summary>
            æ›´æ–°QsItemIpiItem的IsPass值
            </summary>
            <param name="data">包含id和isPass的JSON对象</param>
            <returns>更新结果</returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.XJController.getDaa001(Newtonsoft.Json.Linq.JObject)">
            <summary>
                èŽ·å–å·¥å•
@@ -929,6 +792,42 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetList">
            <summary>
            èŽ·å–æ‰€æœ‰
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetById(System.Int32)">
            <summary>
            æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.DeleteByIds(System.Object[])">
            <summary>
            æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Add(MES.Service.Modes.SalesDeliveryNotice.SalesDeliveryNotice)">
            <summary>
            æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNotice.SalesDeliveryNotice)">
            <summary>
            æ·»åŠ è¿”å›žè‡ªå¢ž
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Update(MES.Service.Modes.SalesDeliveryNotice.SalesDeliveryNotice)">
            <summary>
            ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesDepotSectionsController.GetList">
            <summary>
                èŽ·å–æ‰€æœ‰