采购订单接口

啊鑫

2025-02-09 70e8a5aec5d49a95483d4c0e066ccdcc45a02e79

采购订单接口

 .idea/WR_API.iml

ÎļþÒÑɾ³ý

 .idea/libraries/publish.xml

ÎļþÒÑɾ³ý

 .idea/misc.xml

ÎļþÒÑɾ³ý

 .idea/modules.xml

ÎļþÒÑɾ³ý

 .idea/vcs.xml

ÎļþÒÑɾ³ý

 .idea/workspace.xml

ÎļþÒÑɾ³ý

 StandardPda/MES.Service/Dto/webApi/ErpDepots.cs

 StandardPda/MES.Service/Dto/webApi/ErpProject.cs

 StandardPda/MES.Service/Dto/webApi/ErpRohIn.cs

@@ -4,43 +4,34 @@
{
    public string id { get; set; }
    public string? Type { get; set; }
    public string? FBillNo { get; set; }
    public string? FDocumentStatus { get; set; }
    public string? FBillTypeID { get; set; }
    public string? FBusinessType { get; set; }
    public string? FDate { get; set; }
    public string? FBillTypeId { get; set; }
    public string? FBillNo { get; set; }
    public string? FSupplierId { get; set; }
    public string? FCloseStatus { get; set; }
    public string? FPurchaseOrgId { get; set; }
    public string? FPurchaseDeptId { get; set; }
    public string? FPurchaserGroupId { get; set; }
    public string? FDate { get; set; }
    public string? FPurchaserId { get; set; }
    public string? Acctype { get; set; }
    public string? FSettleId { get; set; }

    public string? FChargeId { get; set; }

    //public string? FProviderEMail { get; set; }
    public string? FPurchaseDeptId { get; set; }
    public string? FSrcDocType { get; set; }
    public string? FSrcDoc { get; set; }
    public string? FTradePathName { get; set; }
    public string? FSubType { get; set; }
    public string? FBusinessType { get; set; }
    public string? FIsReDo { get; set; }
    public string? PubDescSeg2 { get; set; }
    public string? Remarks { get; set; }
    public string? FCancelStatus { get; set; }
    public string? FCancellerId { get; set; }
    public string? FCancelDate { get; set; }
    public string? PrivateDescSeg1 { get; set; }
    public string? FCloseStatus { get; set; }
    public string? FVersion { get; set; }
    public string? FPurchaseOrgId { get; set; }
    public string? FReceiveOrgId { 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? FChangeReason { get; set; }
    public string? Prearrivaldate { get; set; }

    public string? FReceiveOrgId { get; set; }
    //public string? FProviderId { get; set; }

    //public string? FTContact { get; set; }
    //public string? Fmobilephone { get; set; }

    //public string? FixedTelephone { get; set; }

    //public string? Address { get; set; }
    // public string? FCancelStatus { get; set; }
    // public string? FCancellerId { get; set; }
    // public string? FCancelDate { get; set; }
}

 StandardPda/MES.Service/Dto/webApi/ErpRohinData.cs

@@ -5,71 +5,32 @@
    public string id { get; set; }
    public string Eid { get; set; }
    public string? FBillNo { get; set; }

    public string? FSeq { get; set; }

    //没有对应表字段 -池南骏 2025-01-10
    //public string? FXSHTH { get; set; }
    public string? FMaterialId { get; set; }
    public string? FUnitId { get; set; }
    public string? FQty { get; set; }
    public string? FStockUnitID { get; set; }
    public string? FPriceUnitId { get; set; }
    public string? FPriceUnitQty { get; set; }
    public string? FDeliveryDate { get; set; }
    public string? FDeliveryEarlyDate { get; set; }

    public string? FDeliveryLastDate { get; set; }

    // start
    public string? FRequireOrgId { get; set; }
    public string? FRequireDeptId { get; set; }
    public string? FReceiveOrgId { get; set; }
    public string? FReceiveDeptId { get; set; }

    public string? FEntrySettleOrgId { get; set; }

    // end
    public string? FGiveAway { get; set; }

    //public string? FNote { get; set; }
    public string? FEntryNote { get; set; }
    public string? FSupMatId { get; set; }
    public string? FSupMatName { get; set; }
    public string? FSubreqBillNo { get; set; }
    public string? FLot { get; set; }
    public string? FMRPCloseStatus { get; set; }
    public string? FMRPFreezeStatus { get; set; }
    public string? FFreezerId { get; set; }
    public string? FFreezeDate { get; set; }
    public string? FMRPTerminateStatus { get; set; }
    public string? FTerminaterId { get; set; }
    public string? FTerminateDate { get; set; }
    public string? FReceiveQty { get; set; }

    public string? FRemainReceiveQty { get; set; }

    //public string? FBaseStockInQty { get; set; }
    public string? FStockInQty { get; set; } //累计入库数
    public string? FRemainStockINQty { get; set; }

    public string? FMrbQty { get; set; }

    //public string? FBaseCheckRetQty { get; set; }
    //public string? FBaseStockRetQty { get; set; }
    public string? FCHECKRETQTY { get; set; } //收料可退数
    public string? FSTOCKRETQTY { get; set; } //库存可退数
    public string? FSrcBillTypeId { get; set; }
    public string? FSrcBillNo { get; set; }
    public string? FReqTraceNo { get; set; }
    public string? FMtoNo { get; set; }
    public string? FChangeFlag { get; set; }
    public string? FStatus { get; set; }
    public string? FDemandType { get; set; }
    public string? FDemandBillNo { get; set; }
    public string? FDemandBillEntrySeq { get; set; }

    //新增 ç”Ÿäº§é€šçŸ¥å•ã€åž‹å·ã€BOM备注 ä¸‰ä¸ªå­—段   --2025-01-11 æ± å—骏
    public string? F_CGDD_SCTZDA { get; set; }
    public string? F_CGDD_XHA { get; set; }
    public string? F_XIFG_Text_apv { get; set; }
    public string? FSeq { get; set; }
    public string? FMaterialId { get; set; }
    public string? RdProject { get; set; }
    public string? Project { get; set; }
    public string? ProjectPurchaser { get; set; }
    public string? FUnitId { get; set; }
    public string? FQty { get; set; }
    public string? FPriceUnitId { get; set; }
    public string? FPriceUnitQty { get; set; }
    public string? FRequireOrgId { get; set; }
    public string? FReceiveOrgId { get; set; }
    public string? FReceiveDeptId { get; set; }
    public string? FGiveAway { get; set; }
    public string? FSrcBillTypeId { get; set; }
    public string? FSrcBillNo { get; set; }
    public string? FLot { get; set; }
    public string? FReceiveQty { get; set; }
    public string? FRemainReceiveQty { get; set; }
    public string? FStockInQty { get; set; } //累计入库数
    public string? FRemainStockINQty { get; set; }
    public string? FMrbQty { get; set; }
    public string? FCHECKRETQTY { get; set; } //收料可退数
    public string? FSTOCKRETQTY { get; set; } //库存可退数
    public string? FEntryNote { get; set; }
}

 StandardPda/MES.Service/Modes/EmployeeInfo.cs

