基础资料

hao

2025-04-11 cd51e7e8180e1d4ebbaf9700ed78a27cd4b99891

基础资料

 StandardInterface/MES.Service/Dto/webApi/ErpCustomer.cs

@@ -32,4 +32,5 @@
    //public string? FDescription { get; set; }

    public string? fremarks { get; set; }

}

 StandardInterface/MES.Service/Dto/webApi/ErpDepartment.cs

@@ -3,15 +3,16 @@
public class ErpDepartment
{
    public string Id { get; set; }
    public string? FNumber { get; set; }
    public string? FName { get; set; }
    public string? FDeptProperty { get; set; }
    public string? FGroup { get; set; }
    public string? FWIPStockID { get; set; }
    public string? FForbidStatus { get; set; }
    public string? Type { get; set; }
    public string? FParentID { get; set; }
    public string? FCreateOrgId { get; set; }
    public string? FUseOrgId { get; set; }
    public string? FDocumentStatus { get; set; }
    public string? FNumber { get; set; }            // 编码
    public string? FName { get; set; }              // 名称
    public string? FDeptProperty { get; set; }      // 部门属性
    public string? FGroup { get; set; }             // 部门分组
    public string? FWIPStockID { get; set; }        // WIP仓库
    public string? FDocumentStatus { get; set; }    // 数据状态
    public string? FForbidStatus { get; set; }      // 禁用状态
    public string? FParentID { get; set; }          // 上级部门
    public string? FCreateOrgId { get; set; }       // 创建组织
    public string? FUseOrgId { get; set; }          // 使用组织

}

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

@@ -4,9 +4,9 @@
{
    public string Id { get; set; }
    public string? Type { get; set; }
    public string? FNumber { get; set; }
    public string? FNumber { get; set; }//编码

    public string? FName { get; set; }
    public string? FName { get; set; }//名称

    /// <summary>
    ///     接口字段调整：标准版接口新增供应商id、客户id、数据状态、库存状态类型字段。
@@ -23,23 +23,19 @@
    ///         public string? FDocumentStatus { get; set; }
    ///         public string? FStockStatusType { get; set; }
    /// </remarks>
    public string? FSupplierId { get; set; }
    /// 
    public string? FAllowMinusQty { get; set; }//允许即时库存负库存
    public string? FPrincipal { get; set; }        //仓库负责人
    public string? FStockProperty { get; set; }    //仓库属性
    public string? FSupplierId { get; set; }       //供应商
    public string? FCustomerId { get; set; }       //客户
    public string? FDocumentStatus { get; set; }   //数据状态
    public string? FForbidStatus { get; set; }     //禁用状态
    public string? FGroup { get; set; }            //分组
    public string? FCreateOrgId { get; set; }      //创建组织
    public string? FUseOrgId { get; set; }         //使用组织
    public string? FStockStatusType { get; set; }  //库存状态类型
    public string? FZYC { get; set; }  //直运仓 
    public string? FGYC { get; set; }  //管易仓

    public string? FCustomerId { get; set; }
    public string? FDocumentStatus { get; set; }
    public string? FStockStatusType { get; set; }
    public string? FAllowMinusQty { get; set; }

    public string? FPrincipal { get; set; }

    public string? FStockProperty { get; set; }

    public string? FForbidStatus { get; set; }

    public string? FGroup { get; set; }


    public string? FCreateOrgId { get; set; }

    public string? FUseOrgId { get; set; }
}

 StandardInterface/MES.Service/Dto/webApi/ErpItems.cs

