啊鑫
2025-02-09 70e8a5aec5d49a95483d4c0e066ccdcc45a02e79
采购订单接口
已修改24个文件
已删除6个文件
2254 ■■■■ 文件已修改
.idea/WR_API.iml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/libraries/publish.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/misc.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/modules.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/vcs.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/workspace.xml 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Dto/webApi/ErpDepots.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Dto/webApi/ErpProject.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Dto/webApi/ErpRohIn.cs 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Dto/webApi/ErpRohinData.cs 89 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/EmployeeInfo.cs 97 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/EmployeeItem.cs 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/MesDepots.cs 120 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/MesInvBusiness2.cs 288 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/MesItemType.cs 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/MesItems.cs 351 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/MesRohIn.cs 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/MesRohInData.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/MesUnit.cs 102 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/Modes/SysDepartment.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/BasicData/EmployeeInfoManager.cs 193 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/BasicData/MesItemsManager.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/BasicData/MesProjectManager.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/BasicData/MesRohInManager.cs 94 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/BasicData/MesSupplierManager.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/BasicData/MesUnitManager.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs 447 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.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
@@ -7,7 +7,7 @@
    public string? FNumber { get; set; }
    public string? FName { get; set; }
    public string? FAllowMinusQty { get; set; }
    public string? FPrincipal { get; set; }