@@ -1,12 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
using SqlSugar;

namespace MES.Service.Modes
{
namespace MES.Service.Modes;

    /// <summary>
    /// 
    ///</summary>
    [SugarTable("EMPLOYEE_INFO")]
    public class EmployeeInfo
@@ -58,5 +54,4 @@
        ///</summary>
        [SugarColumn(ColumnName = "ORGANIZATION")]
        public string? Organization { get; set; }
    }
}

 StandardPda/MES.Service/Modes/EmployeeItem.cs

@@ -1,18 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
using SqlSugar;

namespace MES.Service.Modes
{
namespace MES.Service.Modes;

    /// <summary>
    /// 
    ///</summary>
    [SugarTable("EMPLOYEE_ITEM")]
    public class EmployeeItem
    {
        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "ID",
            OracleSequenceName = "SEQ_EMP",
@@ -26,7 +21,8 @@
        public decimal? Eid { get; set; }

        /// <summary>
        /// 0=采购业务员, 1=销售业务员, 2=库管员, 3=拣货员, 4=理货员, 5=设计员, 6=计划员, 7=生产管理员, 8=统计员, 9=质检员, 10=成本会计, 11=收款员, 12=资产管理员, 13=其他, 14=设备管理员 
    ///     0=采购业务员, 1=销售业务员, 2=库管员, 3=拣货员, 4=理货员, 5=设计员, 6=计划员, 7=生产管理员, 8=统计员, 9=质检员,
    ///     10=成本会计, 11=收款员, 12=资产管理员, 13=其他, 14=设备管理员
        ///</summary>
        [SugarColumn(ColumnName = "E_TYPE")]
        public string? EType { get; set; }
@@ -36,5 +32,4 @@
        ///</summary>
        [SugarColumn(ColumnName = "CREATE_DATE")]
        public string? CreateDate { get; set; }
    }
}

 StandardPda/MES.Service/Modes/MesDepots.cs

 StandardPda/MES.Service/Modes/MesInvBusiness2.cs

 StandardPda/MES.Service/Modes/MesItemType.cs

