Revert "销售退货通知单完善、销售收货通知单增加"

zyf

2024-12-11 1afd9dafa4d1ec83f4f94c2ceae41b03179b533f

Revert "销售退货通知单完善、销售收货通知单增加"

This reverts commit fdb948154f070ce648ed4ee0b7e15d556a8b5886.

 MES.Service/Dto/webApi/ErpItems.cs

@@ -28,7 +28,4 @@

    public string? FPRODUCEUNITID { get; set; }
    public string? FSUBCONUNITID { get; set; }

    public string? F_UNW_CheckBox_SFBZ { get; set; }
    public string? F_UNW_CheckBox_SFDB { get; set; }
}

 MES.Service/Dto/webApi/ErpSalesDelivery.cs

ÎļþÒÑɾ³ý

 MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs

ÎļþÒÑɾ³ý

 MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs

ÎļþÒÑɾ³ý

 MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs

@@ -3,28 +3,35 @@
public class ErpSalesReturnDetailDto
{
    public string? Type { get; set; }
    public string? F_UNW_Text_xsddh { get; set; }  // é”€å”®è®¢å•å·
    public string? FMaterialId { get; set; }  // ç‰©æ–™ç¼–码
    public string? FMaterialName { get; set; }  // ç‰©æ–™åç§°
    public string? FMaterialModel { get; set; }  // è§„格型号
    public string? FUnitID { get; set; }  // é”€å”®å•ä½
    public string? FQty { get; set; }  // é”€å”®æ•°é‡
    public string? FPriceUnitId { get; set; }  // è®¡ä»·å•ä½
    public string? FPriceUnitQty { get; set; }  // è®¡ä»·æ•°é‡
    public string? FDeliveryDate { get; set; }  // è¦è´§æ—¥æœŸ
    public string? FIsFree { get; set; }  // æ˜¯å¦èµ å“
    public string? FDeliverydate { get; set; }  // é€€è´§æ—¥æœŸ
    public string? FStockId { 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? 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? 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? FOrderNo { get; set; }  // è®¢å•å•å·
    public string? FSrcBillNo { get; set; }  // æºå•å•å·
    public string? FDeliQty { get; set; }  // ç´¯è®¡å‘货通知数量
    public string? FStockOutQty { get; set; }  // ç´¯è®¡å‡ºåº“数量
    public string? FBaseRetNoticeQty { get; set; }  // ç´¯è®¡é€€è´§é€šçŸ¥æ•°é‡ï¼ˆé”€å”®åŸºæœ¬ï¼‰
    public string? FBaseReturnQty { get; set; }  // ç´¯è®¡é€€è´§æ•°é‡ï¼ˆé”€å”®åŸºæœ¬ï¼‰
    public string? FBaseRemainOutQty { get; set; }  // å‰©ä½™æœªå‡ºæ•°é‡ï¼ˆé”€å”®åŸºæœ¬ï¼‰
    public string? FBASEARQTY { get; set; }  // ç´¯è®¡åº”收数量（销售基本）
    public string? ErpID { get; set; }  // ERPID
    public string? EHID { get; set; }  // ERP头ID


 MES.Service/Dto/webApi/ErpSalesReturnDto.cs

@@ -4,38 +4,40 @@
{
    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? 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? 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? 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? 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? 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? FCancelDate { get; set; } // ä½œåºŸæ—¥æœŸ
    public string? FBillCloseStatus { get; set; } // å…³é—­çŠ¶æ€
    public string? FVersionNo { get; set; } // ç‰ˆæœ¬å·
    public string? FChangerId { get; set; } // å˜æ›´äºº
    public string? FEntryNote { get; set; } // å¤‡æ³¨
}

 MES.Service/Modes/MesItems.cs

@@ -219,16 +219,16 @@
    public string Fpurchaseunitid { get; set; }

    /// <summary>
    ///     æ˜¯å¦åŒ…装
    ///     è‡ªå®šä¹‰å­—段1
    /// </summary>
    [SugarColumn(ColumnName = "CHECKBOX_SFBZ")]
    public string CheckbosSFBZ { get; set; }
    [SugarColumn(ColumnName = "REMARK1")]
    public string Remark1 { get; set; }

    /// <summary>
    ///     æ˜¯å¦æ‰“æ ‡
    ///     è‡ªå®šä¹‰å­—段2
    /// </summary>
    [SugarColumn(ColumnName = "CHECKBOX_SFDB")]
    public string CheckbosSFDB { get; set; }
    [SugarColumn(ColumnName = "REMARK2")]
    public string Remark2 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段3

 MES.Service/Modes/SalesDeliveryNotice.cs

ÎļþÒÑɾ³ý

 MES.Service/Modes/SalesDeliveryNoticeDetail.cs

ÎļþÒÑɾ³ý

 MES.Service/Modes/SalesReturnNotice.cs

@@ -1,209 +1,162 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
using SqlSugar;

namespace MES.Service.Modes;

/// <summary>
///     é”€å”®é€€è´§é€šçŸ¥å•è¡¨
/// </summary>
[SugarTable("SALES_RETURN_NOTICE")]
public class SalesReturn
{
    /// <summary>
    /// é”€å”®é€€è´§é€šçŸ¥å•è¡¨
    ///</summary>
    [SugarTable("SALES_RETURN_NOTICE")]
    public class SalesReturnNotice
    {
        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
        public decimal? Id { get; set; }
        /// <summary>
        /// å•æ®ç±»åž‹ 
        ///</summary>
        [SugarColumn(ColumnName = "BILL_TYPE")]
        public string BillType { get; set; }
        /// <summary>
        /// å•æ®ç¼–号 
        ///</summary>
        [SugarColumn(ColumnName = "BILL_NO")]
        public string BillNo { get; set; }
        /// <summary>
        /// æ—¥æœŸ 
        ///</summary>
        [SugarColumn(ColumnName = "F_DATE")]
        public DateTime? FDate { get; set; }
        /// <summary>
        /// ç»“算币别 
        ///</summary>
        [SugarColumn(ColumnName = "CURRENCY")]
        public string Currency { get; set; }
        /// <summary>
        /// é”€å”®ç»„织 
        ///</summary>
        [SugarColumn(ColumnName = "SALES_ORG")]
        public string SalesOrg { get; set; }
        /// <summary>
        /// é”€å”®éƒ¨é—¨ 
        ///</summary>
        [SugarColumn(ColumnName = "SALES_DEPT")]
        public string SalesDept { get; set; }
        /// <summary>
        /// å®¢æˆ·è®¢å• 
        ///</summary>
        [SugarColumn(ColumnName = "CUSTOMER_ORDER_NO")]
        public string CustomerOrderNo { get; set; }
        /// <summary>
        /// é€€è´§å®¢æˆ· 
        ///</summary>
        [SugarColumn(ColumnName = "RETURN_CUSTOMER")]
        public string ReturnCustomer { get; set; }
        /// <summary>
        /// æ·˜å®å®¢æˆ·å¤‡æ³¨ 
        ///</summary>
        [SugarColumn(ColumnName = "TAOBAO_REMARK")]
        public string TaobaoRemark { get; set; }
        /// <summary>
        /// é€€è´§åŽŸå›  
        ///</summary>
        [SugarColumn(ColumnName = "RETURN_REASON")]
        public string ReturnReason { get; set; }
        /// <summary>
        /// äº¤è´§åœ°ç‚¹ 
        ///</summary>
        [SugarColumn(ColumnName = "DELIVERY_LOCATION")]
        public string DeliveryLocation { get; set; }
        /// <summary>
        /// åº“存组织 
        ///</summary>
        [SugarColumn(ColumnName = "INVENTORY_ORG")]
        public string InventoryOrg { get; set; }
        /// <summary>
        /// åº“存部门 
        ///</summary>
        [SugarColumn(ColumnName = "INVENTORY_DEPT")]
        public string InventoryDept { get; set; }
        /// <summary>
        /// åº“存组 
        ///</summary>
        [SugarColumn(ColumnName = "INVENTORY_GROUP")]
        public string InventoryGroup { get; set; }
        /// <summary>
        /// ä»“管员 
        ///</summary>
        [SugarColumn(ColumnName = "WAREHOUSE_MANAGER")]
        public string WarehouseManager { get; set; }
        /// <summary>
        /// é”€å”®ç»„ 
        ///</summary>
        [SugarColumn(ColumnName = "SALES_GROUP")]
        public string SalesGroup { get; set; }
        /// <summary>
        /// é”€å”®å‘˜ 
        ///</summary>
        [SugarColumn(ColumnName = "SALES_PERSON")]
        public string SalesPerson { get; set; }
        /// <summary>
        /// å¿«é€’单号 
        ///</summary>
        [SugarColumn(ColumnName = "EXPRESS_NO")]
        public string ExpressNo { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹ 
        ///</summary>
        [SugarColumn(ColumnName = "RECEIVER")]
        public string Receiver { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹è”系人 
        ///</summary>
        [SugarColumn(ColumnName = "RECEIVER_CONTACT")]
        public string ReceiverContact { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹åœ°å€ 
        ///</summary>
        [SugarColumn(ColumnName = "RECEIVER_ADDRESS")]
        public string ReceiverAddress { get; set; }
        /// <summary>
        /// æ”¶è´§æ–¹å§“名 
        ///</summary>
        [SugarColumn(ColumnName = "RECEIVER_NAME")]
        public string ReceiverName { get; set; }
        /// <summary>
        /// ç»“ç®—æ–¹ 
        ///</summary>
        [SugarColumn(ColumnName = "SETTLE_PARTY")]
        public string SettleParty { get; set; }
        /// <summary>
        /// åˆ›å»ºäºº 
        ///</summary>
        [SugarColumn(ColumnName = "CREATED_BY")]
        public string CreatedBy { get; set; }
        /// <summary>
        /// åˆ›å»ºæ—¶é—´ 
        ///</summary>
        [SugarColumn(ColumnName = "CREATED_DATE")]
        public DateTime? CreatedDate { get; set; }
        /// <summary>
        /// ä¿®æ”¹äºº 
        ///</summary>
        [SugarColumn(ColumnName = "MODIFIED_BY")]
        public string ModifiedBy { get; set; }
        /// <summary>
        /// ä¿®æ”¹æ—¶é—´ 
        ///</summary>
        [SugarColumn(ColumnName = "MODIFIED_DATE")]
        public DateTime? ModifiedDate { get; set; }
        /// <summary>
        /// å…³é—­äºº 
        ///</summary>
        [SugarColumn(ColumnName = "CLOSED_BY")]
        public string ClosedBy { get; set; }
        /// <summary>
        /// å…³é—­åŽŸå›  
        ///</summary>
        [SugarColumn(ColumnName = "CLOSE_REASON")]
        public string CloseReason { get; set; }
        /// <summary>
        /// å…³é—­æ—¥æœŸ 
        ///</summary>
        [SugarColumn(ColumnName = "CLOSE_DATE")]
        public DateTime? CloseDate { get; set; }
        /// <summary>
        /// å®¡æ ¸äºº 
        ///</summary>
        [SugarColumn(ColumnName = "APPROVED_BY")]
        public string ApprovedBy { get; set; }
        /// <summary>
        /// å®¡æ ¸æ—¥æœŸ 
        ///</summary>
        [SugarColumn(ColumnName = "APPROVED_DATE")]
        public DateTime? ApprovedDate { get; set; }
        /// <summary>
        /// ä½œåºŸçŠ¶æ€ 
        ///</summary>
        [SugarColumn(ColumnName = "CANCEL_STATUS")]
        public string CancelStatus { get; set; }
        /// <summary>
        /// ä½œåºŸäºº 
        ///</summary>
        [SugarColumn(ColumnName = "CANCELLED_BY")]
        public string CancelledBy { get; set; }
        /// <summary>
        /// ä½œåºŸæ—¥æœŸ 
        ///</summary>
        [SugarColumn(ColumnName = "CANCEL_DATE")]
        public DateTime? CancelDate { get; set; }
        /// <summary>
        /// å…³é—­çŠ¶æ€ 
        ///</summary>
        [SugarColumn(ColumnName = "CLOSE_STATUS")]
        public string CloseStatus { get; set; }
        /// <summary>
        /// æ˜¯å¦æ‰‹åŠ¨å…³é—­ 
        ///</summary>
        [SugarColumn(ColumnName = "MANUAL_CLOSE_FLAG")]
        public string ManualCloseFlag { get; set; }
        /// <summary>
        /// ERP头ID 
        ///</summary>
        [SugarColumn(ColumnName = "ERP_ID")]
        public string ErpId { get; set; }
    }
}
    ///     SEQ_sales
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }

    /// <summary>
    ///     é”€å”®è®¢å•å·
    /// </summary>
    [SugarColumn(ColumnName = "SALES_ORDER_ID")]
    public string SalesOrderId { get; set; }

    /// <summary>
    ///     ç‰©æ–™ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "MATERIAL_ID")]
    public string MaterialId { get; set; }

    /// <summary>
    ///     ç‰©æ–™åç§°
    /// </summary>
    [SugarColumn(ColumnName = "MATERIAL_NAME")]
    public string MaterialName { get; set; }

    /// <summary>
    ///     ç‰©æ–™è§„æ ¼
    /// </summary>
    [SugarColumn(ColumnName = "MATERIAL_SPECIFICATION")]
    public string MaterialSpecification { get; set; }

    /// <summary>
    ///     é”€å”®å•ä½
    /// </summary>
    [SugarColumn(ColumnName = "SALES_UNIT_ID")]
    public string SalesUnitId { get; set; }

    /// <summary>
    ///     é”€å”®æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "SALES_QUANTITY")]
    public decimal SalesQuantity { get; set; }

    /// <summary>
    ///     æ˜¯å¦èµ å“
    /// </summary>
    [SugarColumn(ColumnName = "IS_FREE")]
    public bool IsFree { get; set; }

    /// <summary>
    ///     é€€è´§æ—¥æœŸ
    /// </summary>
    [SugarColumn(ColumnName = "RETURN_DATE")]
    public DateTime? ReturnDate { get; set; }

    /// <summary>
    ///     ä»“库
    /// </summary>
    [SugarColumn(ColumnName = "WAREHOUSE")]
    public string Warehouse { get; set; }

    /// <summary>
    ///     è®¡åˆ’跟踪号
    /// </summary>
    [SugarColumn(ColumnName = "PLAN_TRACKING_NUMBER")]
    public string PlanTrackingNumber { get; set; }

    /// <summary>
    ///     æ‰¹å·
    /// </summary>
    [SugarColumn(ColumnName = "LOT_NUMBER")]
    public string LotNumber { get; set; }

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

    /// <summary>
    ///     é€€è´§ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "RETURN_TYPE")]
    public string ReturnType { get; set; }

    /// <summary>
    ///     è·Ÿå•å‘˜
    /// </summary>
    [SugarColumn(ColumnName = "SALES_CLERK")]
    public string SalesClerk { get; set; }

    /// <summary>
    ///     åº“存单位
    /// </summary>
    [SugarColumn(ColumnName = "INVENTORY_UNIT")]
    public string InventoryUnit { get; set; }

    /// <summary>
    ///     åº“存数量
    /// </summary>
    [SugarColumn(ColumnName = "INVENTORY_QUANTITY")]
    public decimal InventoryQuantity { get; set; }

    /// <summary>
    ///     ç‰©æ–™ç±»åˆ«
    /// </summary>
    [SugarColumn(ColumnName = "MATERIAL_CATEGORY")]
    public string MaterialCategory { get; set; }

    /// <summary>
    ///     è´§ä¸»ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "OWNER_TYPE_ID")]
    public string OwnerTypeId { get; set; }

    /// <summary>
    ///     è´§ä¸»
    /// </summary>
    [SugarColumn(ColumnName = "OWNER_ID")]
    public string OwnerId { get; set; }

    /// <summary>
    ///     æºå•ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "SOURCE_BILL_TYPE")]
    public string SourceBillType { get; set; }

    /// <summary>
    ///     æºå•å•å·
    /// </summary>
    [SugarColumn(ColumnName = "SOURCE_BILL_NO")]
    public string SourceBillNo { get; set; }

    /// <summary>
    ///     è®¢å•å•å·
    /// </summary>
    [SugarColumn(ColumnName = "ORDER_BILL_NO")]
    public string OrderBillNo { get; set; }

    /// <summary>
    ///     ERP行ID
    /// </summary>
    [SugarColumn(ColumnName = "ERP_LINE_ID")]
    public string ErpLineId { get; set; }

    /// <summary>
    ///     ERP头ID
    /// </summary>
    [SugarColumn(ColumnName = "ERP_HEAD_ID")]
    public string ErpHeadId { get; set; }

}

 MES.Service/Modes/SalesReturnNoticeDetail.cs

@@ -11,7 +11,8 @@
    /// <summary>
    ///     SEQ_sales
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }

    /// <summary>

 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/MesItemsManager.cs

@@ -156,10 +156,7 @@
            SubconUnit = item.FSUBCONUNITID,
            CreateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000",
            CheckbosSFBZ = item.F_UNW_CheckBox_SFBZ,
            CheckbosSFDB = item.F_UNW_CheckBox_SFDB

            Factory = "1000"
        };
    }


 MES.Service/service/BasicData/SalesDeliveryNoticeDetailManager.cs