@@ -4,16 +4,16 @@
{
    public string Id { get; set; }
    public string? Type { get; set; }
    public string? FNumber { get; set; }
    public string? FOldNumber { get; set; }
    public string? FName { get; set; }
    public string? FSpecification { get; set; }
    public string? FBaseUnitId { get; set; }
    public double? FSafeStock { get; set; }
    public double? FMaxStock { get; set; }
    public double? FMinStock { get; set; }
    public double? FMinPackCount { get; set; }
    public string? FStockId { get; set; }
    public string? FNumber { get; set; }//编码
    public string? FOldNumber { get; set; }//旧物料编码
    public string? FName { get; set; }//名称
    public string? FSpecification { get; set; }//规格型号
    public string? FBaseUnitId { get; set; }//基本单位
    public double? FSafeStock { get; set; }//安全库存
    public double? FMaxStock { get; set; }//最大库存
    public double? FMinStock { get; set; }//最小库存
    public double? FMinPackCount { get; set; }//最小包装数
    public string? FStockId { get; set; }//仓库

    /// <summary>
    ///     接口字段调整：已删除或不再使用PPBOM00019124字段。
@@ -25,36 +25,57 @@
    ///     保留被注释的代码以记录修改历史。
    /// </remarks>
    // public string? PPBOM00019124 { get; set; }
    public string? FMaterialGroup { get; set; }
    public string? FMaterialGroup { get; set; }//物料分组
    public string? FDescription { get; set; }//描述
    public decimal? FFinishReceiptOverRate { get; set; }//入库超收比例(%)
    public decimal? FFinishReceiptShortRate { get; set; }//入库欠收比例(%)
    public string? FIssueType { get; set; }//发料方式
    public int? FIsBatchManage { get; set; }//启用批号管理
    public string? FPurchaserId { get; set; }//采购员
    public string? FDefaultVendor { get; set; }//默认供应商
    public string? FPurchaseUnitId { get; set; }//采购单位
    public string? FStoreUnitID { get; set; }//库存单位
    public string? FSaleUnitId { get; set; }//销售单位
    public string? FDocumentStatus { get; set; } //数据状态

    public string? FDescription { get; set; }
    public decimal? FFinishReceiptOverRate { get; set; }
    public decimal? FFinishReceiptShortRate { get; set; }
    public string? FIssueType { get; set; }
    public int? FIsBatchManage { get; set; }
    public string? FPurchaserId { get; set; }
    public string? FDefaultVendor { get; set; }
    public string? FPurchaseUnitId { get; set; }
    public string? FStoreUnitID { get; set; }
    public string? FSaleUnitId { get; set; }
    public string? FDocumentStatus { get; set; }
    public string? FForbidStatus { get; set; }
    public string? FErpClsID { get; set; }
    public string? FMfgPolicyId { get; set; }
    public string? FWorkShopId { get; set; }
    public string? FBOMUnitId { get; set; }
    public string? FPRODUCEUNITID { get; set; }
    public string? FIsKitting { get; set; }
    public string? FIsCoby { get; set; }
    public string? FOverControlMode { get; set; }
    public string? FSUBCONUNITID { get; set; }
    public string? FCreateOrgId { get; set; }
    public string? FUseOrgId { get; set; }
    public string? FLOSSPERCENT { get; set; }
    public string? FMnemonicCode { get; set; }
    public string? FForbidStatus { get; set; } //禁用状态

    public string? FExpPeriod { get; set; }
    public string? FErpClsID { get; set; }     //物料属性

    //public string? FColor { get; set; }
    public string? F_MJBH { get; set; }
    public string? FMfgPolicyId { get; set; }  //制造策略

    public string? FWorkShopId { get; set; }   //   生产车间

    public string? FBOMUnitId { get; set; }    //子项单位

    public string? FPRODUCEUNITID { get; set; }//生产单位

    public string? FIsKitting { get; set; }    //是否关键件
    public string? FIsCoby { get; set; }       //可为联副产品
    public string? FOverControlMode { get; set; }//超发控制方式
    public string? FSUBCONUNITID { get; set; } //委外单位
    public string? FCreateOrgId { get; set; }  //       创建组织
    public string? FUseOrgId { get; set; }     //       使用组织
    public string? FLOSSPERCENT { get; set; }  //       损耗率
    public string? FMnemonicCode { get; set; } //       助记码
    public string? FExpPeriod { get; set; }    //     保质期    
  //public string? FColor { get; set; }      //
    public string? F_MJBH { get; set; }        //模具编号

    //20250407 yhj 焕媄新增字段
    public string?  F_TJ { get; set; }      //套件
     public string? F_KZ { get; set; }    //控制
     public string? F_SC { get; set; }    //试制or量产?
     public string? F_HSFX { get; set; }    //换算方向
     public string? F_KCKZ { get; set; }    //库存控制
     public string? F_XSKZ { get; set; }    //销售控制
     public string? F_CRM { get; set; }    //CRM
     public string? F_CGKZ { get; set; }    //采购控制
     public string? F_WWLX { get; set; }    //委外类型
     public string? F_JYSZ { get; set; }    //检验设置
     public string? F_FJZQ { get; set; }    //复检周期（）天
     public string? F_SCLX { get; set; }    //生产类型
     public string? F_ZZSTLX { get; set; }    //组织间受托类型
     public string? F_DCSL { get; set; }    //倒冲数量
    public string? F_BZGS { get; set; }    //标准工时
}

 StandardInterface/MES.Service/Dto/webApi/ErpOrganize.cs