@@ -57,13 +57,11 @@
    public DateTime? LastupdateDate { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string? Company { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string? Factory { get; set; }

 StandardPda/MES.Service/Modes/MesItems.cs

@@ -427,7 +427,6 @@
    public string? CatalogNo { get; set; }

     

    /// <summary>
    /// é¢†æ–™å•ä½ 
    ///</summary>

 StandardPda/MES.Service/Modes/MesRohIn.cs

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

@@ -52,7 +53,7 @@
    public string? Supplier { get; set; }

    /// <summary>
    ///     å…³é—­çŠ¶æ€
    ///     å–业务关闭字段 0==未关闭 1==业务关闭
    /// </summary>
    [SugarColumn(ColumnName = "CLOSE_STATUS")]
    public string? CloseStatus { get; set; }
@@ -92,36 +93,6 @@
    /// </summary>
    [SugarColumn(ColumnName = "QUALITY_REQ")]
    public string? QualityReq { get; set; }

    /// <summary>
    ///     ä¾›åº”商联系人
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    public string? SupplierContact { get; set; }

    /// <summary>
    ///     è”系人电话
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    public string? ContactPhone { get; set; }

    /// <summary>
    ///     èŒåŠ¡
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    public string? Position { get; set; }

    /// <summary>
    ///     è”系电话
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    public string? OfficePhone { get; set; }

    /// <summary>
    ///     ä¾›è´§æ–¹åœ°å€
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    public string? SupplierAddress { get; set; }

    /// <summary>
    ///     ç»“ç®—æ–¹
@@ -178,33 +149,37 @@
    public DateTime? CancellationDate { get; set; }

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

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

    /// <summary>
    ///     æœ€åŽä¿®æ”¹æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }

    /// <summary>
    ///     æœ€åŽä¿®æ”¹äºº
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string? LastupdateBy { get; set; }

    /// <summary>
    ///     ERP审核人
    ///     å®¡æ ¸äºº
    /// </summary>
    [SugarColumn(ColumnName = "ERP_CHECK_BY")]
    public string? ErpCheckBy { get; set; }

    /// <summary>
    ///     ERP审核日期
    ///     å®¡æ ¸æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "ERP_CHECK_DATE")]
    public string? ErpCheckDate { get; set; }
@@ -219,7 +194,7 @@
    ///     å®¡æ ¸æ—¥æœŸ
    /// </summary>
    [SugarColumn(ColumnName = "CHECK_DATE")]
    public string? CheckDate { get; set; }
    public DateTime? CheckDate { get; set; }

    /// <summary>
    ///     å®¡æ ¸äºº
@@ -232,12 +207,6 @@
    /// </summary>
    [SugarColumn(ColumnName = "CHECK_FALG")]
    public short? CheckFalg { get; set; }

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

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段1
@@ -270,7 +239,13 @@
    public string? Remark5 { get; set; }

    /// <summary>
    ///     ä¸šåŠ¡ç±»åž‹
    ///     å˜æ›´åŽŸå› 
    /// </summary>
    [SugarColumn(ColumnName = "CHANGEREASON")]
    public string? Changereason { get; set; }

    /// <summary>
    ///     é¢„计到达时间
    /// </summary>
    [SugarColumn(ColumnName = "ARRIVE_DATE")]
    public DateTime? ArriveDate { get; set; }
@@ -282,8 +257,50 @@
    public decimal? ReceiveOrg { get; set; }

    /// <summary>
    ///     æ”¶æ–™ç»„织
    ///     å®¡æ‰¹æ„è§
    /// </summary>
    [SugarColumn(ColumnName = "ACCTYPE")]
    public string? ACCTYPE { get; set; }
    [SugarColumn(ColumnName = "F_WWC_TEXT")]
    public string? FWwcText { get; set; }

    /// <summary>
    ///     æ¥æºç±»åˆ«,0=手工 1=请购单 3=需求接口表 4=采购合同 6=采购订单 7=销售订单
    /// </summary>
    [SugarColumn(ColumnName = "SRC_DOC_TYPE")]
    public string? SrcDocType { get; set; }

    /// <summary>
    ///     æ¥æºå•æ®
    /// </summary>
    [SugarColumn(ColumnName = "SRC_DOC")]
    public string? SrcDoc { get; set; }

    /// <summary>
    ///     è´¸æ˜“路径
    /// </summary>
    [SugarColumn(ColumnName = "TRADE_PATH_NAME")]
    public string? TradePathName { get; set; }

    /// <summary>
    ///     å§”外类型字段暂未使用，默认值-1
    /// </summary>
    [SugarColumn(ColumnName = "SUB_TYPE")]
    public string? SubType { get; set; }

    /// <summary>
    ///     è¿”工订单 æ˜¯å¦å‹¾é€‰é¡¹ 0==不勾选 1==勾选，默认不勾选
    /// </summary>
    [SugarColumn(ColumnName = "IS_RE_DO")]
    public short? IsReDo { get; set; }

    /// <summary>
    ///     é¡¹ç›®é‡‡è´­è´Ÿè´£äºº
    /// </summary>
    [SugarColumn(ColumnName = "PRIVATE_DESC_SEG1")]
    public string? PrivateDescSeg1 { get; set; }

    /// <summary>
    ///     å•æ®ç‰ˆæœ¬
    /// </summary>
    [SugarColumn(ColumnName = "VERSION")]
    public string? Version { get; set; }
}

 StandardPda/MES.Service/Modes/MesRohInData.cs

@@ -33,20 +33,6 @@
    public string? ItemId { get; set; }

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

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

    /// <summary>
    ///     é‡‡è´­å•ä½
    /// </summary>
    [SugarColumn(ColumnName = "PURCHASE_UNIT")]
@@ -287,26 +273,31 @@
    public decimal? EbelnK3id { get; set; }

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

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

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

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

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段5
    /// </summary>
    [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }
@@ -314,7 +305,8 @@
    /// <summary>
    ///     SEQ_BASEINFO_ID
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BASEINFO_ID",
    [SugarColumn(ColumnName = "ID",
        OracleSequenceName = "SEQ_BASEINFO_ID",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }

@@ -327,7 +319,7 @@
    /// <summary>
    ///     é‡‡è´­è®¢å•è¡Œå·
    /// </summary>
    [SugarColumn(ColumnName = "purchase_order_line_number")]
    [SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")]
    public string? PurchaseOrderLineNumber { get; set; }

    /// <summary>
@@ -343,16 +335,16 @@
    public string? Receiving { get; set; }

    /// <summary>
    ///     æ”¶æ–™éƒ¨é—¨
    /// </summary>
    [SugarColumn(ColumnName = "RECEIVING_DEPARTMENT")]
    public string? ReceivingDepartment { get; set; }

    /// <summary>
    ///     ç»“算组织
    /// </summary>
    [SugarColumn(ColumnName = "SETTLEMENT")]
    public string? Settlement { get; set; }

    /// <summary>
    ///     å·²äº¤è´§æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "CGB014")]
    public decimal? Cgb014 { get; set; }

    /// <summary>
    ///     éœ€æ±‚部门
@@ -361,7 +353,7 @@
    public string? DemandDept { get; set; }

    /// <summary>
    ///     éœ€æ±‚部门
    ///     æ”¶æ–™éƒ¨é—¨
    /// </summary>
    [SugarColumn(ColumnName = "RECEIVING_DEPT")]
    public string? ReceivingDept { get; set; }
@@ -373,20 +365,20 @@
    public DateTime? ArriveDate { get; set; }

    /// <summary>
    ///     ç”Ÿäº§é€šçŸ¥å•
    ///     é¡¹ç›®ï¼ˆç ”发）
    /// </summary>
    [SugarColumn(ColumnName = "F_CGDD_SCTZDA")]
    public string? FCGDDSctzda { get; set; }
    [SugarColumn(ColumnName = "RD_PROJECT")]
    public string? RdProject { get; set; }

    /// <summary>
    ///     åž‹å·
    ///     é¡¹ç›®
    /// </summary>
    [SugarColumn(ColumnName = "F_CGDD_XHA")]
    public string? FCGDDXHA { get; set; }
    [SugarColumn(ColumnName = "PROJECT")]
    public string? Project { get; set; }

    /// <summary>
    ///     BOM备注
    ///     é¡¹ç›®é‡‡è´­äºº
    /// </summary>
    [SugarColumn(ColumnName = "F_XIFG_TEXT_APV")]
    public string? FXifgTextApv { get; set; }
    [SugarColumn(ColumnName = "PROJECT_PURCHASER")]
    public string? ProjectPurchaser { get; set; }
}

 StandardPda/MES.Service/Modes/MesUnit.cs

@@ -63,13 +63,11 @@
    public string? LastupdateBy { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string? Company { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string? Factory { get; set; }

 StandardPda/MES.Service/Modes/SysDepartment.cs

@@ -165,5 +165,4 @@


    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
    
}

 StandardPda/MES.Service/service/BasicData/EmployeeInfoManager.cs

@@ -1,13 +1,10 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;

namespace MES.Service.service
{
namespace MES.Service.service.BasicData;

    public class EmployeeInfoManager : Repository<EmployeeInfo>
    {
        public bool Save(ErpEmployeeInfo unit)
@@ -56,7 +53,8 @@

            var executeCommand =
                db.Insertable(entityEmployeeInfo).ExecuteCommand();
            var command = db.Insertable(entityEmployeeItems).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
        var command = db.Insertable(entityEmployeeItems).PageSize(1)
            .IgnoreColumnsNull().ExecuteCommand();

            return executeCommand > 0 && command > 0;
        }
@@ -105,6 +103,5 @@
            }

            return (items, employeeItems);
        }
    }
}

 StandardPda/MES.Service/service/BasicData/MesItemsManager.cs