ÎļþÒÑɾ³ý

 MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs

ÎļþÒÑɾ³ý

 MES.Service/service/BasicData/SalesReturnNoticeManager.cs

@@ -8,7 +8,7 @@

namespace MES.Service.service.BasicData;

public class SalesReturnNoticeManager : Repository<SalesReturnNotice>
public class SalesReturnManager : Repository<SalesReturn>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„方法

@@ -44,13 +44,13 @@
        }) > 0;
    }

    private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
        List<SalesReturnNoticeDetail> mesSalesReturnDatas)
    private bool UpdateData(SqlSugarScope db, SalesReturn mesSalesReturn,
        List<SalesReturnDetail> mesSalesReturnDatas)
    {
        var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
        var update = base.DeleteById(mesSalesReturn.Id);
        var insertOrUpdate = db
            .Deleteable<SalesReturnNoticeDetail>().In(decimals)
            .Deleteable<SalesReturnDetail>().In(decimals)
            .ExecuteCommand() > 0;

        if (update && insertOrUpdate) return true;
@@ -58,14 +58,14 @@
    }

    // æ’入或更新数据的方法
    private bool SaveOrUpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
        List<SalesReturnNoticeDetail> mesSalesReturnDatas,string type)
    private bool SaveOrUpdateData(SqlSugarScope db, SalesReturn mesSalesReturn,
        List<SalesReturnDetail> mesSalesReturnDatas,string type)
    {
        if (mesSalesReturn.Id != null) base.DeleteById(mesSalesReturn.Id);

        if (mesSalesReturnDatas.Count > 0)
            db.Deleteable<SalesReturnNoticeDetail>()
                .Where(s => s.ErpHeadId == mesSalesReturn.ErpId).ExecuteCommand();
            db.Deleteable<SalesReturnDetail>()
                .Where(s => s.EHID == mesSalesReturn.ErpID).ExecuteCommand();

        var orUpdate = base.Insert(mesSalesReturn);
        var baOrUpdate = _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
@@ -82,8 +82,8 @@
        return result.All(b => b);
    }

    private SalesReturnNotice ConvertErpToSalesReturn(
        ErpSalesReturnDto erpDto)
    private SalesReturn ConvertErpToSalesReturn(
        ErpSalesRerurnDto erpDto)
    {
        DateTime parsedDate;

@@ -99,106 +99,103 @@
            return null; // å¦‚果转换失败，返回null
        }

        var salesOrder = new SalesReturnNotice
        var salesOrder = new SalesReturn
        {
            BillNo = erpDto.FBillNo,
            ErpId = erpDto.ErpID,
            ErpID = Convert.ToDecimal(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, // å…³é—­åŽŸå› 
            BillTypeId = erpDto.FBillTypeID, // å•æ®ç±»åž‹
            DocumentStatus = erpDto.FDocumentStatus, // å•æ®çŠ¶æ€
            BusinessType = erpDto.FBusinessType, // ä¸šåŠ¡ç±»åž‹
            HeadDeliveryWay = erpDto.FHeadDeliveryWay, // äº¤è´§æ–¹å¼
            HeadLocId = erpDto.FHEADLOCID, // äº¤è´§åœ°ç‚¹
            UnWTextKhdd = erpDto.F_UNW_Text_KHDD, // å®¢æˆ·è®¢å•
            UnWDateKhxq = ParseDateTime(erpDto.F_UNW_Date_KHXQ) ?? null, // å®¢æˆ·éœ€æ±‚交期
            UnWBasePropertyKhdj = erpDto.F_UNW_BaseProperty_KHDJ, // å®¢æˆ·ç­‰çº§
            CustId = erpDto.FCustId, // å®¢æˆ·
            UnWLargetextTbkhbz = erpDto.F_UNW_LargeText_TBKHBZ, // æ·˜å®å®¢æˆ·å¤‡æ³¨
            CloseStatus = erpDto.FCloseStatus, // å…³é—­çŠ¶æ€
            SaleDeptId = erpDto.FSaleDeptId, // é”€å”®éƒ¨é—¨
            SalerId = erpDto.FSalerId, // é”€å”®å‘˜
            ChangeReason = erpDto.FChangeReason, // å˜æ›´åŽŸå› 
            Note = erpDto.FNote, // å¤‡æ³¨
            UnWRemarksKhjHdd = erpDto.F_UNW_Remarks_KHJHDD, // å®¢æˆ·äº¤è´§åœ°ç‚¹
            SettleId = erpDto.FSettleId, // ç»“ç®—æ–¹
            ApproverId = erpDto.FApproverId, // å®¡æ ¸äºº
            LinkMan = erpDto.FLinkMan, // æ”¶è´§äººå§“名
            ChargeId = erpDto.FChargeId, // ä»˜æ¬¾æ–¹
            LinkPhone = erpDto.FLinkPhone, // è”系电话
            CreatorId = erpDto.FCreatorId, // åˆ›å»ºäºº
            CreateDate = ParseDateTime(erpDto.FCreateDate) ?? null, // åˆ›å»ºæ—¥æœŸ
            ModifierId = erpDto.FModifierId, // æœ€åŽä¿®æ”¹äºº
            ModifyDate = ParseDateTime(erpDto.FModifyDate) ?? null, // æœ€åŽä¿®æ”¹æ—¥æœŸ
            ApproveDate = ParseDateTime(erpDto.FApproveDate) ?? null, // å®¡æ ¸æ—¥æœŸ
            CloserId = erpDto.FCloserId, // å…³é—­äºº
            CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // å…³é—­æ—¥æœŸ
            ApprovedBy = erpDto.FApproverId, // å®¡æ ¸äºº
            ApprovedDate = ParseDateTime(erpDto.FApproveDate) ?? null, // å®¡æ ¸æ—¥æœŸ
            ChangeDate = ParseDateTime(erpDto.FChangeDate) ?? null, // å˜æ›´æ—¥æœŸ
            CancelStatus = erpDto.FCancelStatus, // ä½œåºŸçŠ¶æ€
            CancelledBy = erpDto.FCancellerId, // ä½œåºŸäºº
            CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // ä½œåºŸæ—¥æœŸ
            CloseStatus = erpDto.FBillCloseStatus, // å…³é—­çŠ¶æ€
         
            CancellerId = erpDto.FCancellerId, // ä½œåºŸäºº
            VersionNo = Convert.ToDouble(erpDto.FVersionNo), // ç‰ˆæœ¬å·
            ChangerId = erpDto.FChangerId, // å˜æ›´äºº
            EntryNote = erpDto.FEntryNote // å¤‡æ³¨
            //ParseDateTime() ?? null
            //long.Parse()
            //Convert.ToDecimal()
            //Convert.ToDouble()
        };

        var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
        var single = base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
        if (single != null) salesOrder.Id = single.Id;

        return salesOrder;
    }

    private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(
        List<ErpSalesReturnDetailDto> erpDtoList)
        
    private List<SalesReturnDetail> ConvertErpToSalesReturnDetail(
        List<ErpSalesRerurnDetailDto> 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
        }


            new List<SalesReturnDetail>();

        foreach (var erpDto in erpDtoList)
        {
            var salesOrderSub = new SalesReturnNoticeDetail
            var salesOrderSub = new SalesReturnDetail
            {
                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
                ErpID = Convert.ToDecimal(erpDto.ErpID),
                EHID = Convert.ToDecimal(erpDto.EHID),
                MaterialId = erpDto.FMaterialId,
                UnitId = erpDto.FUnitID,
                Qty = Convert.ToDecimal(erpDto.FQty),
                PriceUnitId = erpDto.FPriceUnitId,
                PriceUnitQty = Convert.ToDecimal(erpDto.FPriceUnitQty),
                DeliveryDate = Convert.ToDateTime(erpDto.FDeliveryDate),
                IsFree = erpDto.FIsFree,
                SalesReturnNo = erpDto.F_UNW_Text_xsddh,
                SalesFollowUp = erpDto.F_UNW_Base_GDY,
                OwnerTypeId = erpDto.FOwnerTypeId,
                OwnerId = erpDto.FOwnerId,
                EntryNote = erpDto.FEntryNote,
                MtoNo = erpDto.FMtoNo,
                Lot = erpDto.FLot,
                DeliveryMaxQty = Convert.ToDecimal(erpDto.FDeliveryMaxQty),
                DeliveryMinQty = Convert.ToDecimal(erpDto.FDeliveryMinQty),
                OutLmtUnitId = erpDto.FOutLmtUnitID,
                MrpCloseStatus = erpDto.FMrpCloseStatus,
                MrpTerminateStatus = erpDto.FMrpTerminateStatus,
                TerminateDate = Convert.ToDateTime(erpDto.FTerminateDate),
                TerminaterId = erpDto.FTerminatorId,
                SrcType = erpDto.FSrcType,
                SrcBillNo = erpDto.FSrcBillNo,
                DeliQty = Convert.ToDecimal(erpDto.FDeliQty),
                StockOutQty = Convert.ToDecimal(erpDto.FStockOutQty),
                BaseRetNoticeQty = Convert.ToDecimal(erpDto.FBaseRetNoticeQty),
                BaseReturnQty = Convert.ToDecimal(erpDto.FBaseReturnQty),
                BaseRemainOutQty = Convert.ToDecimal(erpDto.FBaseRemainOutQty),
                BASEARQTY = Convert.ToDecimal(erpDto.FBASEARQTY),

            };

            var single = _SalesReturnDetailManager.GetSingle(it =>
                it.ErpLineId == salesOrderSub.ErpLineId);
                it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
            if (single != null) salesOrderSub.Id = single.Id;

            salesOrderSubList.Add(salesOrderSub);
@@ -207,5 +204,5 @@
        return salesOrderSubList;
    }

 
    #endregion
}

 MESApplication/Controllers/BasicData/SalesDeliveryNoticeController.cs