@@ -4,12 +4,16 @@
{
    public string Id { get; set; }
    public string? Type { get; set; }
    public string? FNumber { get; set; }
    public string? FName { get; set; }
    public string? FForbidStatus { get; set; }
    public string? FDescription { get; set; }
    public string? FParentID { get; set; }
    public string? fCreateDate { get; set; }
    public string? FForbidorid { get; set; }
    public string? FForbiddate { get; set; }
    public string? FNumber { get; set; }        //编码
    public string? FName { get; set; }          //名称
    public string? FParentID { get; set; }      //所属法人
    public string? fCreateDate { get; set; }    //创建日期
    public string? FForbidorid { get; set; }    //禁用人
    public string? FForbiddate { get; set; }    //禁用日期
    public string? FForbidStatus { get; set; }  //禁用状态
// public string? FDescription { get; set; }




}

 StandardInterface/MES.Service/Dto/webApi/ErpPosition.cs

@@ -22,28 +22,15 @@
    ///         public string? FCreateOrgId { get; set; }
    ///         public string? FUseOrgId { get; set; }
    /// </remarks>
    public string? FCreateOrgId { get; set; }

    public string? FUseOrgId { get; set; }

    public string? FNumber { get; set; }

    public string? FName { get; set; }

    public string? FDESCRIPTIONS { get; set; }

    public string? FDept { get; set; }

    public string? FCreateDate { get; set; }

    public string? FForbidderId { get; set; }

    public string? FForbidDate { get; set; }

    /// <summary>
    ///     禁用状态  A 启用 B禁用
    /// </summary>
    public string? FForbidStatus { get; set; }

    public string? FDocumentStatus { get; set; }
    public string? FCreateOrgId { get; set; }      //创建组织
    public string? FUseOrgId { get; set; }         //使用组织
    public string? FNumber { get; set; }           //编码
    public string? FName { get; set; }             //名称
    public string? FDESCRIPTIONS { get; set; }     //描述
    public string? FDept { get; set; }             //所属部门
    public string? FCreateDate { get; set; }       //创建日期
    public string? FForbidderId { get; set; }      //禁用人
    public string? FForbidDate { get; set; }       //禁用日期
    public string? FForbidStatus { get; set; }     //禁用状态
    public string? FDocumentStatus { get; set; }   //单据状态
}

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