@@ -1,5 +1,4 @@
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.util;
@@ -148,7 +147,7 @@
                UseOrg = erpDetail.FUseOrgId,
                CreateDate = DateTime.Now,
                Company = "1000",
                Factory = "1000",
                Factory = "1000"
            };
            list.Add(items);
        }

 StandardPda/MES.Service/service/BasicData/MesProjectManager.cs

@@ -140,7 +140,7 @@
                OperatorsId = supplier.OperatorsID,
                DocumentStatus = supplier.FDocumentStatus,
                ForbidStatus = supplier.FForbidStatus,
                UseOrgId = se.FUseOrgId,
                UseOrgId = se.FUseOrgId
            };

            list.Add(mesSupplier);
@@ -153,7 +153,8 @@
    {
        DeleteSupplier(entity);
        
        var insert = db.Insertable(entity).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
        var insert = db.Insertable(entity).PageSize(1).IgnoreColumnsNull()
            .ExecuteCommand();
        return insert > 0;
    }
}

 StandardPda/MES.Service/service/BasicData/MesRohInManager.cs

@@ -25,7 +25,7 @@
                    mesRohInDatas)
                    ? 1
                    : 0,
                "3" => UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0,
                "3" => DeleteData(db, mesRohIn, mesRohInDatas) ? 1 : 0,
                _ => throw new NotImplementedException(
                    $"type没有{rohInErpRohIn.Type}这个类型")
            };