ÎļþÒÑɾ³ý

 MESApplication/Controllers/BasicData/SalesDeliveryNoticeDetailController.cs

ÎļþÒÑɾ³ý

 MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs

@@ -1,11 +1,8 @@
using System.Dynamic;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;

namespace MESApplication.Controllers.BasicData;

@@ -13,108 +10,7 @@
[Route("api/[controller]")]
public class SalesReturnNoticeController : ControllerBase
{
   private readonly MessageCenterManager _manager = new();

    private readonly SalesReturnNoticeManager m = new();

    private readonly string METHOD = "POST";

    private readonly string TableName = "SALES_RETURN_NOTICE";

    private readonly string URL = "http://localhost:10054/api/SalesReturnNotice/";


    //
    [HttpPost("Save")]
    public ResponseResult Save(ErpSalesRerurn salesOrder)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "Save";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(salesOrder);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.Save(salesOrder);

            resultInfos.tbBillList = save;

            entity.Result = 0;
            if (save) entity.Result = 1;

            entity.DealWith = 1;
            _manager.save(entity);

            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;

            entity.DealWith = 0;

            entity.ResultData = ex.Message;

            _manager.save(entity);

            return ResponseResult.ResponseError(ex);
        }
    }

    [HttpPost("SaveList")]
    public ResponseResult SaveList(List<ErpSalesRerurn> units)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "SaveList";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(units);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var save = m.SaveList(units);
            resultInfos.tbBillList = save;

            entity.Result = 0;
            if (save) entity.Result = 1;

            entity.DealWith = 1;
            _manager.save(entity);

            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;

            entity.DealWith = 0;

            entity.ResultData = ex.Message;

            _manager.save(entity);

            return ResponseResult.ResponseError(ex);
        }
    }






    /***进入模版管理可以修改模版***/

 MESApplication/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.pdb

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.xml