@@ -4,37 +4,36 @@
{
    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? 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? FPurchaserId { get; set; }
    public string? Acctype { get; set; }
    public string? FSettleId { get; set; }

    public string? FChargeId { 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? 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? 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? Remarks { get; set; }
    public string? FCancelStatus { get; set; }
    public string? FCancellerId { get; set; }
    public string? FCancelDate { 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? Remarks { get; set; }   //备注
    public string? FCancelStatus { get; set; }    //作废状态
    public string? FCancellerId { get; set; }     //作废人
    public string? FCancelDate { 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? FReceiveOrgId { get; set; }     //收料组织
    //public string? FProviderId { get; set; }

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

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

@@ -4,72 +4,71 @@
{
    public string id { get; set; }
    public string Eid { get; set; }
    public string? FBillNo { get; set; }
    public string? FBillNo { get; set; }//采购单号
    public string? SALES_ORDER_ID { get; set; }//销售订单号

    public string? FSeq { 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; }
    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? FRequireOrgId { get; set; }      //需求组织
  //  public string? FRequireDeptId { get; set; }    
    public string? FReceiveOrgId { get; set; }      //收料组织
    public string? FReceiveDeptId { get; set; }  //收料部门

    public string? FEntrySettleOrgId { get; set; }
    public string? FEntrySettleOrgId { get; set; } //结算组织

    // end
    public string? FGiveAway { get; set; }
    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? 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? FRemainStockINQty { get; set; } //剩余入库数量

    public string? FMrbQty { 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? FDemandType { get; set; }
    public string? FDemandBillNo { get; set; }
    public string? FDemandBillEntrySeq { 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? 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_SCTZDA { get; set; }
    public string? F_CGDD_XHA { get; set; }
    public string? F_XIFG_Text_apv { get; set; }
    public string? F_XIFG_Text_apv { get; set; }*/
}

 StandardInterface/MES.Service/Dto/webApi/ErpStaff.cs

@@ -4,9 +4,8 @@
{
    public string Id { get; set; }
    public string? Type { get; set; }
    public string? FStaffNumber { get; set; }

    public string? FName { get; set; }
    public string? FStaffNumber { get; set; } //员工编号
    public string? FName { get; set; }//员工姓名

    //删除：放入单据头体--池南骏 2025-01-02
    //public string? FPostDept { get; set; }
@@ -23,7 +22,7 @@
    /// </remarks>
    /// //删除：放入单据头体--池南骏 2025-01-02
    //public string? FPostId { get; set; }
    public string? FMobile { get; set; }
    public string? FMobile { get; set; }//移动电话

    /// <summary>
    ///     接口字段调整：标准版接口新增 ERP单据状态 字段。
@@ -37,17 +36,20 @@
    ///         - 修改后：
    ///         public string? FDocumentStatus { get; set; }
    /// </remarks>
    public string? FDocumentStatus { get; set; }
    /// 
    public string? FDescription { get; set; }//描述  
    public string? FDocumentStatus { get; set; }//数据状态

    //删除：放入单据头体--池南骏 2025-01-02
    //public string? FStaffStartDate { get; set; }
    public string? FDescription { get; set; }
    public string? FForbidStatus { get; set; }
    public string? FCreateOrgId { get; set; }
    public string? FUseOrgId { get; set; }

    public string? FForbidStatus { get; set; }//禁用状态
    public string? FCreateOrgId { get; set; }//创建组织
    public string? FUseOrgId { get; set; }//使用组织

    //新增一个PostIdItem类型的list来获取erp的岗位id
    public List<ErpStaffDetail>? ErpStaffDetails { get; set; }
    public string? FGZZZ { get; set; }//工作组织
}

/// <summary>
@@ -60,9 +62,9 @@
/// </remarks>
public class ErpStaffDetail
{
    public string? fPostId { get; set; }

    public string? fPostDeptid { get; set; }

    public string? fPostId { get; set; } 

    public string? fStaffStartDate { get; set; }
}

 StandardInterface/MES.Service/Dto/webApi/ErpSupplier.cs

@@ -4,12 +4,12 @@
{
    public string Id { get; set; }
    public string? Type { get; set; }
    public string? FNumber { get; set; }
    public string? FShortName { get; set; }
    public string? FName { get; set; }
    public string? FContact { get; set; }
    public string? FTel { get; set; }
    public string? FStaffId { get; set; }
    public string? FNumber { get; set; }//编码
    public string? FShortName { get; set; }//简称
    public string? FName { get; set; }//名称
    public string? FContact { get; set; }//联系人
    public string? FTel { get; set; }//电话
    public string? FStaffId { get; set; }//负责人

    /// <summary>
    ///     接口字段调整：标准版接口新增 ERP单据状态 字段。
@@ -23,13 +23,18 @@
    ///         - 修改后：
    ///         public string? FDocumentStatus { get; set; }
    /// </remarks>
    public string? FDocumentStatus { get; set; }
    public string? FDocumentStatus { get; set; }//数据状态

    public string? FForbidStatus { get; set; }
    public string? FCreateOrgId { get; set; }
    public string? FForbidStatus { get; set; }//禁用状态
    public string? FCreateOrgId { get; set; }//创建组织

    public string? FUseOrgId { get; set; }
    public string? FUseOrgId { get; set; }//使用组织

    //public string? FDescription { get; set; }
    public string? fremarks { get; set; }

    public string? fremarks { get; set; } //备注


    public string? FsuppCategory { get;set; }    //供应类别
    public string? GYSFZ { get; set; }//供应商分组
}

 StandardInterface/MES.Service/Dto/webApi/ErpUnit.cs

@@ -4,16 +4,16 @@
{
    public string Id { get; set; }
    public string? Type { get; set; }
    public string? FNumber { get; set; }
    public string? FName { get; set; }
    public string? FUnitGroupId { get; set; }
    public double? FConvertDenominator { get; set; }
    public string? FCurrentUnitId { get; set; }
    public double? FConvertNumerator { get; set; }
    public string? FBaseUnit { get; set; }
    public string? FRoundType { get; set; }
    public int? FPrecision { get; set; }
    public string? FDescription { get; set; }
    public string? FNumber { get; set; }                   //编码
    public string? FName { get; set; }                     //名称
    public string? FUnitGroupId { get; set; }              //所属组别
    public double? FConvertDenominator { get; set; }       //换算分母
    public string? FCurrentUnitId { get; set; }            //当前单位
    public double? FConvertNumerator { get; set; }         //换算分子
    public string? FBaseUnit { get; set; }                 //基准计量单位
    public string? FRoundType { get; set; }                //舍入类型
    public int? FPrecision { get; set; }                   //精度
    public string? FDescription { get; set; }              //描述

    /// <summary>
    ///     接口字段调整：标准版接口新增 ERP单据状态 字段。
@@ -27,7 +27,8 @@
    ///         - 修改后：
    ///         public string? FDocumentStatus { get; set; }
    /// </remarks>
    public string? FDocumentStatus { get; set; }
    public string? FDocumentStatus { get; set; }//数据状态

    public string? FForbidStatus { get; set; }
    public string? FForbidStatus { get; set; }//禁用状态

}

 StandardInterface/MES.Service/Modes/MesDepots.cs

@@ -213,4 +213,14 @@
    /// </summary>
    [SugarColumn(ColumnName = "FSTOCKSTATUSTYPE")]
    public string? FSTOCKSTATUSTYPE { get; set; }
    /// <summary>
    ///     直运仓
    /// </summary>
    [SugarColumn(ColumnName = "FZYC")]
    public string? FZYC { get; set; }
    /// <summary>
    ///     管易仓
    /// </summary>
    [SugarColumn(ColumnName = "FGYC")]
    public string? FGYC { get; set; }
}

 StandardInterface/MES.Service/Modes/MesItems.cs

@@ -398,4 +398,85 @@
    /// </summary>
    [SugarColumn(ColumnName = "F_MJBH")]
    public string? F_MJBH { get; set; }


    //20250407 yhj 焕媄新增字段
    /// <summary>
    ///     套件
    /// </summary>
    [SugarColumn(ColumnName = "F_TJ")]
    public string? F_TJ { get; set; }

    /// <summary>
    ///     控制
    /// </summary>
    [SugarColumn(ColumnName = "F_KZ")]
    public string? F_KZ { get; set; }
    /// <summary>
    ///     试制or量产?
    /// </summary>
    [SugarColumn(ColumnName = "F_SC")]
    public string? F_SC { get; set; }
    /// <summary>
    ///     换算方向
    /// </summary>
    [SugarColumn(ColumnName = "F_HSFX")]
    public string? F_HSFX { get; set; }
    /// <summary>
    ///     库存控制
    /// </summary>
    [SugarColumn(ColumnName = "F_KCKZ")]
    public string? F_KCKZ { get; set; }
    /// <summary>
    ///     销售控制
    /// </summary>
    [SugarColumn(ColumnName = "F_XSKZ")]
    public string? F_XSKZ { get; set; }
    /// <summary>
    ///     CRM
    /// </summary>
    [SugarColumn(ColumnName = "F_CRM")]
    public string? F_CRM { get; set; }
    /// <summary>
    ///     采购控制
    /// </summary>
    [SugarColumn(ColumnName = "F_CGKZ")]
    public string? F_CGKZ { get; set; }
    /// <summary>
    ///     委外类型
    /// </summary>
    [SugarColumn(ColumnName = "F_WWLX")]
    public string? F_WWLX { get; set; }
    /// <summary>
    ///     检验设置
    /// </summary>
    [SugarColumn(ColumnName = "F_JYSZ")]
    public string? F_JYSZ { get; set; }
    /// <summary>
    ///     复检周期（）天
    /// </summary>
    [SugarColumn(ColumnName = "F_FJZQ")]
    public string? F_FJZQ { get; set; }
    /// <summary>
    ///     生产类型
    /// </summary>
    [SugarColumn(ColumnName = "F_SCLX")]
    public string? F_SCLX { get; set; }
    /// <summary>
    ///     组织间受托类型
    /// </summary>
    [SugarColumn(ColumnName = "F_ZZSTLX")]
    public string? F_ZZSTLX { get; set; }
    /// <summary>
    ///     倒冲数量
    /// </summary>
    [SugarColumn(ColumnName = "F_DCSL")]
    public string? F_DCSL { get; set; }
    /// <summary>
    ///     标准工时
    /// </summary>
    [SugarColumn(ColumnName = "F_BZGS")]
    public string? F_BZGS { get; set; }


}

 StandardInterface/MES.Service/Modes/MesRohIn.cs

@@ -282,7 +282,7 @@
    public decimal? ReceiveOrg { get; set; }

    /// <summary>
    ///     收料组织
    ///     验收方式
    /// </summary>
    [SugarColumn(ColumnName = "ACCTYPE")]
    public string? ACCTYPE { get; set; }

 StandardInterface/MES.Service/Modes/MesRohInData.cs

@@ -14,12 +14,12 @@
    [SugarColumn(ColumnName = "BILL_NO")]
    public string? BillNo { get; set; }

 
    /// <summary>
    ///     销售订单号
    /// </summary>
    [SugarColumn(ColumnName = "SALES_ORDER_ID")]
    public string? SalesOrderId { get; set; }

    public string? SALES_ORDER_ID { get; set; }
    /// <summary>
    ///     采购订单行号
    /// </summary>

 StandardInterface/MES.Service/Modes/MesStaff.cs

@@ -166,4 +166,11 @@
    public string? FforbidStatus { get; set; }

    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
    /// <summary>
    ///     工作组织
    /// </summary>
    [SugarColumn(ColumnName = "GZZZ")]
    public string? FGZZZ { get; set; }

   
}

 StandardInterface/MES.Service/Modes/MesSupplier.cs

@@ -172,7 +172,7 @@
    public decimal? UseOrg { get; set; }

    /// <summary>
    ///     自定义字段3
    ///     自定义字段3  供应类别
    /// </summary>
    [SugarColumn(ColumnName = "REMARK3")]
    public string? Remark3 { get; set; }
@@ -190,4 +190,11 @@
    public string? Remark5 { get; set; }

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

    /// <summary>
    ///     供应商分组
    /// </summary>
    [SugarColumn(ColumnName = "GYS_FZ")]
    public string? GYS_FZ { get; set; }
 
}

 StandardInterface/MES.Service/Modes/Organize.cs

@@ -37,7 +37,7 @@
    public string? Type { get; set; }

    /// <summary>
    ///     上级组织
    ///     所属法人
    /// </summary>
    [SugarColumn(ColumnName = "FPARENTID")]
    public string? Fparentid { get; set; }
@@ -47,4 +47,15 @@
    /// </summary>
    [SugarColumn(ColumnName = "FCREATEDATE")]
    public DateTime? Fcreatedate { get; set; }
    /// <summary>
    ///     禁用人
    /// </summary>
    [SugarColumn(ColumnName = "FFORBIDORID")]
    public string? FFORBIDORID { get; set; }
    /// <summary>
    ///     禁用日期
    /// </summary>
    [SugarColumn(ColumnName = "FFORBIDDATE")]
    public string? FFORBIDDATE { get; set; }
 
}

 StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs

@@ -28,7 +28,6 @@

                    break;
                case "2":
                case "4":
                    if (InsertOrUpdate(db, entity)) return 1;

                    break;
@@ -150,6 +149,8 @@
            CreateOrg = Convert.ToDecimal(depots.FCreateOrgId),
            UseOrg = Convert.ToDecimal(depots.FUseOrgId),
            CreateDate = DateTime.Now,
            FZYC= depots.FZYC,
            FGYC= depots.FGYC,
            Company = "1000",
            Factory = "1000"
        };