@@ -33,7 +33,7 @@
    }

    // æ›´æ–°æ•°æ®çš„方法
    private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn,
    private bool DeleteData(SqlSugarScope db, MesRohIn mesRohIn,
        List<MesRohInData> mesRohInDatas)
    {
        var decimals = mesRohInDatas.Select(s => s.Id).ToArray();
@@ -88,7 +88,7 @@
    }

    // å°† ErpRohIn å¯¹è±¡è½¬æ¢ä¸º MesRohIn å¯¹è±¡çš„方法
    public MesRohIn GetMesRohIn(ErpRohIn rohIn)
    private MesRohIn GetMesRohIn(ErpRohIn rohIn)
    {
        var eid = Convert.ToDecimal(rohIn.id);
        var mesRohIn = new MesRohIn();
@@ -99,7 +99,7 @@
        mesRohIn.EbelnK3id = eid;
        mesRohIn.BillNo = rohIn.FBillNo;
        mesRohIn.DocumentStatus = rohIn.FDocumentStatus;
        mesRohIn.DocumentType = rohIn.FBillTypeID;
        mesRohIn.DocumentType = rohIn.FBillTypeId;
        mesRohIn.BusinessType = rohIn.FBusinessType;
        if (rohIn.FDate != null)
            mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate,
@@ -108,22 +108,7 @@
        mesRohIn.CloseStatus = rohIn.FCloseStatus;
        mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId;
        mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId;
        mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId;
        mesRohIn.Purchaser = rohIn.FPurchaserId;

        //新增 éªŒæ”¶æ–¹å¼
        mesRohIn.ACCTYPE = rohIn.Acctype;

        mesRohIn.SettlementParty = rohIn.FSettleId;
        mesRohIn.PaymentParty = rohIn.FChargeId;
        //mesRohIn.Email = rohIn.FProviderEMail;
        mesRohIn.CancellationStatus = rohIn.FCancelStatus;
        mesRohIn.CancellationPerson = rohIn.FCancellerId;

        if (rohIn.FCancelDate != null)
            mesRohIn.CancellationDate =
                DateTime.ParseExact(rohIn.FCancelDate,
                    "yyyy-MM-dd HH:mm:ss", null);

        mesRohIn.CreateBy = rohIn.FCreatorId;

@@ -137,22 +122,34 @@
            mesRohIn.LastupdateDate = DateTime.ParseExact(rohIn.FModifyDate,
                "yyyy-MM-dd HH:mm:ss", null);


        mesRohIn.ErpCheckBy = rohIn.FApproverId;
        mesRohIn.ErpCheckDate = rohIn.FApproveDate;
        mesRohIn.Changereason = rohIn.FChangeReason;

        //if (rohIn.Prearrivaldate != null)
        //    mesRohIn.Prearrivaldate = DateTime.ParseExact(rohIn.Prearrivaldate,
        //        "yyyy-MM-dd HH:mm:ss", null);

        mesRohIn.Changereason = rohIn.PubDescSeg2;
        mesRohIn.ReceiveOrg = Convert.ToDecimal(rohIn.FReceiveOrgId);
        mesRohIn.Remarks = rohIn.Remarks;

        mesRohIn.SrcDocType = rohIn.FSrcDocType;
        mesRohIn.SrcDoc = rohIn.FSrcDoc;
        mesRohIn.TradePathName = rohIn.FTradePathName;
        mesRohIn.SubType = rohIn.FSubType;
        mesRohIn.IsReDo = short.Parse(rohIn.FIsReDo ?? "0");
        mesRohIn.PrivateDescSeg1 = rohIn.PrivateDescSeg1;
        mesRohIn.Version = rohIn.FVersion;

        //作废的相关字段
        // mesRohIn.CancellationStatus = rohIn.FCancelStatus;
        // mesRohIn.CancellationPerson = rohIn.FCancellerId;
        //
        // if (rohIn.FCancelDate != null)
        //     mesRohIn.CancellationDate =
        //         DateTime.ParseExact(rohIn.FCancelDate,
        //             "yyyy-MM-dd HH:mm:ss", null);

        return mesRohIn;
    }

    // å°† ErpRohinData å¯¹è±¡è½¬æ¢ä¸º MesRohInData å¯¹è±¡çš„方法
    public List<MesRohInData> GetMesRohInDatas(
    private List<MesRohInData> GetMesRohInDatas(
        List<ErpRohinData> erpRohinDatas, string type)
    {
        return erpRohinDatas.Select(s =>
@@ -168,47 +165,16 @@
                ItemId = s.FMaterialId,
                PurchaseUnit = s.FUnitId,
                PurchaseQty = Convert.ToDecimal(s.FQty),
                InventoryUnit = s.FStockUnitID,
                PricingUnit = s.FPriceUnitId,
                PricingQty = Convert.ToDecimal(s.FPriceUnitQty),
                DeliveryDate = s.FDeliveryDate != null
                    ? DateTime.ParseExact(s.FDeliveryDate,
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                EarliestDeliveryDate = s.FDeliveryEarlyDate != null
                    ? DateTime.ParseExact(s.FDeliveryEarlyDate,
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                LatestDeliveryDate = s.FDeliveryLastDate != null
                    ? DateTime.ParseExact(s.FDeliveryLastDate,
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                Demand = s.FRequireOrgId,
                Receiving = s.FReceiveOrgId,
                ReceivingDepartment = s.FReceiveDeptId,
                Settlement = s.FEntrySettleOrgId,
                ReceivingDept = s.FReceiveDeptId,
                DemandOrg = s.FRequireOrgId,
                ReceivingOrg = s.FReceiveOrgId,
                SettlementOrg = s.FEntrySettleOrgId,
                IsGift = s.FGiveAway,
                Remarks = s.FEntryNote,
                SupplierItemCode = s.FSupMatId,
                SupplierItemName = s.FSupMatName,
                OutsourcingOrderId = s.FSubreqBillNo,
                BatchNumber = s.FLot,
                BusinessClose = s.FMRPCloseStatus,
                BusinessFreeze = s.FMRPFreezeStatus,
                Freezer = s.FFreezerId,
                FreezeTime = s.FFreezeDate != null
                    ? DateTime.ParseExact(s.FFreezeDate,
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                BusinessTerminate = s.FMRPTerminateStatus,
                Terminator = s.FTerminaterId,
                TerminateTime = s.FTerminateDate != null
                    ? DateTime.ParseExact(s.FTerminateDate,
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), //累计收料数
                RemainingReceivedQty =
                    Convert.ToDecimal(s.FRemainReceiveQty),
@@ -220,16 +186,12 @@
                ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), //库存可退数
                SourceDocumentType = s.FSrcBillTypeId,
                SourceDocumentId = s.FSrcBillNo,
                DemandTrackingId = s.FReqTraceNo,
                PlanTrackingId = s.FMtoNo,
                ChangeFlag = s.FChangeFlag,
                DemandSource = s.FDemandType,
                DemandDocumentId = s.FDemandBillNo,
                DemandDocumentLineId = s.FDemandBillEntrySeq,
                DemandDept = s.FRequireDeptId,
                FCGDDSctzda = s.F_CGDD_SCTZDA,
                FCGDDXHA = s.F_CGDD_XHA,
                FXifgTextApv = s.F_XIFG_Text_apv
                RdProject = s.RdProject,
                Project = s.Project,
                ProjectPurchaser = s.ProjectPurchaser
            };

            var single = rohInDataManager.GetSingle(it =>

 StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs

@@ -201,7 +201,8 @@
    {
        DeleteSupplier(entity);
         
        var insert = db.Insertable(entity).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
        var insert = db.Insertable(entity).PageSize(1).IgnoreColumnsNull()
            .ExecuteCommand();
        return insert > 0;
    }
}

 StandardPda/MES.Service/service/BasicData/MesUnitManager.cs

 StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs

 StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs

@@ -1,27 +1,21 @@
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 System.Dynamic;
using Masuit.Tools;
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
{
namespace MESApplication.Controllers.BasicData;

    [ApiController]
    [Route("api/[controller]")]
    public class EmployeeInfoController : ControllerBase
    {
        private EmployeeInfoManager m = new EmployeeInfoManager();

        private readonly MessageCenterManager _manager = new();
    private readonly EmployeeInfoManager m = new();

        private readonly string METHOD = "POST";

@@ -263,7 +257,6 @@
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
        }
    }
}

 StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs

@@ -1,6 +1,5 @@
using System.Dynamic;
using Masuit.Tools;
using MES.Service.Dto.service;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;

 StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs

@@ -14,9 +14,8 @@
[Route("api/[controller]")]
public class MesProjectController : ControllerBase
{
    private readonly MesProjectManager m = new();
    
    private readonly MessageCenterManager _manager = new();
    private readonly MesProjectManager m = new();
    
    private readonly string METHOD = "POST";