@@ -606,37 +606,37 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.GetList">
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetList">
            <summary>
                èŽ·å–所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.GetById(System.Int32)">
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.GetById(System.Int32)">
            <summary>
                æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.DeleteByIds(System.Object[])">
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.DeleteByIds(System.Object[])">
            <summary>
                æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)">
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Add(MES.Service.Modes.SalesReturnNoticeDetail)">
            <summary>
                æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)">
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesReturnNoticeDetail)">
            <summary>
                æ·»åŠ è¿”回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)">
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeDetailController.Update(MES.Service.Modes.SalesReturnNoticeDetail)">
            <summary>
                ä¿®æ”¹
            </summary>
@@ -747,78 +747,6 @@
        <member name="M:MESApplication.Controllers.BasicData.SysDepartmentController.Update(MES.Service.Modes.SysDepartment)">
            <summary>
                ä¿®æ”¹
            </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)">
            <summary>
            æ·»åŠ  
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNotice)">
            <summary>
            æ·»åŠ è¿”回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Update(MES.Service.Modes.SalesDeliveryNotice)">
            <summary>
            ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.GetList">
            <summary>
            èŽ·å–所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.GetById(System.Int32)">
            <summary>
            æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.DeleteByIds(System.Object[])">
            <summary>
            æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.Add(MES.Service.Modes.SalesDeliveryNoticeDetail)">
            <summary>
            æ·»åŠ  
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNoticeDetail)">
            <summary>
            æ·»åŠ è¿”回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeDetailController.Update(MES.Service.Modes.SalesDeliveryNoticeDetail)">
            <summary>
            ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>