@@ -194,7 +195,6 @@
                            throw new NotImplementedException("删除失败");
                        break;
                    case "2":
                    case "4":
                        if (!InsertOrUpdateBatch(db,
                                depotsGroup.Value)) // 批量插入或更新仓库
                            throw new NotImplementedException("同步失败");

 StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs

@@ -44,6 +44,7 @@
                case "2":
                case "4":
                case "5":
            
                    if (InsertOrUpdate(db, entity))
                        return 1;
                    break;
@@ -86,6 +87,7 @@
                    case "2":
                    case "4":
                    case "5":
                
                        if (!InsertOrUpdateBatch(db, itemGroup.Value))
                            throw new NotImplementedException("同步失败");
                        break;
@@ -196,7 +198,23 @@
            FISKITTING = item.FIsKitting,
            FISCOBY = item.FIsCoby,
            FOVERCONTROLMODE = item.FOverControlMode,
            F_MJBH = item.F_MJBH
            F_MJBH = item.F_MJBH,
//20250407 yhj 焕媄新增字段
             F_TJ       =item.F_TJ,
             F_KZ      =item.F_KZ,
             F_SC      =item.F_SC,
             F_HSFX     =item.F_HSFX,
             F_KCKZ     =item.F_KCKZ,
             F_XSKZ     =item.F_XSKZ,
             F_CRM     =item.F_CRM,
             F_CGKZ     =item.F_CGKZ,
             F_WWLX     =item.F_WWLX,
             F_JYSZ     =item.F_JYSZ,
             F_FJZQ     =item.F_FJZQ,
             F_SCLX     =item.F_SCLX,
             F_ZZSTLX     =item.F_ZZSTLX,
             F_DCSL     =item.F_DCSL,
            F_BZGS     =item.F_BZGS,
        };
    }


 StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs

@@ -229,12 +229,13 @@
            /// </remarks>
            //PositionCode = staff.FPostId,
            PhoneNumber = staff.FMobile,
            CreateOrg = Convert.ToDecimal(staff.FCreateOrgId),
            UseOrg = Convert.ToDecimal(staff.FUseOrgId),
            CreateDate = DateTime.Now,
            Remark = staff.FDescription,
            FDOCUMENTSTATUS = staff.FDocumentStatus,
            FforbidStatus = staff.FForbidStatus
            FforbidStatus = staff.FForbidStatus,
            CreateOrg = Convert.ToDecimal(staff.FCreateOrgId),
            UseOrg = Convert.ToDecimal(staff.FUseOrgId),
            FGZZZ=staff.FGZZZ
        };

        //删除  2025-01-04  池南骏

 StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs

@@ -26,15 +26,12 @@
                    if (UpdateOrganizetatus(db, entity.Id, "B"))
                        return 1;
                    break;
                case "2":
                    if (InsertItem(db, entity))
                        return 1;
                    break;
              
                case "3":
                    if (DeleteItem(db, Convert.ToDecimal(entity.Id)))
                        return 1;
                    break;
                case "4":
                case "2":
                    if (InsertOrUpdate(db, entity))
                        return 1;
                    break;