@@ -15,10 +15,10 @@
    public string? FStockProperty { get; set; }
    public string? FForbidStatus { get; set; }
    public string? FDocumentStatus { get; set; }
    public string? IsLot { get; set; }
    public string? FUseOrgId { get; set; }
}
StandardPda/MES.Service/Dto/webApi/ErpProject.cs
@@ -4,22 +4,22 @@
{
    //ERPID
    public string? ID { get; set; }
    public string? Type { get; set; }//操作类型
    public string? Type { get; set; } //操作类型
    public string? Code { get; set; } //项目编码
    public string? Name { get; set; } //项目名称
    public string? ProjectType { get; set; } //项目分类
    public string? Description { get; set; } //项目仓储负责人
    public string? OperatorsID { get; set; } //项目采购负责人
    public string? FDocumentStatus { get; set; } //单据状态
    public string? FForbidStatus { get; set; } //是否禁用
    public List<ErpDetail>? FUseOrgId { get; set; } //下发组织
}
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,62 +1,57 @@
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
{
    /// <summary>
    ///
    ///</summary>
    [SugarTable("EMPLOYEE_INFO")]
    public class EmployeeInfo
    {
        /// <summary>
        /// SEQ_EMP
        ///</summary>
        [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
        public decimal Id { get; set; }
    ///     SEQ_EMP
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }
        /// <summary>
        /// èŒå·¥å·¥å·
        ///</summary>
        [SugarColumn(ColumnName = "EMPLOYEE_NO")]
        public string? EmployeeNo { get; set; }
    /// <summary>
    ///     èŒå·¥å·¥å·
    /// </summary>
    [SugarColumn(ColumnName = "EMPLOYEE_NO")]
    public string? EmployeeNo { get; set; }
        /// <summary>
        /// èŒå·¥å§“名
        ///</summary>
        [SugarColumn(ColumnName = "EMPLOYEE_NAME")]
        public string? EmployeeName { get; set; }
    /// <summary>
    ///     èŒå·¥å§“名
    /// </summary>
    [SugarColumn(ColumnName = "EMPLOYEE_NAME")]
    public string? EmployeeName { get; set; }
        /// <summary>
        /// éƒ¨é—¨ç¼–码
        ///</summary>
        [SugarColumn(ColumnName = "DEPARTMENT_CODE")]
        public string? DepartmentCode { get; set; }
    /// <summary>
    ///     éƒ¨é—¨ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "DEPARTMENT_CODE")]
    public string? DepartmentCode { get; set; }
        /// <summary>
        /// ä¸šåŠ¡å‘˜ç±»åž‹
        ///</summary>
        [SugarColumn(ColumnName = "SALESMAN_TYPE")]
        public string? SalesmanType { get; set; }
    /// <summary>
    ///     ä¸šåŠ¡å‘˜ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "SALESMAN_TYPE")]
    public string? SalesmanType { get; set; }
        /// <summary>
        /// å•据状态
        ///</summary>
        [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
        public string? DocumentStatus { get; set; }
    /// <summary>
    ///     å•据状态
    /// </summary>
    [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
    public string? DocumentStatus { get; set; }
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        ///</summary>
        [SugarColumn(ColumnName = "IS_DISABLED")]
        public string? IsDisabled { get; set; }
    /// <summary>
    ///     æ˜¯å¦ç¦ç”¨
    /// </summary>
    [SugarColumn(ColumnName = "IS_DISABLED")]
    public string? IsDisabled { get; set; }
        /// <summary>
        /// ç»„织
        ///</summary>
        [SugarColumn(ColumnName = "ORGANIZATION")]
        public string? Organization { get; set; }
    }
    /// <summary>
    ///     ç»„织
    /// </summary>
    [SugarColumn(ColumnName = "ORGANIZATION")]
    public string? Organization { get; set; }
}
StandardPda/MES.Service/Modes/EmployeeItem.cs
@@ -1,40 +1,35 @@
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>
    [SugarTable("EMPLOYEE_ITEM")]
    public class EmployeeItem
    {
        /// <summary>
        ///
        ///</summary>
        [SugarColumn(ColumnName = "ID",
            OracleSequenceName = "SEQ_EMP",
            IsPrimaryKey = true)]
        public decimal Id { get; set; }
    /// </summary>
    [SugarColumn(ColumnName = "ID",
        OracleSequenceName = "SEQ_EMP",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }
        /// <summary>
        /// info的id
        ///</summary>
        [SugarColumn(ColumnName = "EID")]
        public decimal? Eid { get; set; }
    /// <summary>
    ///     info的id
    /// </summary>
    [SugarColumn(ColumnName = "EID")]
    public decimal? Eid { get; set; }
        /// <summary>
        /// 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; }
    /// <summary>
    ///     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; }
        /// <summary>
        /// æ—¶é—´
        ///</summary>
        [SugarColumn(ColumnName = "CREATE_DATE")]
        public string? CreateDate { get; set; }
    }
    /// <summary>
    ///     æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public string? CreateDate { get; set; }
}
StandardPda/MES.Service/Modes/MesDepots.cs
@@ -9,135 +9,135 @@
public class MesDepots
{
    /// <summary>
    /// ID(SEQ_INV_ID)
    ///</summary>
    ///     ID(SEQ_INV_ID)
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_ID",
        IsPrimaryKey = true)]
    public decimal DepotId { get; set; }
    /// <summary>
    /// ä»“库类别编码
    ///</summary>
    ///     ä»“库类别编码
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_CODE")]
    public string? DepotCode { get; set; }
    /// <summary>
    /// ä»“库类别名称
    ///</summary>
    ///     ä»“库类别名称
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_NAME")]
    public string? DepotName { get; set; }
    /// <summary>
    /// å¤‡æ³¨
    ///</summary>
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "DESCRIPTION")]
    public string? Description { get; set; }
    /// <summary>
    /// ä»“库负责人
    ///</summary>
    ///     ä»“库负责人
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }
    /// <summary>
    /// åˆ›å»ºæ—¶é—´
    ///</summary>
    ///     åˆ›å»ºæ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }
    /// <summary>
    /// æœ€åŽæ›´æ–°äºº
    ///</summary>
    ///     æœ€åŽæ›´æ–°äºº
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string? LastupdateBy { get; set; }
    /// <summary>
    /// æœ€åŽæ›´æ–°æ—¶é—´
    ///</summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }
    /// <summary>
    /// ä»“库类型  0=普通仓,1=露天仓,2=寄外仓,3=外寄仓, 4=在制品,5=报废
    ///</summary>
    ///     ä»“库类型  0=普通仓,1=露天仓,2=寄外仓,3=外寄仓, 4=在制品,5=报废
    /// </summary>
    [SugarColumn(ColumnName = "DEPOTTYPE")]
    public string? Depottype { get; set; }
    /// <summary>
    /// åˆ†åŽ‚ç¼–ç 
    ///</summary>
    ///     åˆ†åŽ‚ç¼–ç 
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string? Factory { get; set; }
    /// <summary>
    /// ç‰©æ–™ä½¿ç”¨
    ///</summary>
    ///     ç‰©æ–™ä½¿ç”¨
    /// </summary>
    [SugarColumn(ColumnName = "TYPE_1")]
    public decimal? Type1 { get; set; }
    /// <summary>
    /// æˆå“ä½¿ç”¨
    ///</summary>
    ///     æˆå“ä½¿ç”¨
    /// </summary>
    [SugarColumn(ColumnName = "TYPE_2")]
    public decimal? Type2 { get; set; }
    /// <summary>
    /// ä»“库类型编码
    ///</summary>
    ///     ä»“库类型编码
    /// </summary>
    [SugarColumn(ColumnName = "DEPOTTYPECODE")]
    public decimal? Depottypecode { get; set; }
    /// <summary>
    /// å…¬å¸ä»£ç 
    ///</summary>
    ///     å…¬å¸ä»£ç 
    /// </summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string? Company { get; set; }
    /// <summary>
    /// çœ‹æ¿å›¾æ ‡æ ·å¼
    ///</summary>
    ///     çœ‹æ¿å›¾æ ‡æ ·å¼
    /// </summary>
    [SugarColumn(ColumnName = "ICON_TYPE")]
    public decimal? IconType { get; set; }
    /// <summary>
    /// æ˜¯å¦å§”外仓库
    ///</summary>
    ///     æ˜¯å¦å§”外仓库
    /// </summary>
    [SugarColumn(ColumnName = "IS_WY")]
    public decimal? IsWy { get; set; }
    /// <summary>
    /// æ˜¯å¦ä¸è‰¯å“ä»“
    ///</summary>
    ///     æ˜¯å¦ä¸è‰¯å“ä»“
    /// </summary>
    [SugarColumn(ColumnName = "IS_NG")]
    public string? IsNg { get; set; }
    /// <summary>
    /// ä»“库地址
    ///</summary>
    ///     ä»“库地址
    /// </summary>
    [SugarColumn(ColumnName = "CWHADDRESS")]
    public string? Cwhaddress { get; set; }
    /// <summary>
    /// çœ‹æ¿æ˜¾ç¤ºåŒºåŸŸç¼–号
    ///</summary>
    ///     çœ‹æ¿æ˜¾ç¤ºåŒºåŸŸç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "PI_TYPE")]
    public string? PiType { get; set; }
    /// <summary>
    /// åˆ†ç»„
    ///</summary>
    ///     åˆ†ç»„
    /// </summary>
    [SugarColumn(ColumnName = "ZUID")]
    public string? Zuid { get; set; }
    /// <summary>
    /// å…è®¸å³æ—¶åº“存负库存
    ///</summary>
    ///     å…è®¸å³æ—¶åº“存负库存
    /// </summary>
    [SugarColumn(ColumnName = "IS_FKC")]
    public string? IsFkc { get; set; }
    /// <summary>
    /// ç”Ÿäº§è½¦é—´
    ///</summary>
    ///     ç”Ÿäº§è½¦é—´
    /// </summary>
    [SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
    public string? ProductionWorkshop { get; set; }
@@ -148,50 +148,50 @@
    public string? MaterialProperti { get; set; }
    /// <summary>
    /// åˆ›å»ºç»„织
    ///</summary>
    ///     åˆ›å»ºç»„织
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_ORG")]
    public decimal? CreateOrg { get; set; }
    /// <summary>
    /// ä½¿ç”¨ç»„织
    ///</summary>
    ///     ä½¿ç”¨ç»„织
    /// </summary>
    [SugarColumn(ColumnName = "USE_ORG")]
    public decimal? UseOrg { get; set; }
    /// <summary>
    /// è‡ªå®šä¹‰å­—段3
    ///</summary>
    ///     è‡ªå®šä¹‰å­—段3
    /// </summary>
    [SugarColumn(ColumnName = "REMARK3")]
    public string? Remark3 { get; set; }
    /// <summary>
    /// è‡ªå®šä¹‰å­—段4
    ///</summary>
    ///     è‡ªå®šä¹‰å­—段4
    /// </summary>
    [SugarColumn(ColumnName = "REMARK4")]
    public string? Remark4 { get; set; }
    /// <summary>
    /// è‡ªå®šä¹‰å­—段5
    ///</summary>
    ///     è‡ªå®šä¹‰å­—段5
    /// </summary>
    [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }
    /// <summary>
    /// 0 =不生效, 1=生效
    ///</summary>
    ///     0 =不生效, 1=生效
    /// </summary>
    [SugarColumn(ColumnName = "FORBID_STATUS")]
    public string? ForbidStatus { get; set; }
    /// <summary>
    /// å•据状态
    ///</summary>
    ///     å•据状态
    /// </summary>
    [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
    public string? DocumentStatus { get; set; }
    /// <summary>
    /// æ‰¹å·ç®¡ç†
    ///</summary>
    ///     æ‰¹å·ç®¡ç†
    /// </summary>
    [SugarColumn(ColumnName = "IS_LOT")]
    public string? IsLot { get; set; }
}
StandardPda/MES.Service/Modes/MesInvBusiness2.cs
@@ -8,220 +8,220 @@
[SugarTable("MES_INV_BUSINESS2")]
public class MesInvBusiness2
{
 /// <summary>
 ///     ID(seq_inv_id)
 /// </summary>
 [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ID",
    /// <summary>
    ///     ID(seq_inv_id)
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ID",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }
 /// <summary>
 ///     çŠ¶æ€|0-未交易1-已交易
 /// </summary>
 [SugarColumn(ColumnName = "STATUS")]
    /// <summary>
    ///     çŠ¶æ€|0-未交易1-已交易
    /// </summary>
    [SugarColumn(ColumnName = "STATUS")]
    public decimal? Status { get; set; }
 /// <summary>
 ///     å•据类型ID
 /// </summary>
 [SugarColumn(ColumnName = "BILL_TYPE_ID")]
    /// <summary>
    ///     å•据类型ID
    /// </summary>
    [SugarColumn(ColumnName = "BILL_TYPE_ID")]
    public decimal? BillTypeId { get; set; }
 /// <summary>
 ///     äº‹åŠ¡ç±»åž‹ç¼–ç 
 /// </summary>
 [SugarColumn(ColumnName = "TRANSACTION_CODE")]
    /// <summary>
    ///     äº‹åŠ¡ç±»åž‹ç¼–ç 
    /// </summary>
    [SugarColumn(ColumnName = "TRANSACTION_CODE")]
    public string TransactionCode { get; set; }
 /// <summary>
 ///     äº¤æ˜“类型|1-入库0-转库-1出库
 /// </summary>
 [SugarColumn(ColumnName = "BUSINESS_TYPE")]
    /// <summary>
    ///     äº¤æ˜“类型|1-入库0-转库-1出库
    /// </summary>
    [SugarColumn(ColumnName = "BUSINESS_TYPE")]
    public decimal? BusinessType { get; set; }
 /// <summary>
 ///     å•据ID
 /// </summary>
 [SugarColumn(ColumnName = "BILL_ID")]
    /// <summary>
    ///     å•据ID
    /// </summary>
    [SugarColumn(ColumnName = "BILL_ID")]
    public decimal? BillId { get; set; }
 /// <summary>
 ///     å•据编码
 /// </summary>
 [SugarColumn(ColumnName = "BILL_NO")]
    /// <summary>
    ///     å•据编码
    /// </summary>
    [SugarColumn(ColumnName = "BILL_NO")]
    public string BillNo { get; set; }
 /// <summary>
 ///     ç”Ÿäº§è®¢å•号
 /// </summary>
 [SugarColumn(ColumnName = "TASK_NO")]
    /// <summary>
    ///     ç”Ÿäº§è®¢å•号
    /// </summary>
    [SugarColumn(ColumnName = "TASK_NO")]
    public string TaskNo { get; set; }
 /// <summary>
 ///     å®¢æˆ·ç¼–号
 /// </summary>
 [SugarColumn(ColumnName = "CUSTOMER_NO")]
    /// <summary>
    ///     å®¢æˆ·ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "CUSTOMER_NO")]
    public string CustomerNo { get; set; }
 /// <summary>
 ///     å•据行ID
 /// </summary>
 [SugarColumn(ColumnName = "BILL_LINE_ID")]
    /// <summary>
    ///     å•据行ID
    /// </summary>
    [SugarColumn(ColumnName = "BILL_LINE_ID")]
    public decimal? BillLineId { get; set; }
 /// <summary>
 ///     ç‰©æ–™æ¡ç 
 /// </summary>
 [SugarColumn(ColumnName = "ITEM_BARCODE")]
    /// <summary>
    ///     ç‰©æ–™æ¡ç 
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_BARCODE")]
    public string ItemBarcode { get; set; }
 /// <summary>
 ///     æœ¬å¸ç‰©æ–™ç¼–码
 /// </summary>
 [SugarColumn(ColumnName = "ITEM_NO")]
    /// <summary>
    ///     æœ¬å¸ç‰©æ–™ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_NO")]
    public string ItemNo { get; set; }
 /// <summary>
 ///     å®¢æˆ·ç‰©æ–™ç¼–码
 /// </summary>
 [SugarColumn(ColumnName = "C_ITEM_CODE")]
    /// <summary>
    ///     å®¢æˆ·ç‰©æ–™ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "C_ITEM_CODE")]
    public string CItemCode { get; set; }
 /// <summary>
 ///     åŽ‚å®¶æ‰¹æ¬¡
 /// </summary>
 [SugarColumn(ColumnName = "LOT_NO")]
    /// <summary>
    ///     åŽ‚å®¶æ‰¹æ¬¡
    /// </summary>
    [SugarColumn(ColumnName = "LOT_NO")]
    public string LotNo { get; set; }
 /// <summary>
 ///     æ˜¯å¦çŽ¯ä¿(0:否,1:是)
 /// </summary>
 [SugarColumn(ColumnName = "EP_FLAG")]
    /// <summary>
    ///     æ˜¯å¦çŽ¯ä¿(0:否,1:是)
    /// </summary>
    [SugarColumn(ColumnName = "EP_FLAG")]
    public short? EpFlag { get; set; }
 /// <summary>
 ///     æ•°é‡
 /// </summary>
 [SugarColumn(ColumnName = "QUANTITY")]
    /// <summary>
    ///     æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "QUANTITY")]
    public decimal? Quantity { get; set; }
 /// <summary>
 ///     æºå­åº“CODE
 /// </summary>
 [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")]
    /// <summary>
    ///     æºå­åº“CODE
    /// </summary>
    [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")]
    public string FromInvDepotsCode { get; set; }
 /// <summary>
 ///     æºè´§ä½CODE
 /// </summary>
 [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")]
    /// <summary>
    ///     æºè´§ä½CODE
    /// </summary>
    [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")]
    public string FromInvDepotSectionsCode { get; set; }
 /// <summary>
 ///     ç›®çš„子库CODE
 /// </summary>
 [SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")]
    /// <summary>
    ///     ç›®çš„子库CODE
    /// </summary>
    [SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")]
    public string ToInvDepotsCode { get; set; }
 /// <summary>
 ///     ç›®çš„货位CODE
 /// </summary>
 [SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")]
    /// <summary>
    ///     ç›®çš„货位CODE
    /// </summary>
    [SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")]
    public string ToInvDepotSectionsCode { get; set; }
 /// <summary>
 ///     äº¤æ˜“异常信息
 /// </summary>
 [SugarColumn(ColumnName = "DESCRIPTION")]
    /// <summary>
    ///     äº¤æ˜“异常信息
    /// </summary>
    [SugarColumn(ColumnName = "DESCRIPTION")]
    public string Description { get; set; }
 /// <summary>
 ///     åˆ›å»ºäºº
 /// </summary>
 [SugarColumn(ColumnName = "CREATE_BY")]
    /// <summary>
    ///     åˆ›å»ºäºº
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string CreateBy { get; set; }
 /// <summary>
 ///     åˆ›å»ºæ—¶é—´
 /// </summary>
 [SugarColumn(ColumnName = "CREATE_DATE")]
    /// <summary>
    ///     åˆ›å»ºæ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }
 /// <summary>
 ///     æœ€åŽæ›´æ–°äºº
 /// </summary>
 [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    /// <summary>
    ///     æœ€åŽæ›´æ–°äºº
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string LastupdateBy { get; set; }
 /// <summary>
 ///     æœ€åŽæ›´æ–°æ—¶é—´
 /// </summary>
 [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    /// <summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }
 /// <summary>
 ///     è¶…损统计标识
 /// </summary>
 [SugarColumn(ColumnName = "ULLAGE_STAT_FLAG")]
    /// <summary>
    ///     è¶…损统计标识
    /// </summary>
    [SugarColumn(ColumnName = "ULLAGE_STAT_FLAG")]
    public short? UllageStatFlag { get; set; }
 /// <summary>
 ///     åˆ†åŽ‚ç¼–ç 
 /// </summary>
 [SugarColumn(ColumnName = "FACTORY")]
    /// <summary>
    ///     åˆ†åŽ‚ç¼–ç 
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string Factory { get; set; }
 /// <summary>
 ///     å…¬å¸ä»£ç 
 /// </summary>
 [SugarColumn(ColumnName = "COMPANY")]
    /// <summary>
    ///     å…¬å¸ä»£ç 
    /// </summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string Company { get; set; }
 /// <summary>
 ///     ç®±å·æ¡ç 
 /// </summary>
 [SugarColumn(ColumnName = "ITEM_BARCODE2")]
    /// <summary>
    ///     ç®±å·æ¡ç 
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_BARCODE2")]
    public string ItemBarcode2 { get; set; }
 /// <summary>
 ///     å¡æ¿æ¡ç 
 /// </summary>
 [SugarColumn(ColumnName = "ITEM_BARCODE3")]
    /// <summary>
    ///     å¡æ¿æ¡ç 
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_BARCODE3")]
    public string ItemBarcode3 { get; set; }
 /// <summary>
 ///     ä»»åŠ¡å•å·
 /// </summary>
 [SugarColumn(ColumnName = "WORK_NO")]
    /// <summary>
    ///     ä»»åŠ¡å•å·
    /// </summary>
    [SugarColumn(ColumnName = "WORK_NO")]
    public string WorkNo { get; set; }
 /// <summary>
 ///     ä»»åŠ¡å•è¡Œå·
 /// </summary>
 [SugarColumn(ColumnName = "WORK_LINE")]
    /// <summary>
    ///     ä»»åŠ¡å•è¡Œå·
    /// </summary>
    [SugarColumn(ColumnName = "WORK_LINE")]
    public decimal? WorkLine { get; set; }
 /// <summary>
 ///     ä¾›åº”商
 /// </summary>
 [SugarColumn(ColumnName = "SUPP_NO")]
    /// <summary>
    ///     ä¾›åº”商
    /// </summary>
    [SugarColumn(ColumnName = "SUPP_NO")]
    public string SuppNo { get; set; }
 /// <summary>
 ///     ç”Ÿäº§çº¿
 /// </summary>
 [SugarColumn(ColumnName = "LINE_NO")]
    /// <summary>
    ///     ç”Ÿäº§çº¿
    /// </summary>
    [SugarColumn(ColumnName = "LINE_NO")]
    public string LineNo { get; set; }
 /// <summary>
 ///     é‡‡è´­è®¢å•id
 /// </summary>
 [SugarColumn(ColumnName = "EBELN_K3ID")]
    /// <summary>
    ///     é‡‡è´­è®¢å•id
    /// </summary>
    [SugarColumn(ColumnName = "EBELN_K3ID")]
    public decimal? EbelnK3id { get; set; }
 /// <summary>
 ///     é‡‡è´­è®¢å•行id
 /// </summary>
 [SugarColumn(ColumnName = "LINE_K3ID")]
    /// <summary>
    ///     é‡‡è´­è®¢å•行id
    /// </summary>
    [SugarColumn(ColumnName = "LINE_K3ID")]
    public decimal? LineK3id { get; set; }
}
StandardPda/MES.Service/Modes/MesItemType.cs
@@ -9,104 +9,102 @@
public class MesItemType
{
    /// <summary>
    /// ID
    ///</summary>
    ///     ID
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }
    /// <summary>
    /// ç±»åž‹ç¼–码
    ///</summary>
    ///     ç±»åž‹ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "TCODE")]
    public string? Tcode { get; set; }
    /// <summary>
    /// ç±»åž‹åç§°
    ///</summary>
    ///     ç±»åž‹åç§°
    /// </summary>
    [SugarColumn(ColumnName = "TNAME")]
    public string? Tname { get; set; }
    /// <summary>
    /// å¤‡æ³¨
    ///</summary>
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "REMARK")]
    public string? Remark { get; set; }
    /// <summary>
    /// åˆ›å»ºäºº
    ///</summary>
    ///     åˆ›å»ºäºº
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }
    /// <summary>
    /// åˆ›å»ºæ—¶é—´
    ///</summary>
    ///     åˆ›å»ºæ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }
    /// <summary>
    /// æœ€åŽæ›´æ–°äºº
    ///</summary>
    ///     æœ€åŽæ›´æ–°äºº
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string? LastupdateBy { get; set; }
    /// <summary>
    /// æœ€åŽæ›´æ–°æ—¶é—´
    ///</summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }
    /// <summary>
    ///
    ///</summary>
    /// </summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string? Company { get; set; }
    /// <summary>
    ///
    ///</summary>
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string? Factory { get; set; }
    /// <summary>
    /// IQC分类
    ///</summary>
    ///     IQC分类
    /// </summary>
    [SugarColumn(ColumnName = "IQC_TYPE")]
    public string? IqcType { get; set; }
    /// <summary>
    /// IQC分类名称
    ///</summary>
    ///     IQC分类名称
    /// </summary>
    [SugarColumn(ColumnName = "IQC_TYPE_NAME")]
    public string? IqcTypeName { get; set; }
    /// <summary>
    /// ä¸Šçº§åˆ†ç»„
    ///</summary>
    ///     ä¸Šçº§åˆ†ç»„
    /// </summary>
    [SugarColumn(ColumnName = "PGROUP")]
    public string? Pgroup { get; set; }
    /// <summary>
    /// æè¿°
    ///</summary>
    ///     æè¿°
    /// </summary>
    [SugarColumn(ColumnName = "DESCRIPTION")]
    public string? Description { get; set; }
    /// <summary>
    /// è®¡é‡å•位
    ///</summary>
    ///     è®¡é‡å•位
    /// </summary>
    [SugarColumn(ColumnName = "UNIT")]
    public string? Unit { get; set; }
    /// <summary>
    /// æ˜¯å¦ç¦ç”¨
    ///</summary>
    ///     æ˜¯å¦ç¦ç”¨
    /// </summary>
    [SugarColumn(ColumnName = "FORBID_STATUS")]
    public string? ForbidStatus { get; set; }
    /// <summary>
    /// ä¸‹å‘组织
    ///</summary>
    ///     ä¸‹å‘组织
    /// </summary>
    [SugarColumn(ColumnName = "USE_ORG_ID")]
    public string? UseOrgId { get; set; }
StandardPda/MES.Service/Modes/MesItems.cs
@@ -9,518 +9,517 @@
public class MesItems
{
    /// <summary>
    /// ç‰©æ–™ID
    ///</summary>
    ///     ç‰©æ–™ID
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }
    /// <summary>
    /// å·¥åŽ‚
    ///</summary>
    ///     å·¥åŽ‚
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string? Factory { get; set; }
    /// <summary>
    /// å…¬å¸ç¼–号
    ///</summary>
    ///     å…¬å¸ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string? Company { get; set; }
    /// <summary>
    /// ç‰©æ–™ç¼–码
    ///</summary>
    ///     ç‰©æ–™ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_NO")]
    public string? ItemNo { get; set; }
    /// <summary>
    /// ç‰©æ–™åç§°
    ///</summary>
    ///     ç‰©æ–™åç§°
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_NAME")]
    public string? ItemName { get; set; }
    /// <summary>
    /// ç‰©æ–™ç®€ç§°
    ///</summary>
    ///     ç‰©æ–™ç®€ç§°
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_SNAME")]
    public string? ItemSname { get; set; }
    /// <summary>
    /// è§„格型号
    ///</summary>
    ///     è§„格型号
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_MODEL")]
    public string? ItemModel { get; set; }
    /// <summary>
    /// ç‰©æ–™æè¿°
    ///</summary>
    ///     ç‰©æ–™æè¿°
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_DESCRIPTION")]
    public string? ItemDescription { get; set; }
    /// <summary>
    /// ç‰©æ–™å•位
    ///</summary>
    ///     ç‰©æ–™å•位
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_UNIT")]
    public string? ItemUnit { get; set; }
    /// <summary>
    /// ç‰©æ–™ç±»åž‹
    ///</summary>
    ///     ç‰©æ–™ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_TYPE")]
    public string? ItemType { get; set; }
    /// <summary>
    /// äº§å“ç‰ˆæœ¬
    ///</summary>
    ///     äº§å“ç‰ˆæœ¬
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_VERSION")]
    public string? ItemVersion { get; set; }
    /// <summary>
    /// å®¢æˆ·ç¼–号
    ///</summary>
    ///     å®¢æˆ·ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "CUST_NO")]
    public string? CustNo { get; set; }
    /// <summary>
    /// åˆ›å»ºäºº
    ///</summary>
    ///     åˆ›å»ºäºº
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }
    /// <summary>
    /// åˆ›å»ºæ—¶é—´
    ///</summary>
    ///     åˆ›å»ºæ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }
    /// <summary>
    /// æœ€åŽæ›´æ–°äºº
    ///</summary>
    ///     æœ€åŽæ›´æ–°äºº
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string? LastupdateBy { get; set; }
    /// <summary>
    /// æœ€åŽæ›´æ–°æ—¶é—´
    ///</summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }
    /// <summary>
    /// æœ€ä½Žåº“å­˜
    ///</summary>
    ///     æœ€ä½Žåº“å­˜
    /// </summary>
    [SugarColumn(ColumnName = "LOWLIMIT")]
    public double? Lowlimit { get; set; }
    /// <summary>
    /// å®‰å…¨åº“存量
    ///</summary>
    ///     å®‰å…¨åº“存量
    /// </summary>
    [SugarColumn(ColumnName = "Safe_Stock")]
    public double? SafeStock { get; set; }
    /// <summary>
    /// æœ€å¤§åº“å­˜
    ///</summary>
    ///     æœ€å¤§åº“å­˜
    /// </summary>
    [SugarColumn(ColumnName = "HIGHLIMIT")]
    public double? Highlimit { get; set; }
    /// <summary>
    /// æœ€å°åŒ…装数
    ///</summary>
    ///     æœ€å°åŒ…装数
    /// </summary>
    [SugarColumn(ColumnName = "PRD_PACK")]
    public double? PrdPack { get; set; }
    /// <summary>
    /// è®¢å•单位
    ///</summary>
    ///     è®¢å•单位
    /// </summary>
    [SugarColumn(ColumnName = "ORDERUNIT")]
    public string? Orderunit { get; set; }
    /// <summary>
    /// é”€å”®å•位
    ///</summary>
    ///     é”€å”®å•位
    /// </summary>
    [SugarColumn(ColumnName = "SALEUNIT")]
    public string? Saleunit { get; set; }
    /// <summary>
    /// åº“房单位
    ///</summary>
    ///     åº“房单位
    /// </summary>
    [SugarColumn(ColumnName = "STOREUNIT")]
    public string? Storeunit { get; set; }
    /// <summary>
    /// ç‰©æ–™ID
    ///</summary>
    ///     ç‰©æ–™ID
    /// </summary>
    [SugarColumn(ColumnName = "E_ITEM_ID")]
    public decimal? EItemId { get; set; }
    /// <summary>
    /// ERP料号
    ///</summary>
    ///     ERP料号
    /// </summary>
    [SugarColumn(ColumnName = "ERP_ITEM_NO")]
    public string? ErpItemNo { get; set; }
    /// <summary>
    /// é»˜è®¤ä»“库
    ///</summary>
    ///     é»˜è®¤ä»“库
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_CODE")]
    public string? DepotCode { get; set; }
    /// <summary>
    /// ç‰©æ–™åˆ†ç±»ç¼–号
    ///</summary>
    ///     ç‰©æ–™åˆ†ç±»ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "PPBOM00019124")]
    public string? Ppbom00019124 { get; set; }
    /// <summary>
    /// ç‰©æ–™åˆ†ç»„
    ///</summary>
    ///     ç‰©æ–™åˆ†ç»„
    /// </summary>
    [SugarColumn(ColumnName = "REMARKS")]
    public string? Remarks { get; set; }
    /// <summary>
    /// é‡‡è´­å‘˜
    ///</summary>
    ///     é‡‡è´­å‘˜
    /// </summary>
    [SugarColumn(ColumnName = "FPURCHASERID")]
    public string? Fpurchaserid { get; set; }
    /// <summary>
    /// ç¦ç”¨çŠ¶æ€
    ///</summary>
    ///     ç¦ç”¨çŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "FFORBIDSTATUS")]
    public string? Fforbidstatus { get; set; }
    /// <summary>
    /// ç‰©æ–™åˆ†ç»„
    ///</summary>
    ///     ç‰©æ–™åˆ†ç»„
    /// </summary>
    [SugarColumn(ColumnName = "FMATERIALGROUP")]
    public string? Fmaterialgroup { get; set; }
    /// <summary>
    /// å®Œå·¥è¶…收比例
    ///</summary>
    ///     å®Œå·¥è¶…收比例
    /// </summary>
    [SugarColumn(ColumnName = "FFINISHRECEIPTOVERRATE")]
    public decimal? Ffinishreceiptoverrate { get; set; }
    /// <summary>
    /// å‘料方式
    ///</summary>
    ///     å‘料方式
    /// </summary>
    [SugarColumn(ColumnName = "FISSUETYPE")]
    public string? Fissuetype { get; set; }
    /// <summary>
    /// å¯ç”¨æ‰¹å·ç®¡ç†
    ///</summary>
    ///     å¯ç”¨æ‰¹å·ç®¡ç†
    /// </summary>
    [SugarColumn(ColumnName = "FISBATCHMANAGE")]
    public string? Fisbatchmanage { get; set; }
    /// <summary>
    /// é‡‡è´­å•位
    ///</summary>
    ///     é‡‡è´­å•位
    /// </summary>
    [SugarColumn(ColumnName = "FPURCHASEUNITID")]
    public string? Fpurchaseunitid { get; set; }
    /// <summary>
    /// åˆ›å»ºç»„织
    ///</summary>
    ///     åˆ›å»ºç»„织
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_ORG")]
    public decimal? CreateOrg { get; set; }
    /// <summary>
    /// ä½¿ç”¨ç»„织
    ///</summary>
    ///     ä½¿ç”¨ç»„织
    /// </summary>
    [SugarColumn(ColumnName = "USE_ORG")]
    public string? UseOrg { get; set; }
    /// <summary>
    /// æŸè€—率
    ///</summary>
    ///     æŸè€—率
    /// </summary>
    [SugarColumn(ColumnName = "LOSS_PERCENT")]
    public string? LossPercent { get; set; }
    /// <summary>
    /// åŠ©è®°ç 
    ///</summary>
    ///     åŠ©è®°ç 
    /// </summary>
    [SugarColumn(ColumnName = "MNEMONIC_CODE")]
    public string? MnemonicCode { get; set; }
    /// <summary>
    /// ä¿è´¨æœŸ
    ///</summary>
    ///     ä¿è´¨æœŸ
    /// </summary>
    [SugarColumn(ColumnName = "EXP_PERIOD")]
    public string? ExpPeriod { get; set; }
    /// <summary>
    /// ç”Ÿäº§è½¦é—´
    ///</summary>
    ///     ç”Ÿäº§è½¦é—´
    /// </summary>
    [SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
    public string? ProductionWorkshop { get; set; }
    /// <summary>
    /// ç‰©æ–™å±žæ€§ 0=模型,1=按订单拣货,2=按订单装配,3=可选类,4=委外加工件,
    /// 5=工序委外件,6=虚拟,7=计划,8=系列,9=采购件,10=制造件,
    /// 11=最终装配件,12=套件,13=工艺,14=低值易耗品,15=商品,
    /// 16=杂项料品,17=服务,18=资产,19=备件,20=配方,
    /// 21=重复,22=费用性料品
    ///</summary>
    ///     ç‰©æ–™å±žæ€§ 0=模型,1=按订单拣货,2=按订单装配,3=可选类,4=委外加工件,
    ///     5=工序委外件,6=虚拟,7=计划,8=系列,9=采购件,10=制造件,
    ///     11=最终装配件,12=套件,13=工艺,14=低值易耗品,15=商品,
    ///     16=杂项料品,17=服务,18=资产,19=备件,20=配方,
    ///     21=重复,22=费用性料品
    /// </summary>
    [SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
    public string? MaterialProperti { get; set; }
    /// <summary>
    /// ç”Ÿäº§å•位
    ///</summary>
    ///     ç”Ÿäº§å•位
    /// </summary>
    [SugarColumn(ColumnName = "PRODUCE_UNIT")]
    public string? ProduceUnit { get; set; }
    /// <summary>
    /// å§”外单位
    ///</summary>
    ///     å§”外单位
    /// </summary>
    [SugarColumn(ColumnName = "SUBCON_UNIT")]
    public string? SubconUnit { get; set; }
    /// <summary>
    /// å›¾ç‰‡1
    ///</summary>
    ///     å›¾ç‰‡1
    /// </summary>
    [SugarColumn(ColumnName = "BZ06")]
    public string? Bz06 { get; set; }
    /// <summary>
    /// å›¾ç‰‡2
    ///</summary>
    ///     å›¾ç‰‡2
    /// </summary>
    [SugarColumn(ColumnName = "BZ07")]
    public string? Bz07 { get; set; }
    /// <summary>
    /// å›¾ç‰‡3
    ///</summary>
    ///     å›¾ç‰‡3
    /// </summary>
    [SugarColumn(ColumnName = "BZ08")]
    public string? Bz08 { get; set; }
    /// <summary>
    /// å›¾ç‰‡4
    ///</summary>
    ///     å›¾ç‰‡4
    /// </summary>
    [SugarColumn(ColumnName = "BZ09")]
    public string? Bz09 { get; set; }
    /// <summary>
    /// å›¾ç‰‡5
    ///</summary>
    ///     å›¾ç‰‡5
    /// </summary>
    [SugarColumn(ColumnName = "BZ10")]
    public string? Bz10 { get; set; }
    /// <summary>
    /// QC分组ID
    ///</summary>
    ///     QC分组ID
    /// </summary>
    [SugarColumn(ColumnName = "QC_TEAMID")]
    public string? QcTeamid { get; set; }
    /// <summary>
    /// ç‰©æ–™ID
    ///</summary>
    ///     ç‰©æ–™ID
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_ID")]
    public decimal? ItemId { get; set; }
    /// <summary>
    /// é¢œè‰²
    ///</summary>
    ///     é¢œè‰²
    /// </summary>
    [SugarColumn(ColumnName = "COLOR_NAME")]
    public string? ColorName { get; set; }
    /// <summary>
    /// è®¾å¤‡
    ///</summary>
    ///     è®¾å¤‡
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_TEXT8")]
    public string? FWwcText8 { get; set; }
    /// <summary>
    /// åŠŸçŽ‡
    ///</summary>
    ///     åŠŸçŽ‡
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_DECIMAL")]
    public string? FWwcDecimal { get; set; }
    /// <summary>
    /// å•小时产能
    ///</summary>
    ///     å•小时产能
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_DECIMAL1")]
    public string? FWwcDecimal1 { get; set; }
    /// <summary>
    /// äººæ•°
    ///</summary>
    ///     äººæ•°
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_DECIMAL2")]
    public string? FWwcDecimal2 { get; set; }
    /// <summary>
    /// äººå·¥å°æ—¶å·¥èµ„
    ///</summary>
    ///     äººå·¥å°æ—¶å·¥èµ„
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_DECIMAL3")]
    public string? FWwcDecimal3 { get; set; }
    /// <summary>
    /// äººå·¥å®šé¢
    ///</summary>
    ///     äººå·¥å®šé¢
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_DECIMAL4")]
    public string? FWwcDecimal4 { get; set; }
    /// <summary>
    /// æ ‡å‡†äº§èƒ½
    ///</summary>
    ///     æ ‡å‡†äº§èƒ½
    /// </summary>
    [SugarColumn(ColumnName = "FBCN")]
    public string? Fbcn { get; set; }
    /// <summary>
    /// é’¢ç½‘
    ///</summary>
    ///     é’¢ç½‘
    /// </summary>
    [SugarColumn(ColumnName = "FGW")]
    public string? Fgw { get; set; }
    /// <summary>
    /// æ²»å…·
    ///</summary>
    ///     æ²»å…·
    /// </summary>
    [SugarColumn(ColumnName = "FYJ")]
    public string? Fyj { get; set; }
    /// <summary>
    /// è®¾å¤‡
    ///</summary>
    ///     è®¾å¤‡
    /// </summary>
    [SugarColumn(ColumnName = "FSB")]
    public string? Fsb { get; set; }
    /// <summary>
    /// å›¾å·
    ///</summary>
    ///     å›¾å·
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_TEXT1")]
    public string? FWwcText1 { get; set; }
    /// <summary>
    /// æ¨¡å…·ç¼–号
    ///</summary>
    ///     æ¨¡å…·ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_TEXT2")]
    public string? FWwcText2 { get; set; }
    /// <summary>
    /// æ¨¡å…·å‡ºæ•°
    ///</summary>
    ///     æ¨¡å…·å‡ºæ•°
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_TEXT3")]
    public string? FWwcText3 { get; set; }
    /// <summary>
    /// æ³¨å¡‘周期
    ///</summary>
    ///     æ³¨å¡‘周期
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_TEXT4")]
    public string? FWwcText4 { get; set; }
    /// <summary>
    /// å•双色
    ///</summary>
    ///     å•双色
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_TEXT5")]
    public string? FWwcText5 { get; set; }
    /// <summary>
    /// æ³¨å¡‘件吨位
    ///</summary>
    ///     æ³¨å¡‘件吨位
    /// </summary>
    [SugarColumn(ColumnName = "F_WWC_TEXT6")]
    public string? FWwcText6 { get; set; }
    /// <summary>
    /// å¤–部料号
    ///</summary>
    ///     å¤–部料号
    /// </summary>
    [SugarColumn(ColumnName = "CATALOG_NO")]
    public string? CatalogNo { get; set; }
    /// <summary>
    /// é¢†æ–™å•位
    ///</summary>
    ///     é¢†æ–™å•位
    /// </summary>
    [SugarColumn(ColumnName = "MATERIAL_OUT_UOMID")]
    public string? MaterialOutUomid { get; set; }
    /// <summary>
    /// ç”Ÿäº§éƒ¨é—¨
    ///</summary>
    ///     ç”Ÿäº§éƒ¨é—¨
    /// </summary>
    [SugarColumn(ColumnName = "PUB_DESC_SEG38")]
    public string? PubDescSeg38 { get; set; }
    /// <summary>
    /// é¡¹ç›®ï¼ˆç ”发)
    ///</summary>
    ///     é¡¹ç›®ï¼ˆç ”发)
    /// </summary>
    [SugarColumn(ColumnName = "DESCRIPTION")]
    public string? Description { get; set; }
    /// <summary>
    /// é¡¹ç›®ï¼ˆæŠ¥è¡¨ï¼‰
    ///</summary>
    ///     é¡¹ç›®ï¼ˆæŠ¥è¡¨ï¼‰
    /// </summary>
    [SugarColumn(ColumnName = "PRIVATE_DESC_SEG4")]
    public string? PrivateDescSeg4 { get; set; }
    /// <summary>
    /// æŠ¥è¡¨é¡¹ç›®ï¼ˆæ±‡æ€»ï¼‰
    ///</summary>
    ///     æŠ¥è¡¨é¡¹ç›®ï¼ˆæ±‡æ€»ï¼‰
    /// </summary>
    [SugarColumn(ColumnName = "PRIVATE_DESC_SEG9")]
    public string? PrivateDescSeg9 { get; set; }
    /// <summary>
    /// åŒæ•°é‡
    ///</summary>
    ///     åŒæ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "IS_DUAL_QUANTITY")]
    public string? IsDualQuantity { get; set; }
    /// <summary>
    /// åŒå•位
    ///</summary>
    ///     åŒå•位
    /// </summary>
    [SugarColumn(ColumnName = "IS_DUAL_UOM")]
    public string? IsDualUom { get; set; }
    /// <summary>
    /// å¤šå•位
    ///</summary>
    ///     å¤šå•位
    /// </summary>
    [SugarColumn(ColumnName = "IS_MULTY_UOM")]
    public string? IsMultyUom { get; set; }
    /// <summary>
    /// å›ºå®šè½¬æ¢çއ
    ///</summary>
    ///     å›ºå®šè½¬æ¢çއ
    /// </summary>
    [SugarColumn(ColumnName = "IS_VAR_RATIO")]
    public string? IsVarRatio { get; set; }
    /// <summary>
    /// è½¬æ¢çŽ‡ç­–ç•¥
    ///</summary>
    ///     è½¬æ¢çŽ‡ç­–ç•¥
    /// </summary>
    [SugarColumn(ColumnName = "CONVER_RATIO_RULE")]
    public string? ConverRatioRule { get; set; }
    /// <summary>
    /// æ ‡å‡†åº“周
    ///</summary>
    ///     æ ‡å‡†åº“周
    /// </summary>
    [SugarColumn(ColumnName = "PRIVATE_DESC_SEG11")]
    public string? PrivateDescSeg11 { get; set; }
    /// <summary>
    /// å“ç‰Œåˆ†ç±»
    ///</summary>
    ///     å“ç‰Œåˆ†ç±»
    /// </summary>
    [SugarColumn(ColumnName = "PRIVATE_DESC_SEG7")]
    public string? PrivateDescSeg7 { get; set; }
    /// <summary>
    /// BU(业务单元)
    ///</summary>
    ///     BU(业务单元)
    /// </summary>
    [SugarColumn(ColumnName = "PRIVATE_DESC_SEG2")]
    public string? PrivateDescSeg2 { get; set; }
    /// <summary>
    /// BU(业务单元)
    ///</summary>
    ///     BU(业务单元)
    /// </summary>
    [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
    public string? DocumentStatus { get; set; }
    /// <summary>
    /// æ˜¯å¦ç”Ÿæ•ˆ
    ///</summary>
    ///     æ˜¯å¦ç”Ÿæ•ˆ
    /// </summary>
    [SugarColumn(ColumnName = "FORBID_STATUS")]
    public string? ForbidStatus { get; set; }
    /// <summary>
    /// æ—§ç‰©æ–™ç¼–码
    ///</summary>
    ///     æ—§ç‰©æ–™ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "Old_ITEM_NO")]
    public string? OldItemNo { get; set; }
}
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
@@ -9,158 +9,156 @@
public class MesUnit
{
    /// <summary>
    /// BASEINFO
    ///</summary>
    ///     BASEINFO
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }
    /// <summary>
    /// åŽŸå•ä½
    ///</summary>
    ///     åŽŸå•ä½
    /// </summary>
    [SugarColumn(ColumnName = "OLDUNIT")]
    public string? Oldunit { get; set; }
    /// <summary>
    /// ç›®çš„单位
    ///</summary>
    ///     ç›®çš„单位
    /// </summary>
    [SugarColumn(ColumnName = "NEWUNIT")]
    public string? Newunit { get; set; }
    /// <summary>
    /// åŽŸå•ä½æ•°é‡
    ///</summary>
    ///     åŽŸå•ä½æ•°é‡
    /// </summary>
    [SugarColumn(ColumnName = "OLDQTY")]
    public decimal? Oldqty { get; set; }
    /// <summary>
    /// ç›®çš„单位数量
    ///</summary>
    ///     ç›®çš„单位数量
    /// </summary>
    [SugarColumn(ColumnName = "NEWQTY")]
    public decimal? Newqty { get; set; }
    /// <summary>
    /// åˆ›å»ºæ—¶é—´
    ///</summary>
    ///     åˆ›å»ºæ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }
    /// <summary>
    /// åˆ›å»ºäºº
    ///</summary>
    ///     åˆ›å»ºäºº
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }
    /// <summary>
    /// æœ€åŽæ›´æ–°æ—¶é—´
    ///</summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }
    /// <summary>
    /// æœ€åŽæ›´æ–°äºº
    ///</summary>
    ///     æœ€åŽæ›´æ–°äºº
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string? LastupdateBy { get; set; }
    /// <summary>
    ///
    ///</summary>
    /// </summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string? Company { get; set; }
    /// <summary>
    ///
    ///</summary>
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string? Factory { get; set; }
    /// <summary>
    /// ç¼–码
    ///</summary>
    ///     ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "FNUMBER")]
    public string? Fnumber { get; set; }
    /// <summary>
    /// åç§°
    ///</summary>
    ///     åç§°
    /// </summary>
    [SugarColumn(ColumnName = "FNAME")]
    public string? Fname { get; set; }
    /// <summary>
    /// æ‰€å±žç»„别
    ///</summary>
    ///     æ‰€å±žç»„别
    /// </summary>
    [SugarColumn(ColumnName = "FUNITGROUPID")]
    public string? Funitgroupid { get; set; }
    /// <summary>
    /// æ¢ç®—分母
    ///</summary>
    ///     æ¢ç®—分母
    /// </summary>
    [SugarColumn(ColumnName = "FCONVERTDENOMINATOR")]
    public decimal? Fconvertdenominator { get; set; }
    /// <summary>
    /// å½“前单位
    ///</summary>
    ///     å½“前单位
    /// </summary>
    [SugarColumn(ColumnName = "FCURRENTUNITID")]
    public string? Fcurrentunitid { get; set; }
    /// <summary>
    /// æ¢ç®—分子
    ///</summary>
    ///     æ¢ç®—分子
    /// </summary>
    [SugarColumn(ColumnName = "FCONVERTNUMERATOR")]
    public decimal? Fconvertnumerator { get; set; }
    /// <summary>
    /// åŸºå‡†å•位
    ///</summary>
    ///     åŸºå‡†å•位
    /// </summary>
    [SugarColumn(ColumnName = "FBASEUNIT")]
    public string? Fbaseunit { get; set; }
    /// <summary>
    /// èˆå…¥ç±»åž‹
    ///</summary>
    ///     èˆå…¥ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "FROUNDTYPE")]
    public string? Froundtype { get; set; }
    /// <summary>
    /// ç²¾åº¦
    ///</summary>
    ///     ç²¾åº¦
    /// </summary>
    [SugarColumn(ColumnName = "FPRECISION")]
    public decimal? Fprecision { get; set; }
    /// <summary>
    /// æè¿°
    ///</summary>
    ///     æè¿°
    /// </summary>
    [SugarColumn(ColumnName = "FDESCRIPTION")]
    public string? Fdescription { get; set; }
    /// <summary>
    /// ç¦ç”¨çŠ¶æ€
    ///</summary>
    ///     ç¦ç”¨çŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "FFORBIDSTATUS")]
    public string? Fforbidstatus { get; set; }
    /// <summary>
    /// å‰¯å•位
    ///</summary>
    ///     å‰¯å•位
    /// </summary>
    [SugarColumn(ColumnName = "BASE_UOMID")]
    public string? BaseUomid { get; set; }
    /// <summary>
    /// ä¸»å‰¯å•位转换率
    ///</summary>
    ///     ä¸»å‰¯å•位转换率
    /// </summary>
    [SugarColumn(ColumnName = "RATIO_TO_BASE")]
    public string? RatioToBase { get; set; }
    /// <summary>
    /// èˆå…¥å€¼
    ///</summary>
    ///     èˆå…¥å€¼
    /// </summary>
    [SugarColumn(ColumnName = "ROUND_VALUE")]
    public string? RoundValue { get; set; }
    /// <summary>
    /// å•据状态
    ///</summary>
    ///     å•据状态
    /// </summary>
    [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
    public string? DocumentStatus { 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,110 +1,107 @@
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 class EmployeeInfoManager : Repository<EmployeeInfo>
    public bool Save(ErpEmployeeInfo unit)
    {
        public bool Save(ErpEmployeeInfo unit)
        {
            var entity = GetMesItems(unit); // å°† ErpStaff è½¬æ¢ä¸º MesStaff
        var entity = GetMesItems(unit); // å°† ErpStaff è½¬æ¢ä¸º MesStaff
            return UseTransaction(db =>
        return UseTransaction(db =>
        {
            switch (unit.Type)
            {
                switch (unit.Type)
                {
                    case "2":
                    case "4":
                        if (InsertOrUpdateEmp(db, entity.employeeInfo,
                                entity.employeeItems)) // æ’入或更新员工
                            return 1;
                        break;
                    case "3":
                        if (DeleteEmp(db, entity.employeeInfo,
                                entity.employeeItems)) // åˆ é™¤å‘˜å·¥
                            return 1;
                        break;
                    default:
                        throw new ArgumentNullException(
                            $"type没有{unit.Type}这个类型的参数");
                }
                throw new NotImplementedException("操作失败");
            }) > 0;
        }
        public bool SaveList(List<ErpEmployeeInfo> departments)
        {
            var result = departments.Select(Save).ToList();
            return result.All(b => b);
        }
        private bool InsertOrUpdateEmp(SqlSugarScope db,
            EmployeeInfo entityEmployeeInfo,
            List<EmployeeItem> entityEmployeeItems)
        {
            db.Deleteable<EmployeeInfo>().Where(
                s => s.Id == entityEmployeeInfo.Id).ExecuteCommand();
            db.Deleteable<EmployeeItem>()
                .Where(a => a.Eid == entityEmployeeInfo.Id).ExecuteCommand();
            var executeCommand =
                db.Insertable(entityEmployeeInfo).ExecuteCommand();
            var command = db.Insertable(entityEmployeeItems).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
            return executeCommand > 0 && command > 0;
        }
        private bool DeleteEmp(SqlSugarScope db,
            EmployeeInfo entityEmployeeInfo,
            List<EmployeeItem> entityEmployeeItems)
        {
            var command = db.Deleteable<EmployeeInfo>().Where(
                s => s.Id == entityEmployeeInfo.Id).ExecuteCommand();
            var executeCommand = db.Deleteable<EmployeeItem>()
                .Where(a => a.Eid == entityEmployeeInfo.Id).ExecuteCommand();
            return executeCommand > 0 && command > 0;
        }
        private (EmployeeInfo employeeInfo, List<EmployeeItem> employeeItems)
            GetMesItems(
                ErpEmployeeInfo item)
        {
            var items = new EmployeeInfo
            {
                Id = Convert.ToDecimal(item.Id),
                EmployeeNo = item.fNumber,
                EmployeeName = item.fName,
                DepartmentCode = item.fPostDeptid,
                DocumentStatus = item.FDocumentStatus,
                IsDisabled = item.FForbidStatus,
                Organization = item.FUseOrgId
            };
            var employeeItems = new List<EmployeeItem>();
            foreach (var erpEmployeeInfoDto in item.OperatorTypes)
            {
                var employee = new EmployeeItem
                {
                    Eid = items.Id,
                    EType = erpEmployeeInfoDto.OperatorType,
                    CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
                };
                employeeItems.Add(employee);
                case "2":
                case "4":
                    if (InsertOrUpdateEmp(db, entity.employeeInfo,
                            entity.employeeItems)) // æ’入或更新员工
                        return 1;
                    break;
                case "3":
                    if (DeleteEmp(db, entity.employeeInfo,
                            entity.employeeItems)) // åˆ é™¤å‘˜å·¥
                        return 1;
                    break;
                default:
                    throw new ArgumentNullException(
                        $"type没有{unit.Type}这个类型的参数");
            }
            return (items, employeeItems);
            throw new NotImplementedException("操作失败");
        }) > 0;
    }
    public bool SaveList(List<ErpEmployeeInfo> departments)
    {
        var result = departments.Select(Save).ToList();
        return result.All(b => b);
    }
    private bool InsertOrUpdateEmp(SqlSugarScope db,
        EmployeeInfo entityEmployeeInfo,
        List<EmployeeItem> entityEmployeeItems)
    {
        db.Deleteable<EmployeeInfo>().Where(
            s => s.Id == entityEmployeeInfo.Id).ExecuteCommand();
        db.Deleteable<EmployeeItem>()
            .Where(a => a.Eid == entityEmployeeInfo.Id).ExecuteCommand();
        var executeCommand =
            db.Insertable(entityEmployeeInfo).ExecuteCommand();
        var command = db.Insertable(entityEmployeeItems).PageSize(1)
            .IgnoreColumnsNull().ExecuteCommand();
        return executeCommand > 0 && command > 0;
    }
    private bool DeleteEmp(SqlSugarScope db,
        EmployeeInfo entityEmployeeInfo,
        List<EmployeeItem> entityEmployeeItems)
    {
        var command = db.Deleteable<EmployeeInfo>().Where(
            s => s.Id == entityEmployeeInfo.Id).ExecuteCommand();
        var executeCommand = db.Deleteable<EmployeeItem>()
            .Where(a => a.Eid == entityEmployeeInfo.Id).ExecuteCommand();
        return executeCommand > 0 && command > 0;
    }
    private (EmployeeInfo employeeInfo, List<EmployeeItem> employeeItems)
        GetMesItems(
            ErpEmployeeInfo item)
    {
        var items = new EmployeeInfo
        {
            Id = Convert.ToDecimal(item.Id),
            EmployeeNo = item.fNumber,
            EmployeeName = item.fName,
            DepartmentCode = item.fPostDeptid,
            DocumentStatus = item.FDocumentStatus,
            IsDisabled = item.FForbidStatus,
            Organization = item.FUseOrgId
        };
        var employeeItems = new List<EmployeeItem>();
        foreach (var erpEmployeeInfoDto in item.OperatorTypes)
        {
            var employee = new EmployeeItem
            {
                Eid = items.Id,
                EType = erpEmployeeInfoDto.OperatorType,
                CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
            };
            employeeItems.Add(employee);
        }
        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);
@@ -152,8 +152,9 @@
    private bool InsertOrUpdate(SqlSugarScope db, List<MesProject> entity)
    {
        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
@@ -69,7 +69,7 @@
        // æå–所有需要的 MesId ç»„合 
        var ids = supplierId.Select(customer => customer.Id.ToString())
            .ToList();
        // ä½¿ç”¨è¿™äº› MesId åŽ»æŸ¥è¯¢ MesLinkU9 è¡¨ï¼Œæ‰¾åˆ°å¯¹åº”çš„ U9Id
        var u9Ids = Db.Queryable<MesLinkU9>()
            .Where(u =>
@@ -200,8 +200,9 @@
    private bool InsertOrUpdate(SqlSugarScope db, List<MesSupplier> entity)
    {
        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
@@ -91,7 +91,7 @@
            Factory = "1000"
        };
    }
    ///新代码
    private bool InsertOrUpdate(SqlSugarScope db, MesUnit entity)
    {
StandardPda/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -83,7 +83,7 @@
        throw new NotImplementedException("删除失败");
    }
    ///新代码
    // æ’入或更新部门的方法
    private bool InsertOrUpdateDepartment(SqlSugarScope db,
StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs
@@ -1,269 +1,262 @@
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
{
    [ApiController]
    [Route("api/[controller]")]
    public class EmployeeInfoController : ControllerBase
    private readonly MessageCenterManager _manager = new();
    private readonly EmployeeInfoManager m = new();
    private readonly string METHOD = "POST";
    private readonly string TableName = "Employee_Info";
    private readonly string
        URL = "http://localhost:10054/api/EmployeeInfo/";
    [HttpPost("Save")]
    public ResponseResult Save(ErpEmployeeInfo unit)
    {
        private EmployeeInfoManager m = new EmployeeInfoManager();
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "Save";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(unit);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route = unit.fNumber;
        private readonly MessageCenterManager _manager = new();
        private readonly string METHOD = "POST";
        private readonly string TableName = "Employee_Info";
        private readonly string
            URL = "http://localhost:10054/api/EmployeeInfo/";
        [HttpPost("Save")]
        public ResponseResult Save(ErpEmployeeInfo unit)
        try
        {
            var entity = new MessageCenter();
            entity.TableName = TableName;
            entity.Url = URL + "Save";
            entity.Method = METHOD;
            entity.Data = JsonConvert.SerializeObject(unit);
            entity.Status = 1;
            entity.CreateBy = "PL017";
            entity.Route = unit.fNumber;
            dynamic resultInfos = new ExpandoObject();
            var save = m.Save(unit);
            resultInfos.tbBillList = save;
            try
            entity.Result = 0;
            if (save) entity.Result = 1;
            entity.DealWith = 1;
            _manager.save(entity);
            return new ResponseResult
            {
                dynamic resultInfos = new ExpandoObject();
                var save = m.Save(unit);
                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);
            }
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        [HttpPost("SaveList")]
        public ResponseResult SaveList(List<ErpEmployeeInfo> units)
        catch (Exception ex)
        {
            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";
            entity.Route = units.Select(it => it.fNumber).Join(",");
            try
            {
                dynamic resultInfos = new ExpandoObject();
                var save = m.SaveList(units);
                resultInfos.tbBillList = save;
            entity.Result = 0;
                entity.Result = 0;
                if (save) entity.Result = 1;
            entity.DealWith = 0;
                entity.DealWith = 1;
                _manager.save(entity);
            entity.ResultData = ex.Message;
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                entity.Result = 0;
            _manager.save(entity);
                entity.DealWith = 0;
                entity.ResultData = ex.Message;
                _manager.save(entity);
                return ResponseResult.ResponseError(ex);
            }
            return ResponseResult.ResponseError(ex);
        }
    }
        /***进入模版管理可以修改模版***/
        /// <summary>
        /// èŽ·å–æ‰€æœ‰
        /// </summary>
        /// <returns></returns>
        [HttpPost("GetList")]
        public ResponseResult GetList()
    [HttpPost("SaveList")]
    public ResponseResult SaveList(List<ErpEmployeeInfo> 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";
        entity.Route = units.Select(it => it.fNumber).Join(",");
        try
        {
            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
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.GetList();
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        /// <summary>
        /// æ ¹æ®ä¸»é”®èŽ·å–
        /// </summary>
        /// <returns></returns>
        [HttpPost("GetById")]
        public ResponseResult GetById(int id)
        catch (Exception ex)
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.GetById(id);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
            entity.Result = 0;
            entity.DealWith = 0;
            entity.ResultData = ex.Message;
            _manager.save(entity);
            return ResponseResult.ResponseError(ex);
        }
    }
        /// <summary>
        /// æ ¹æ®ä¸»é”®åˆ é™¤
        /// </summary>
        /// <returns></returns>
        [HttpPost("DeleteByIds")]
        public ResponseResult DeleteByIds([FromBody] object[] ids)
    /***进入模版管理可以修改模版***/
    /// <summary>
    ///     èŽ·å–æ‰€æœ‰
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetList")]
    public ResponseResult GetList()
    {
        try
        {
            try
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetList();
            return new ResponseResult
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.DeleteByIds(ids);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        /// <summary>
        /// æ·»åŠ 
        /// </summary>
        /// <returns></returns>
        [HttpPost("Insert")]
        public ResponseResult Add([FromBody] EmployeeInfo data)
        catch (Exception ex)
        {
            try
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.Insert(data);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
            return ResponseResult.ResponseError(ex);
        }
    }
        /// <summary>
        /// æ·»åŠ è¿”å›žè‡ªå¢ž
        /// </summary>
        /// <returns></returns>
        [HttpPost("InsertReturnIdentity")]
        public ResponseResult InsertReturnIdentity([FromBody] EmployeeInfo data)
    /// <summary>
    ///     æ ¹æ®ä¸»é”®èŽ·å–
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetById")]
    public ResponseResult GetById(int id)
    {
        try
        {
            try
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetById(id);
            return new ResponseResult
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.InsertReturnIdentity(data);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
            {
                return ResponseResult.ResponseError(ex);
            }
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        /// <summary>
        /// ä¿®æ”¹
        /// </summary>
        /// <returns></returns>
        [HttpPost("Update")]
        public ResponseResult Update([FromBody] EmployeeInfo data)
        catch (Exception ex)
        {
            try
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     æ ¹æ®ä¸»é”®åˆ é™¤
    /// </summary>
    /// <returns></returns>
    [HttpPost("DeleteByIds")]
    public ResponseResult DeleteByIds([FromBody] object[] ids)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.DeleteByIds(ids);
            return new ResponseResult
            {
                dynamic resultInfos = new ExpandoObject();
                resultInfos.tbBillList = m.Update(data);
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };
            }
            catch (Exception ex)
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     æ·»åŠ 
    /// </summary>
    /// <returns></returns>
    [HttpPost("Insert")]
    public ResponseResult Add([FromBody] EmployeeInfo data)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.Insert(data);
            return new ResponseResult
            {
                return ResponseResult.ResponseError(ex);
            }
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     æ·»åŠ è¿”å›žè‡ªå¢ž
    /// </summary>
    /// <returns></returns>
    [HttpPost("InsertReturnIdentity")]
    public ResponseResult InsertReturnIdentity([FromBody] EmployeeInfo data)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.InsertReturnIdentity(data);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     ä¿®æ”¹
    /// </summary>
    /// <returns></returns>
    [HttpPost("Update")]
    public ResponseResult Update([FromBody] EmployeeInfo data)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.Update(data);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
}
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;
@@ -23,7 +22,7 @@
    private readonly string TableName = "MES_ITEMS";
    private readonly string URL = "http://localhost:10054/api/MesItems/";
    [HttpPost("Save")]
    public ResponseResult Save(ErpItems unit)
    {
StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs
@@ -14,10 +14,9 @@
[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";
    private readonly string TableName = "MES_SUPPLIER";