@@ -66,15 +63,15 @@
                        if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B"))
                            throw new NotImplementedException("禁用失败");
                        break;
                    case "2":
                   /* case "2":
                        if (!InsertItemBatch(db, itemGroup.Value))
                            throw new NotImplementedException("插入失败");
                        break;
                        break;*/
                    case "3":
                        if (!DeleteItemBatch(db, itemGroup.Value))
                            throw new NotImplementedException("删除失败");
                        break;
                    case "4":
                    case "2":
                        if (!InsertOrUpdateBatch(db, itemGroup.Value))
                            throw new NotImplementedException("同步失败");
                        break;
@@ -123,12 +120,16 @@
        return new Organize
        {
            Id = Convert.ToDecimal(Organize.Id),
            Type = Organize.Type,
            Fnumber = Organize.FNumber,
            Fname = Organize.FName,
            Fforbidstatus = Organize.FForbidStatus,
            Type = Organize.Type,
            Fparentid = Organize.FParentID,
            Fcreatedate = DateTime.Now
            Fcreatedate = DateTime.Now,
            FFORBIDORID= Organize.FForbidorid,
            FFORBIDDATE     = Organize.FForbiddate,
            Fforbidstatus = Organize.FForbidStatus


        };
    }


 StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs

@@ -36,7 +36,6 @@
                        return 1;
                    break;
                case "2":
                case "4":
                    if (InsertOrUpdateDepartment(db, entity)) // 插入或更新部门
                        return 1;
                    break;
@@ -192,7 +191,6 @@
                            throw new NotImplementedException("删除失败");
                        break;
                    case "2":
                    case "4":
                        if (!InsertOrUpdateDepartmentBatch(db,
                                departmentGroup.Value)) // 批量插入或更新部门
                            throw new NotImplementedException("同步失败");

 StandardInterface/MES.Service/service/BasicData/Partner/MesCustomerManager.cs

@@ -15,20 +15,23 @@
        {
            switch (customer.Type)
            {
                //反禁用
                case "0":
                    if (UpdateCustomerStatus(db, entity.Id, "A"))
                        return 1;
                    break;
                //禁用
                case "1":
                    if (UpdateCustomerStatus(db, entity.Id, "B"))
                        return 1;
                    break;
                    //反审核
                case "3":
                    if (DeleteCustomer(db, entity.Id))
                        return 1;
                    break;
                    //审核
                case "2":
                case "4":
                    if (InsertOrUpdate(db, entity))
                        return 1;
                    break;
@@ -67,7 +70,7 @@
                            throw new NotImplementedException("删除失败");
                        break;
                    case "2":
                    case "4":
               
                        if (!InsertOrUpdateBatch(db, customerGroup.Value))
                            throw new NotImplementedException("同步失败");
                        break;

 StandardInterface/MES.Service/service/BasicData/Partner/MesSupplierManager.cs

@@ -28,7 +28,7 @@
                        return 1;
                    break;
                case "2":
                case "4":
          
                    if (InsertOrUpdate(db, entity))
                        return 1;
                    break;
@@ -139,6 +139,8 @@
            CreateOrg = Convert.ToDecimal(supplier.FCreateOrgId),
            UseOrg = Convert.ToDecimal(supplier.FUseOrgId),
            Remark = supplier.fremarks,
            Remark3 = supplier.FsuppCategory,
            GYS_FZ = supplier.GYSFZ,
            Company = "1000",
            Factory = "1000"
        };

 StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs

@@ -206,9 +206,9 @@
                EbelnK3id = Convert.ToDecimal(s.id),
                ErpId = Convert.ToDecimal(s.Eid),
                BillNo = s.FBillNo,
                SALES_ORDER_ID=s.SALES_ORDER_ID,
                OrderLineId = s.FSeq,
                PurchaseOrderLineNumber = s.FSeq,
                SalesOrderId = s.FDemandBillEntrySeq,
                ItemId = s.FMaterialId,
                PurchaseUnit = s.FUnitId,
                PurchaseQty = Convert.ToDecimal(s.FQty),
@@ -269,11 +269,12 @@
                ChangeFlag = s.FChangeFlag,
                DemandSource = s.FDemandType,
                DemandDocumentId = s.FDemandBillNo,
                DemandDocumentLineId = s.FDemandBillEntrySeq,
                DemandDept = s.FRequireDeptId,
                
                DemandDocumentLineId = s.FDemandBillEntrySeq
               /* DemandDept = s.FRequireDeptId,
                FCGDDSctzda = s.F_CGDD_SCTZDA,
                FCGDDXHA = s.F_CGDD_XHA,
                FXifgTextApv = s.F_XIFG_Text_apv
                FXifgTextApv = s.F_XIFG_Text_apv*/
            };

            var single = rohInDataManager.GetSingle(it =>

 StandardInterface/MESApplication/appsettings.json

@@ -10,6 +10,6 @@
  "AppSettings": {
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.100)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = gs_dev; Password=gsdev"
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = test_dev; Password=hmprd"
  }
}