| StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/Dto/webApi/ErpCAB.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/Modes/Womcaa.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/Modes/Womcab.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/service/WomcaaManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardInterface/MES.Service/service/WomcaaWWManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
StandardInterface/MES.Service/Dto/webApi/ErpCAA.cs
@@ -4,50 +4,51 @@ { public string? Id { get; set; } public string? Type { get; set; } public string? FBillNo { get; set; } public string? FWorkShopID { get; set; } public string? FRoutingId { get; set; } public string? FREMWorkShopId { get; set; } public string? FStockId { get; set; } public string? FDate { get; set; } public string? FBillType { get; set; } public string? FStatus { get; set; } public string? FMaterialId { get; set; } public string? FUnitId { get; set; } public string? FQty { get; set; } public string? FWorkGroupId { get; set; } public string? FPlannerID { get; set; } public string? FPlanStartDate { get; set; } public string? FPlanFinishDate { get; set; } public string? FConveyDate { get; set; } public string? FStockInLimitH { get; set; } public string? FStockInLimitL { get; set; } public string? FMTONO { get; set; } public string? FLot { get; set; } public string? FBillNo { get; set; } // 单据编号 public string? FWorkShopID { get; set; } // 生产车间 public string? FRoutingId { get; set; } // 工艺路线 public string? FREMWorkShopId { get; set; } // 产线 public string? FStockId { get; set; } // 仓库 public string? FDate { get; set; } // 单据日期 public string? FBillType { get; set; } // 单据类型 public string? FStatus { get; set; } // 业务状态 public string? FMaterialId { get; set; } // 产品编码 public string? FUnitId { get; set; } // 单位 public string? FQty { get; set; } // 工单数量 public string? FWorkGroupId { get; set; } // 计划组 public string? FPlannerID { get; set; } // 计划员 public string? FPlanStartDate { get; set; } // 预计开工时间 public string? FPlanFinishDate { get; set; }// 预计完工时间 public string? FConveyDate { get; set; } // 计划下达日期 public string? FStockInLimitH { get; set; } // 入库上限 public string? FStockInLimitL { get; set; } // 入库下限 public string? FMTONO { get; set; } // 计划跟踪号 public string? FLot { get; set; } //批号 public string? FBomId { get; set; } //public string? FXSHTH { get; set; } public string? FCreateType { get; set; } public string? PLAN_ID { get; set; } public string? PLAN_SEQ { get; set; } public string? PLAN_NUM { get; set; } public string? FSrcBillType { get; set; } public string? FSrcBillNo { get; set; } public string? FSrcBillEntrySeq { get; set; } public string? FSaleOrderNo { get; set; } public string? FSaleOrderEntrySeq { get; set; } public string? FForceCloserId { get; set; } public string? FCloseType { get; set; } public string? FSrcSplitBillNo { get; set; } public string? FBomId { get; set; } //BOM版次 public string? CAA015 { get; set; } //销售订单号 public string? CAA015_line { get; set; } //销售订单行号 //public string? FXSHTH { get; set; } public string? FCreateType { get; set; } //生成方式 public string? PLAN_ID { get; set; } //ERP生产订单ID public string? PLAN_SEQ { get; set; } //ERP生产订单序号 public string? PLAN_NUM { get; set; } //ERP生产订单单号 public string? FSrcBillType { get; set; } //源单类型 public string? FSrcBillNo { get; set; } //源单编码 public string? FSrcBillEntrySeq { get; set; } //源单分录行号 public string? FSaleOrderNo { get; set; } //需求单据号 public string? FSaleOrderEntrySeq { get; set; } //需求单据行号 public string? FForceCloserId { get; set; } //结案人 public string? FCloseType { get; set; } //结案类型 public string? FSrcSplitBillNo { get; set; } //源拆分订单编号 //public string? erP_SCZZ { get; set; } //public string? erP_WTZZ { get; set; } //public string? F_ZJXF_YHRQ { get; set; } //public string? F_ZSXG_KH { get; set; } public string? FDescription { get; set; } public string? FDescription { get; set; }//接口状态 public string? BTBZ { get; set; } public string? BTBZ { get; set; } //备注 //public string? fsubentryid { get; set; } //public string? FPurOrderNo { get; set; } @@ -56,19 +57,22 @@ //public string? Caa025 { get; set; } //public string? ErpRkhz { get; set; } //public string? ErpRkzz { get; set; } public string? FPrdOrgId { get; set; } public string? FEnTrustOrgId { get; set; } public string? TypeA { get; set; } public string? FPrdOrgId { get; set; } //生产组织ID public string? FEnTrustOrgId { get; set; } //委托组织ID public string? TypeA { get; set; } //单据状态 public string? RK_ORG { get; set; } //入库组织 public string? RCN { get; set; } //日产能 ////委外字段 //public string? F_ZJXF_DATETIME_YHRQ { get; set; } //public string? F_ZJXF_BASE_KH { get; set; } //新增ppbom投料单号字段 public string? ppbombillno { get; set; } // public string? ppbombillno { get; set; } //沃尔新增 生产通知单 、 型号 public string? F_SCDD_SCTZD { get; set; } // public string? F_SCDD_SCTZD { get; set; } // public string? F_SCDD_XH { get; set; } } StandardInterface/MES.Service/Dto/webApi/ErpCAB.cs
@@ -2,40 +2,48 @@ public class ErpCAB { public string? FBillNo { get; set; } public string? FSeq { get; set; } public string? FMaterialID { get; set; } public string? FNeedQty { get; set; } public string? FMustQty { get; set; } public string? FPickedQty { get; set; } public string? FPositionNO { get; set; } public string? FChildSupplyOrgId { get; set; } public string? FSupplyOrg { get; set; } public string? FOwnerID { get; set; } public string? FMTONO { get; set; } public string? FLot { get; set; } public string? FStockID { get; set; } public string? FBillNo { get; set; }//单据编号 public string? FSeq { get; set; }//序号 public string? FMaterialID { get; set; }//子项物料编码 public string? FNeedQty { get; set; }//需求数量 public string? FMustQty { get; set; }//应发数量 public string? FPickedQty { get; set; }//已领数量 public string? FPositionNO { get; set; }//位置号 public string? FChildSupplyOrgId { get; set; }//供应组织 public string? FSupplyOrg { get; set; }//发料组织 public string? FOwnerID { get; set; }//货主 public string? FMTONO { get; set; } //计划跟踪号 public string? FLot { get; set; } //批号 public string? FStockID { get; set; } //仓库 public string? FIssueType { get; set; } public string? FIssueType { get; set; }//发料方式 //public string? BTBZ { get; set; } public string? FUnitID { get; set; } public string? FSupplyType { get; set; } public string? FStdQty { get; set; } public string? FReplaceGroup { get; set; } public string? FUseRate { get; set; } public string? FMaterialType { get; set; } public string? FIsKeyItem { get; set; } public string? FNumerator { get; set; } public string? FDenominator { get; set; } public string? PID { get; set; } public string? ID { get; set; } public string? FUnitID { get; set; } //单位 public string? FSupplyType { get; set; } //供应类型 public string? FStdQty { get; set; } //标准用量 // public string? FReplaceGroup { get; set; } public string? FUseRate { get; set; } //使用比例 public string? FMaterialType { get; set; }//子项类型 public string? FIsKeyItem { get; set; } //替代主料 public string? FNumerator { get; set; } //分子 public string? FDenominator { get; set; } //分母 public string? ID { get; set; } //ERPID public string? PID { get; set; } //ERP头ID public string? FFixScrapQty { get; set; } public string? FScrapRate { get; set; } public string? TypeB { get; set; } public string? FFixScrapQty { get; set; }//固定损耗 public string? FScrapRate { get; set; } //变动损耗率 //public string? TypeB { get; set; } public string? WLSL { get; set; } //未领数量 public string? KWWLBM { get; set; } //客户物料代码 public string? KHWLMC { get; set; } //客户物料名称 public string? XQZZ { get; set; } //需求组织 public string? XQBM { get; set; } //需求部门 public string? SLZZ { get; set; } //收料组织 public string? SLBM { get; set; } //收料部门 public string? F_XIFG_Base_qtr { get; set; } //public string? F_XIFG_Base_qtr { get; set; } //public string? F_XIFG_Base_83g { get; set; } //public string? FSALEORDERNO { get; set; } StandardInterface/MES.Service/Modes/Womcaa.cs
@@ -1,440 +1,424 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// 工单表 /// </summary> [SugarTable("WOMCAA")] public class Womcaa using System; using System.Collections.Generic; using System.Linq; using SqlSugar; namespace MES.Service.Modes { /// <summary> /// 自增列 SEQ_AOI /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_CAA")] public decimal? Id { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERPID")] public decimal? Erpid { get; set; } /// <summary> /// 单号 /// </summary> [SugarColumn(ColumnName = "CAA001")] public string? Caa001 { get; set; } /// <summary> /// 单据类型 1、直接入库-普通生产 SCDD03_SYS2、直接入库-返工生产 SCDD04_SYS3、工序汇报-普通生产 /// SCDD01_SYS4、工序汇报-返工生产 SCDD02_SYS /// </summary> [SugarColumn(ColumnName = "CAA004")] public string? Caa004 { get; set; } /// <summary> /// 开单日期 /// </summary> [SugarColumn(ColumnName = "CAA005")] public string? Caa005 { get; set; } /// <summary> /// 产品编码 /// </summary> [SugarColumn(ColumnName = "CAA006")] public string? Caa006 { get; set; } /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "CAA009")] public string? Caa009 { get; set; } /// <summary> /// 预计开工时间 /// </summary> [SugarColumn(ColumnName = "CAA010")] public string? Caa010 { get; set; } /// <summary> /// 预计完工时间 /// </summary> [SugarColumn(ColumnName = "CAA011")] public string? Caa011 { get; set; } /// <summary> /// 数量 /// </summary> [SugarColumn(ColumnName = "CAA012")] public decimal? Caa012 { get; set; } /// <summary> /// BOM版次 /// </summary> [SugarColumn(ColumnName = "CAA013")] public string? Caa013 { get; set; } /// <summary> /// 销售订单号 /// </summary> [SugarColumn(ColumnName = "CAA015")] public string? Caa015 { get; set; } /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "CAA016")] public string? Caa016 { get; set; } /// <summary> /// 已排数量 /// </summary> [SugarColumn(ColumnName = "CAA017")] public decimal? Caa017 { get; set; } /// <summary> /// ERP源单ID /// </summary> [SugarColumn(ColumnName = "CAA018")] public decimal? Caa018 { get; set; } /// <summary> /// ERP源单行号 /// </summary> [SugarColumn(ColumnName = "CAA019")] public string? Caa019 { get; set; } /// <summary> /// ERP源单单号(任务单号) /// </summary> [SugarColumn(ColumnName = "CAA020")] public string? Caa020 { get; set; } /// <summary> /// 工作车间 /// </summary> [SugarColumn(ColumnName = "CAA021")] public string? Caa021 { get; set; } /// <summary> /// 审核码 /// </summary> [SugarColumn(ColumnName = "FSTATUS")] public decimal? Fstatus { get; set; } /// <summary> /// 审核日期 /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// 审核人 /// </summary> [SugarColumn(ColumnName = "CHECK_USER")] public string? CheckUser { get; set; } /// <summary> /// 未排数量 /// </summary> [SugarColumn(ColumnName = "CAA022")] public decimal? Caa022 { get; set; } /// <summary> /// 状态 完工，未完工 /// </summary> [SugarColumn(ColumnName = "CAA023")] public string? Caa023 { get; set; } /// <summary> /// 已入库数量 /// </summary> [SugarColumn(ColumnName = "CAA024")] public decimal? Caa024 { get; set; } /// <summary> /// 工艺路线 /// </summary> [SugarColumn(ColumnName = "ROUTING_ID")] public string? RoutingId { get; set; } /// <summary> /// 产线 /// </summary> [SugarColumn(ColumnName = "WORK_SHOP_ID")] public string? WorkShopId { get; set; } /// <summary> /// 仓库 /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string? DepotCode { get; set; } /// <summary> /// 单据日期 /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public string? CreateDate { get; set; } /// <summary> /// 计划组 /// </summary> [SugarColumn(ColumnName = "WORK_GROUP_ID")] public string? WorkGroupId { get; set; } /// <summary> /// 计划员 /// </summary> [SugarColumn(ColumnName = "PLAN_ID")] public string? PlanId { get; set; } /// <summary> /// 入库上限 /// </summary> [SugarColumn(ColumnName = "STOCK_INLIMITH")] public string? StockInlimith { get; set; } /// <summary> /// 入库下限 /// </summary> [SugarColumn(ColumnName = "STOCK_INLIMITL")] public string? StockInlimitl { get; set; } /// <summary> /// 计划跟踪号 /// </summary> [SugarColumn(ColumnName = "MTONO")] public string? Mtono { get; set; } /// <summary> /// 批号 /// </summary> [SugarColumn(ColumnName = "LOT")] public string? Lot { get; set; } /// <summary> /// 销售订单行号 /// </summary> [SugarColumn(ColumnName = "CAA015_HEAD")] public string? Caa015Head { get; set; } /// <summary> /// 生成方式 /// </summary> [SugarColumn(ColumnName = "CREATE_TYPE")] public string? CreateType { get; set; } /// <summary> /// 源单类型 /// </summary> [SugarColumn(ColumnName = "SRC_BILL_TYPE")] public string? SrcBillType { get; set; } /// <summary> /// 源单编号 /// </summary> [SugarColumn(ColumnName = "SRC_BILL_NO")] public string? SrcBillNo { get; set; } /// <summary> /// 源单分录行号 /// </summary> [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")] public string? SrcBillentryseq { get; set; } /// <summary> /// 需求单据号 /// </summary> [SugarColumn(ColumnName = "SALE_ORDER_NO")] public string? SaleOrderNo { get; set; } /// <summary> /// 需求单据行号 /// </summary> [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")] public string? SaleOrderEntryseq { get; set; } /// <summary> /// 结案人 /// </summary> [SugarColumn(ColumnName = "FORCE_CLOSERID")] public string? ForceCloserid { get; set; } /// <summary> /// 结案类型 /// </summary> [SugarColumn(ColumnName = "CLOSE_TYPE")] public string? CloseType { get; set; } /// <summary> /// 源拆分订单编号 /// </summary> [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")] public string? SrcSplitBillno { get; set; } /// <summary> /// 客户 /// </summary> [SugarColumn(ColumnName = "F_ZSXG_KH")] public string? F_ZSXG_KH { get; set; } /// <summary> /// 要货日期 /// </summary> [SugarColumn(ColumnName = "F_ZJXF_YHRQ")] public string? F_ZJXF_YHRQ { get; set; } /// <summary> /// 生产组织 /// </summary> [SugarColumn(ColumnName = "PRD_ORG")] public string? PrdOrg { get; set; } /// <summary> /// 委托组织 /// </summary> [SugarColumn(ColumnName = "TRUST_ORG")] public string? TrustOrg { get; set; } /// <summary> /// 同步时间 /// </summary> [SugarColumn(ColumnName = "TB_TIME")] public DateTime? TbTime { get; set; } /// <summary> /// 结案时间 /// </summary> [SugarColumn(ColumnName = "JA_TIME")] public DateTime? JaTime { get; set; } /// <summary> /// 结案标识 /// </summary> [SugarColumn(ColumnName = "JA_BS")] public string? JaBs { get; set; } /// <summary> /// 修改标识 /// </summary> [SugarColumn(ColumnName = "IS_XG")] public decimal? IsXg { get; set; } /// <summary> /// 1，新增；2，变更 /// </summary> [SugarColumn(ColumnName = "TYPEA")] public string? Typea { get; set; } /// <summary> /// 生产通知单 （沃尔新增） /// </summary> [SugarColumn(ColumnName = "WR_F_SCDD_SCTZD")] public string? WR_F_SCDD_SCTZD { get; set; } /// <summary> /// 型号 （沃尔新增） /// </summary> [SugarColumn(ColumnName = "WR_F_SCDD_XH")] public string? WR_F_SCDD_XH { get; set; } /// <summary> /// 备注(表体) /// </summary> [SugarColumn(ColumnName = "BTBZ")] public string? BTBZ { get; set; } /// <summary> /// 计划确认时间（执行日期） --委外 /// </summary> [SugarColumn(ColumnName = "PLANCONFIRMATION")] public string? PLANCONFIRMATION { get; set; } /// <summary> /// ERP生产订单ID --委外 /// </summary> [SugarColumn(ColumnName = "FSUBID")] public string? FSUBID { get; set; } /// <summary> /// ERP生产订单序号 --委外 /// </summary> [SugarColumn(ColumnName = "FSUBBILLNOSEQ")] public string? FSUBBILLNOSEQ { get; set; } /// <summary> /// ERP生产订单单号 --委外 /// </summary> [SugarColumn(ColumnName = "FSUBBILLNO")] public string? FSUBBILLNO { get; set; } /// <summary> /// 需求来源 --委外 /// </summary> [SugarColumn(ColumnName = "FREQSRC")] public string? FREQSRC { get; set; } /// <summary> /// 源拆分订单行号 --委外 /// </summary> [SugarColumn(ColumnName = "SRCSPLITSEQ")] public string? SRCSPLITSEQ { get; set; } /// <summary> /// ERP委外订单分录内码 -- 委外 /// </summary> [SugarColumn(ColumnName = "FSUBENTRYID")] public string? FSUBENTRYID { get; set; } /// <summary> /// ERP委外订单分录内码 -- 委外 /// </summary> [SugarColumn(ColumnName = "FPURORDERNO")] public string? FPURORDERNO { get; set; } /// <summary> /// 采购订单行号 -- 委外 /// </summary> [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")] public string? FPURORDERENTRYSEQ { get; set; } /// <summary> /// 基本单位入库数量 -- 委外 /// </summary> [SugarColumn(ColumnName = "FBASESTOCKINQTY")] public decimal? FBASESTOCKINQTY { get; set; } /// <summary> /// 基本单位未入库数量 -- 委外 /// </summary> [SugarColumn(ColumnName = "FBASENOSTOCKINQTY")] public decimal? FBASENOSTOCKINQTY { get; set; } /// <summary> /// 入库货主 -- 委外 /// </summary> [SugarColumn(ColumnName = "FINSTOCKOWNERID")] public string? FINSTOCKOWNERID { get; set; } /// <summary> /// 生产通知单 -- 委外 /// </summary> [SugarColumn(ColumnName = "F_WWDD_SCTZD")] public string? F_WWDD_SCTZD { get; set; } /// <summary> /// 型号 -- 委外 /// </summary> [SugarColumn(ColumnName = "F_WWDD_XH")] public string? F_WWDD_XH { get; set; } /// <summary> /// BOM备注 -- 委外 /// </summary> [SugarColumn(ColumnName = "F_XIFG_TEXT_TZK")] public string? F_XIFG_TEXT_TZK { get; set; } } /// 任务单表 ///</summary> [SugarTable("WOMCAA")] public class Womcaa { /// <summary> /// 自增列 ///</summary> [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true )] public decimal Id { get; set; } /// <summary> /// 生产订单行内码 ///</summary> [SugarColumn(ColumnName="ERPID" )] public decimal? Erpid { get; set; } /// <summary> /// 单据编号 ///</summary> [SugarColumn(ColumnName="CAA001" )] public string Caa001 { get; set; } /// <summary> /// 单据类型 ///</summary> [SugarColumn(ColumnName="CAA004" )] public string Caa004 { get; set; } /// <summary> /// 计划下达日期 ///</summary> [SugarColumn(ColumnName="CAA005" )] public string Caa005 { get; set; } /// <summary> /// 产品编码 ///</summary> [SugarColumn(ColumnName="CAA006" )] public string Caa006 { get; set; } /// <summary> /// 单位 ///</summary> [SugarColumn(ColumnName="CAA009" )] public string Caa009 { get; set; } /// <summary> /// 预计开工时间 ///</summary> [SugarColumn(ColumnName="CAA010" )] public string Caa010 { get; set; } /// <summary> /// 预计完工时间 ///</summary> [SugarColumn(ColumnName="CAA011" )] public string Caa011 { get; set; } /// <summary> /// 工单数量 ///</summary> [SugarColumn(ColumnName="CAA012" )] public decimal? Caa012 { get; set; } /// <summary> /// BOM版次 ///</summary> [SugarColumn(ColumnName="CAA013" )] public string Caa013 { get; set; } /// <summary> /// 销售订单号 ///</summary> [SugarColumn(ColumnName="CAA015" )] public string Caa015 { get; set; } /// <summary> /// 备注 ///</summary> [SugarColumn(ColumnName="CAA016" )] public string Caa016 { get; set; } /// <summary> /// 已排数量 ///</summary> [SugarColumn(ColumnName="CAA017" )] public decimal? Caa017 { get; set; } /// <summary> /// ERP生产订单ID ///</summary> [SugarColumn(ColumnName="CAA018" )] public decimal? Caa018 { get; set; } /// <summary> /// ERP生产订单序号 ///</summary> [SugarColumn(ColumnName="CAA019" )] public string Caa019 { get; set; } /// <summary> /// ERP生产订单单号 ///</summary> [SugarColumn(ColumnName="CAA020" )] public string Caa020 { get; set; } /// <summary> /// 生产车间 ///</summary> [SugarColumn(ColumnName="CAA021" )] public string Caa021 { get; set; } /// <summary> /// 审核码 ///</summary> [SugarColumn(ColumnName="FSTATUS" )] public decimal? Fstatus { get; set; } /// <summary> /// 审核日期 ///</summary> [SugarColumn(ColumnName="CHECK_DATE" )] public DateTime? CheckDate { get; set; } /// <summary> /// 审核人 ///</summary> [SugarColumn(ColumnName="CHECK_USER" )] public string CheckUser { get; set; } /// <summary> /// 未排数量 ///</summary> [SugarColumn(ColumnName="CAA022" )] public decimal? Caa022 { get; set; } /// <summary> /// 业务状态 ///</summary> [SugarColumn(ColumnName="CAA023" )] public string Caa023 { get; set; } /// <summary> /// 已入库数量 ///</summary> [SugarColumn(ColumnName="CAA024" )] public decimal? Caa024 { get; set; } /// <summary> /// 工艺路线 ///</summary> [SugarColumn(ColumnName="ROUTING_ID" )] public string RoutingId { get; set; } /// <summary> /// 产线 ///</summary> [SugarColumn(ColumnName="WORK_SHOP_ID" )] public string WorkShopId { get; set; } /// <summary> /// 仓库 ///</summary> [SugarColumn(ColumnName="DEPOT_CODE" )] public string DepotCode { get; set; } /// <summary> /// 单据日期 ///</summary> [SugarColumn(ColumnName="CREATE_DATE" )] public string CreateDate { get; set; } /// <summary> /// 计划组 ///</summary> [SugarColumn(ColumnName="WORK_GROUP_ID" )] public string WorkGroupId { get; set; } /// <summary> /// 计划员 ///</summary> [SugarColumn(ColumnName="PLAN_ID" )] public string PlanId { get; set; } /// <summary> /// 入库上限 ///</summary> [SugarColumn(ColumnName="STOCK_INLIMITH" )] public string StockInlimith { get; set; } /// <summary> /// 入库下限 ///</summary> [SugarColumn(ColumnName="STOCK_INLIMITL" )] public string StockInlimitl { get; set; } /// <summary> /// 计划跟踪号 ///</summary> [SugarColumn(ColumnName="MTONO" )] public string Mtono { get; set; } /// <summary> /// 批号 ///</summary> [SugarColumn(ColumnName="LOT" )] public string Lot { get; set; } /// <summary> /// 销售订单行号 ///</summary> [SugarColumn(ColumnName="CAA015_HEAD" )] public string Caa015Head { get; set; } /// <summary> /// 生成方式 ///</summary> [SugarColumn(ColumnName="CREATE_TYPE" )] public string CreateType { get; set; } /// <summary> /// 源单类型 ///</summary> [SugarColumn(ColumnName="SRC_BILL_TYPE" )] public string SrcBillType { get; set; } /// <summary> /// 源单编码 ///</summary> [SugarColumn(ColumnName="SRC_BILL_NO" )] public string SrcBillNo { get; set; } /// <summary> /// 源单分录行号 ///</summary> [SugarColumn(ColumnName="SRC_BILLENTRYSEQ" )] public string SrcBillentryseq { get; set; } /// <summary> /// 需求单据号 ///</summary> [SugarColumn(ColumnName="SALE_ORDER_NO" )] public string SaleOrderNo { get; set; } /// <summary> /// 需求单据行号 ///</summary> [SugarColumn(ColumnName="SALE_ORDER_ENTRYSEQ" )] public string SaleOrderEntryseq { get; set; } /// <summary> /// 结案人 ///</summary> [SugarColumn(ColumnName="FORCE_CLOSERID" )] public string ForceCloserid { get; set; } /// <summary> /// 结案类型 ///</summary> [SugarColumn(ColumnName="CLOSE_TYPE" )] public string CloseType { get; set; } /// <summary> /// 源拆分订单编号 ///</summary> [SugarColumn(ColumnName="SRC_SPLIT_BILLNO" )] public string SrcSplitBillno { get; set; } /// <summary> /// 生产组织 ///</summary> [SugarColumn(ColumnName="PRD_ORG" )] public string PrdOrg { get; set; } /// <summary> /// 委托组织 ///</summary> [SugarColumn(ColumnName="TRUST_ORG" )] public string TrustOrg { get; set; } /// <summary> /// 同步时间 ///</summary> [SugarColumn(ColumnName="TB_TIME" )] public DateTime? TbTime { get; set; } /// <summary> /// 结案时间 ///</summary> [SugarColumn(ColumnName="JA_TIME" )] public DateTime? JaTime { get; set; } /// <summary> /// 结案标识 ///</summary> [SugarColumn(ColumnName="JA_BS" )] public decimal? JaBs { get; set; } /// <summary> /// 旧物料编码 ///</summary> [SugarColumn(ColumnName="F_WWC_BASEPROPERTY" )] public string FWwcBaseproperty { get; set; } /// <summary> /// 计划完工携带日期 ///</summary> [SugarColumn(ColumnName="F_WWC_DATETIME" )] public DateTime? FWwcDatetime { get; set; } /// <summary> /// 生产入库日期 ///</summary> [SugarColumn(ColumnName="F_WWC_SCRKRQ" )] public DateTime? FWwcScrkrq { get; set; } /// <summary> /// 工时 ///</summary> [SugarColumn(ColumnName="FGS" )] public decimal? Fgs { get; set; } /// <summary> /// 产线人数 ///</summary> [SugarColumn(ColumnName="F_WWC_DECIMAL" )] public decimal? FWwcDecimal { get; set; } /// <summary> /// 线别 ///</summary> [SugarColumn(ColumnName="F_WWC_XB" )] public string FWwcXb { get; set; } /// <summary> /// 销售员 ///</summary> [SugarColumn(ColumnName="F_WWC_BASE" )] public string FWwcBase { get; set; } /// <summary> /// 修改标识 ///</summary> [SugarColumn(ColumnName="IS_XG" )] public decimal? IsXg { get; set; } /// <summary> /// 委外采购订单 ///</summary> [SugarColumn(ColumnName="FPURORDERNO" )] public string Fpurorderno { get; set; } /// <summary> /// 委外采购订单行号 ///</summary> [SugarColumn(ColumnName="FPURORDERENTRYSEQ" )] public string Fpurorderentryseq { get; set; } /// <summary> /// 委外订单分录内码 ///</summary> [SugarColumn(ColumnName="FSUBENTRYID" )] public decimal? Fsubentryid { get; set; } /// <summary> /// 委外入库数 ///</summary> [SugarColumn(ColumnName="FSTOCKINQTY" )] public decimal? Fstockinqty { get; set; } /// <summary> /// 委外未入库数 ///</summary> [SugarColumn(ColumnName="FNOSTOCKINQTY" )] public decimal? Fnostockinqty { get; set; } /// <summary> /// BOM备注 -- 委外 ///</summary> [SugarColumn(ColumnName="F_XIFG_TEXT_TZK" )] public string FXifgTextTzk { get; set; } /// <summary> /// 生产通知单 （沃尔新增） ///</summary> [SugarColumn(ColumnName="WR_F_SCDD_SCTZD" )] public string WrFScddSctzd { get; set; } /// <summary> /// 型号 （沃尔新增） ///</summary> [SugarColumn(ColumnName="WR_F_SCDD_XH" )] public string WrFScddXh { get; set; } /// <summary> /// 计划确认时间（执行日期） --委外 ///</summary> [SugarColumn(ColumnName="PLANCONFIRMATION" )] public string Planconfirmation { get; set; } /// <summary> /// ERP生产订单ID --委外 ///</summary> [SugarColumn(ColumnName="FSUBID" )] public string Fsubid { get; set; } /// <summary> /// ERP生产订单序号 --委外 ///</summary> [SugarColumn(ColumnName="FSUBBILLNOSEQ" )] public string Fsubbillnoseq { get; set; } /// <summary> /// ERP生产订单单号 --委外 ///</summary> [SugarColumn(ColumnName="FSUBBILLNO" )] public string Fsubbillno { get; set; } /// <summary> /// 需求来源 --委外 ///</summary> [SugarColumn(ColumnName="FREQSRC" )] public string Freqsrc { get; set; } /// <summary> /// 源拆分订单行号 --委外 ///</summary> [SugarColumn(ColumnName="SRCSPLITSEQ" )] public string Srcsplitseq { get; set; } /// <summary> /// 基本单位入库数量 -- 委外 ///</summary> [SugarColumn(ColumnName="FBASESTOCKINQTY" )] public string Fbasestockinqty { get; set; } /// <summary> /// 基本单位未入库数量 -- 委外 ///</summary> [SugarColumn(ColumnName="FBASENOSTOCKINQTY" )] public string Fbasenostockinqty { get; set; } /// <summary> /// 入库货主 -- 委外 ///</summary> [SugarColumn(ColumnName="FINSTOCKOWNERID" )] public string Finstockownerid { get; set; } /// <summary> /// 生产通知单 -- 委外 ///</summary> [SugarColumn(ColumnName="F_WWDD_SCTZD" )] public string FWwddSctzd { get; set; } /// <summary> /// 型号 -- 委外 ///</summary> [SugarColumn(ColumnName="F_WWDD_XH" )] public string FWwddXh { get; set; } /// <summary> /// 表体备注 ///</summary> [SugarColumn(ColumnName="BTBZ" )] public string Btbz { get; set; } /// <summary> /// 日产能 ///</summary> [SugarColumn(ColumnName="RCN" )] public string Rcn { get; set; } /// <summary> /// 入库组织 ///</summary> [SugarColumn(ColumnName="RK_ORG" )] public string RkOrg { get; set; } /// <summary> /// 状态 ///</summary> [SugarColumn(ColumnName="TYPEA" )] public string Typea { get; set; } /// <summary> /// 要货日期 ///</summary> [SugarColumn(ColumnName="F_ZJXF_YHRQ" )] public string FZjxfYhrq { get; set; } /// <summary> /// 客户 ///</summary> [SugarColumn(ColumnName="F_ZSXG_KH" )] public string FZsxgKh { get; set; } } } StandardInterface/MES.Service/Modes/Womcab.cs
@@ -1,292 +1,313 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// 工单子表 /// </summary> [SugarTable("WOMCAB")] public class Womcab using System; using System.Collections.Generic; using System.Linq; using SqlSugar; namespace MES.Service.Modes { /// <summary> /// 自增列 /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_CAB")] public decimal? Id { get; set; } /// 任务单物料表 ///</summary> [SugarTable("WOMCAB")] public class Womcab { /// <summary> /// 自增列 ///</summary> [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true )] public decimal Id { get; set; } /// <summary> /// 生产用料清单行内码 ///</summary> [SugarColumn(ColumnName="ERPID" )] public decimal? Erpid { get; set; } /// <summary> /// 工单单号 ///</summary> [SugarColumn(ColumnName="CAB001" )] public string Cab001 { get; set; } /// <summary> /// 序号 ///</summary> [SugarColumn(ColumnName="CAB002" )] public string Cab002 { get; set; } /// <summary> /// 材料编码 ///</summary> [SugarColumn(ColumnName="CAB003" )] public string Cab003 { get; set; } /// <summary> /// 需领用量 ///</summary> [SugarColumn(ColumnName="CAB006" )] public decimal? Cab006 { get; set; } /// <summary> /// 已领用量 ///</summary> [SugarColumn(ColumnName="CAB007" )] public decimal? Cab007 { get; set; } /// <summary> /// 工艺 ///</summary> [SugarColumn(ColumnName="CAB008" )] public string Cab008 { get; set; } /// <summary> /// 单位 ///</summary> [SugarColumn(ColumnName="CAB009" )] public string Cab009 { get; set; } /// <summary> /// 组成用量 ///</summary> [SugarColumn(ColumnName="CAB012" )] public decimal? Cab012 { get; set; } /// <summary> /// 是否替料 ///</summary> [SugarColumn(ColumnName="CAB014" )] public decimal? Cab014 { get; set; } /// <summary> /// 生产订单行内码 ///</summary> [SugarColumn(ColumnName="PID" )] public decimal? Pid { get; set; } /// <summary> /// 生产订单行内码 ///</summary> [SugarColumn(ColumnName="EID" )] public decimal? Eid { get; set; } /// <summary> /// 位置号 ///</summary> [SugarColumn(ColumnName="POSITION_NO" )] public string PositionNo { get; set; } /// <summary> /// 发料组织 ///</summary> [SugarColumn(ColumnName="ISSUING_ORGANIZATION" )] public string IssuingOrganization { get; set; } /// <summary> /// 供应组织 ///</summary> [SugarColumn(ColumnName="SUPPLY_ORGANIZATION" )] public string SupplyOrganization { get; set; } /// <summary> /// 货主 ///</summary> [SugarColumn(ColumnName="OWNER_ID" )] public string OwnerId { get; set; } /// <summary> /// 计划跟踪号 ///</summary> [SugarColumn(ColumnName="MTONO" )] public string Mtono { get; set; } /// <summary> /// 批号 ///</summary> [SugarColumn(ColumnName="LOT" )] public string Lot { get; set; } /// <summary> /// 仓库 ///</summary> [SugarColumn(ColumnName="DEPOT_CODE" )] public string DepotCode { get; set; } /// <summary> /// 发料方式 ///</summary> [SugarColumn(ColumnName="ISSUE_TYPE" )] public string IssueType { get; set; } /// <summary> /// 供应类型 C采购 Z自制 W委外 ///</summary> [SugarColumn(ColumnName="SUPPLY_TYPE" )] public string SupplyType { get; set; } /// <summary> /// 分子 ///</summary> [SugarColumn(ColumnName="NUMERATOR" )] public decimal? Numerator { get; set; } /// <summary> /// 分母 ///</summary> [SugarColumn(ColumnName="DENOMINATOR" )] public decimal? Denominator { get; set; } /// <summary> /// 固定损耗 ///</summary> [SugarColumn(ColumnName="SCRAPQTY" )] public decimal? Scrapqty { get; set; } /// <summary> /// 变动损耗率 ///</summary> [SugarColumn(ColumnName="SCRAPRATE" )] public decimal? Scraprate { get; set; } /// <summary> /// 销售订单号 ///</summary> [SugarColumn(ColumnName="SALES_ORDER" )] public string SalesOrder { get; set; } /// <summary> /// 需求单据 ///</summary> [SugarColumn(ColumnName="F_WWC_TEXT1" )] public string FWwcText1 { get; set; } /// <summary> /// 计划完工日期 ///</summary> [SugarColumn(ColumnName="F_WWC_DATE" )] public DateTime? FWwcDate { get; set; } /// <summary> /// 旧物料编码 ///</summary> [SugarColumn(ColumnName="F_WWC_BASEPROPERTY" )] public string FWwcBaseproperty { get; set; } /// <summary> /// 使用比例 ///</summary> [SugarColumn(ColumnName="FUSERATE" )] public decimal? Fuserate { get; set; } /// <summary> /// 子项类型 1标准件 2返还件 3替代件 ///</summary> [SugarColumn(ColumnName="FMATERIALTYPE" )] public decimal? Fmaterialtype { get; set; } /// <summary> /// 子项单位 ///</summary> [SugarColumn(ColumnName="FUNITID3" )] public string Funitid3 { get; set; } /// <summary> /// 子项单位 ///</summary> [SugarColumn(ColumnName="FUNITID2" )] public string Funitid2 { get; set; } /// <summary> /// 生产通知单 ///</summary> [SugarColumn(ColumnName="F_XIFG_BASE_RE5" )] public string FXifgBaseRe5 { get; set; } /// <summary> /// 货主类型 ///</summary> [SugarColumn(ColumnName="FOWNERTYPEID" )] public string Fownertypeid { get; set; } /// <summary> /// ERP生产订单分录内码 -- 委外新增 ///</summary> [SugarColumn(ColumnName="ERP_PRODUCTION_ENTRY_CODE" )] public string ErpProductionEntryCode { get; set; } /// <summary> /// 用料清单备注 -- 委外新增 ///</summary> [SugarColumn(ColumnName="FMEMO" )] public string Fmemo { get; set; } /// <summary> /// 预留类型 -- 委外新增 ///</summary> [SugarColumn(ColumnName="FRESERVETYPE" )] public string Freservetype { get; set; } /// <summary> /// 需求日期 -- 委外新增 ///</summary> [SugarColumn(ColumnName="FNEEDDATE" )] public DateTime? Fneeddate { get; set; } /// <summary> /// 库存状态 -- 委外新增 ///</summary> [SugarColumn(ColumnName="FSTOCKSTATUSID" )] public string Fstockstatusid { get; set; } /// <summary> /// 拨出仓库 -- 委外新增 ///</summary> [SugarColumn(ColumnName="FSRCTRANSSTOCKID" )] public string Fsrctransstockid { get; set; } /// <summary> /// 拨出组织 -- 委外新增 ///</summary> [SugarColumn(ColumnName="FSRCTRANSORGID" )] public string Fsrctransorgid { get; set; } /// <summary> /// 是否关键件 -- 委外新增 ///</summary> [SugarColumn(ColumnName="FISKEYCOMPONENT" )] public string Fiskeycomponent { get; set; } /// <summary> /// 是否发损耗 -- 委外新增 ///</summary> [SugarColumn(ColumnName="FISGETSCRAP" )] public string Fisgetscrap { get; set; } /// <summary> /// 状态 ///</summary> [SugarColumn(ColumnName="WR_F_XIFG_BASE_83G" )] public string WrFXifgBase83g { get; set; } /// <summary> /// 状态 ///</summary> [SugarColumn(ColumnName="WR_F_XIFG_BASE_QTR" )] public string WrFXifgBaseQtr { get; set; } /// <summary> /// 状态 ///</summary> [SugarColumn(ColumnName="TYPEB" )] public string Typeb { get; set; } /// <summary> /// 子项类型 1标准件 2返还件 3替代件 ///</summary> [SugarColumn(ColumnName="MATERIAL_TYPE" )] public string MaterialType { get; set; } /// <summary> /// 使用比例（%） ///</summary> [SugarColumn(ColumnName="USE_RATE" )] public decimal? UseRate { get; set; } /// <summary> /// 项次号 ///</summary> [SugarColumn(ColumnName="FREPLACEGROUP" )] public decimal? Freplacegroup { get; set; } /// <summary> /// 应发数量 ///</summary> [SugarColumn(ColumnName="MUST_QTY" )] public decimal? MustQty { get; set; } /// <summary> /// 未领数 ///</summary> [SugarColumn(ColumnName="WLSL" )] public string Wlsl { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERPID")] public decimal? Erpid { get; set; } /// <summary> /// 客户物料代码 ///</summary> [SugarColumn(ColumnName = "KHWLBM")] public string Khwlbm { get; set; } /// <summary> /// 单号 /// </summary> [SugarColumn(ColumnName = "CAB001")] public string? Cab001 { get; set; } /// <summary> /// 客户物料名称 ///</summary> [SugarColumn(ColumnName = "KHWLMC")] public string Khwlmc { get; set; } /// <summary> /// 序号 /// </summary> [SugarColumn(ColumnName = "CAB002")] public string? Cab002 { get; set; } /// <summary> /// 需求组织 ///</summary> [SugarColumn(ColumnName = "XQZZ")] public string Xqzz { get; set; } /// <summary> /// 材料编码 /// </summary> [SugarColumn(ColumnName = "CAB003")] public string? Cab003 { get; set; } /// <summary> /// 需领用量 /// </summary> [SugarColumn(ColumnName = "CAB006")] public decimal? Cab006 { get; set; } /// <summary> /// 已领用量 /// </summary> [SugarColumn(ColumnName = "CAB007")] public decimal? Cab007 { get; set; } /// <summary> /// 工艺 /// </summary> [SugarColumn(ColumnName = "CAB008")] public string? Cab008 { get; set; } /// <summary> /// 单位 /// </summary> [SugarColumn(ColumnName = "CAB009")] public string? Cab009 { get; set; } /// <summary> /// 组成用量 /// </summary> [SugarColumn(ColumnName = "CAB012")] public decimal? Cab012 { get; set; } /// <summary> /// 是否替料 /// </summary> [SugarColumn(ColumnName = "CAB014")] public string? Cab014 { get; set; } /// <summary> /// PID /// </summary> [SugarColumn(ColumnName = "PID")] public decimal? Pid { get; set; } /// <summary> /// ERP头ID /// </summary> [SugarColumn(ColumnName = "EID")] public decimal? Eid { get; set; } /// <summary> /// 位置号 /// </summary> [SugarColumn(ColumnName = "POSITION_NO")] public string? PositionNo { get; set; } /// <summary> /// 发料组织 /// </summary> [SugarColumn(ColumnName = "ISSUING_ORGANIZATION")] public string? IssuingOrganization { get; set; } /// <summary> /// 供应组织 /// </summary> [SugarColumn(ColumnName = "SUPPLY_ORGANIZATION")] public string? SupplyOrganization { get; set; } /// <summary> /// 货主 /// </summary> [SugarColumn(ColumnName = "OWNER_ID")] public string? OwnerId { get; set; } /// <summary> /// 计划跟踪号 /// </summary> [SugarColumn(ColumnName = "MTONO")] public string? Mtono { get; set; } /// <summary> /// 批号 /// </summary> [SugarColumn(ColumnName = "LOT")] public string? Lot { get; set; } /// <summary> /// 仓库 /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string? DepotCode { get; set; } /// <summary> /// 发料方式 /// </summary> [SugarColumn(ColumnName = "ISSUE_TYPE")] public string? IssueType { get; set; } /// <summary> /// 供应类型 /// </summary> [SugarColumn(ColumnName = "SUPPLY_TYPE")] public string? SupplyType { get; set; } /// <summary> /// 分子 /// </summary> [SugarColumn(ColumnName = "NUMERATOR")] public decimal? Numerator { get; set; } /// <summary> /// 分母 /// </summary> [SugarColumn(ColumnName = "DENOMINATOR")] public decimal? Denominator { get; set; } /// <summary> /// 固定损耗 /// </summary> [SugarColumn(ColumnName = "SCRAPQTY")] public decimal? SCRAPQTY { get; set; } /// <summary> /// 变动损耗率 /// </summary> [SugarColumn(ColumnName = "SCRAPRATE")] public decimal? SCRAPRATE { get; set; } /// <summary> /// 应发数量 /// </summary> [SugarColumn(ColumnName = "Must_Qty")] public decimal? MustQty { get; set; } /// <summary> /// 项次号 /// </summary> [SugarColumn(ColumnName = "FREPLACEGROUP")] public int? Freplacegroup { get; set; } /// <summary> /// 使用比例（%） /// </summary> [SugarColumn(ColumnName = "USE_RATE")] public decimal? UseRate { get; set; } /// <summary> /// 子项类型 1标准件 2返还件 3替代件 /// </summary> [SugarColumn(ColumnName = "MATERIAL_TYPE")] public string? MaterialType { get; set; } /// <summary> /// A，创建 B，审核中 C，已审核 D，重新审核 Z，暂存 /// </summary> [SugarColumn(ColumnName = "TYPEB")] public string? Typeb { get; set; } /// <summary> /// A，创建 B，审核中 C，已审核 D，重新审核 Z，暂存 /// </summary> [SugarColumn(ColumnName = "WR_F_XIFG_BASE_QTR")] public string? WR_F_XIFG_Base_qtr { get; set; } /// <summary> /// A，创建 B，审核中 C，已审核 D，重新审核 Z，暂存 /// </summary> [SugarColumn(ColumnName = "WR_F_XIFG_BASE_83G")] public string? WR_F_XIFG_Base_83g { get; set; } /////----委外新增 /// <summary> /// 是否发损耗 -- 委外新增 /// </summary> [SugarColumn(ColumnName = "FISGETSCRAP")] public string? Fisgetscrap { get; set; } /// <summary> /// 是否关键件 -- 委外新增 /// </summary> [SugarColumn(ColumnName = "FISKEYCOMPONENT")] public string? Fiskeycomponent { get; set; } /// <summary> /// 拨出组织 -- 委外新增 /// </summary> [SugarColumn(ColumnName = "FSRCTRANSORGID")] public string? Fsrctransorgid { get; set; } /// <summary> /// 拨出仓库 -- 委外新增 /// </summary> [SugarColumn(ColumnName = "FSRCTRANSSTOCKID")] public string? Fsrctransstockid { get; set; } /// <summary> /// 库存状态 -- 委外新增 /// </summary> [SugarColumn(ColumnName = "FSTOCKSTATUSID")] public string? Fstockstatusid { get; set; } /// <summary> /// 需求日期 -- 委外新增 /// </summary> [SugarColumn(ColumnName = "FNEEDDATE")] public DateTime? Fneeddate { get; set; } /// <summary> /// 预留类型 -- 委外新增 /// </summary> [SugarColumn(ColumnName = "FRESERVETYPE")] public string? Freservetype { get; set; } /// <summary> /// 用料清单备注 -- 委外新增 /// </summary> [SugarColumn(ColumnName = "FMEMO")] public string? Fmemo { get; set; } /// <summary> /// ERP生产订单分录内码 -- 委外新增 /// </summary> [SugarColumn(ColumnName = "ERP_PRODUCTION_ENTRY_CODE")] public string? ErpProductionEntryCode { get; set; } /// <summary> /// 货主类型 /// </summary> [SugarColumn(ColumnName = "FOWNERTYPEID")] public string? FOWNERTYPEID { get; set; } /// <summary> /// 生产通知单 /// </summary> [SugarColumn(ColumnName = "F_XIFG_BASE_RE5")] public string? F_XIFG_BASE_RE5 { get; set; } /// <summary> /// 子项单位 /// </summary> [SugarColumn(ColumnName = "FUNITID2")] public string? FUNITID2 { get; set; } /// <summary> /// 子项单位 /// </summary> [SugarColumn(ColumnName = "FUNITID3")] public string? FUNITID3 { get; set; } } /// <summary> /// 需求部门 ///</summary> [SugarColumn(ColumnName = "XQBM")] public string Xqbm { get; set; } /// <summary> /// 收料组织 ///</summary> [SugarColumn(ColumnName = "SLZZ")] public string Slzz { get; set; } /// <summary> /// 收料部门 ///</summary> [SugarColumn(ColumnName = "SLBM")] public string Slbm { get; set; } } } StandardInterface/MES.Service/service/BasicData/Production/ProductionOrderManager.cs
@@ -129,7 +129,7 @@ Caa011 = erpDto.FPlanFinishDate, //ParseDateTime(erpDto.FPlanFinishDate) ?? null, PLANCONFIRMATION = erpDto.PlanConfirmation, Planconfirmation = erpDto.PlanConfirmation, StockInlimith = erpDto .FStockInLimitH, //Convert.ToDecimal(erpDto.FStockInLimitH), @@ -141,36 +141,36 @@ Caa013 = erpDto.FBomId, //SalesOrderNo = erpDto.F_UNW_XSDDH, CreateType = erpDto.FCreateType, FSUBID = erpDto.FSUBID, FSUBBILLNOSEQ = erpDto.FSUBBILLNOSEQ, FSUBBILLNO = erpDto.FSUBBILLNO, Fsubid = erpDto.FSUBID, Fsubbillnoseq = erpDto.FSUBBILLNOSEQ, Fsubbillno = erpDto.FSUBBILLNO, SrcBillType = erpDto.FSrcBillType, SrcBillNo = erpDto.FSrcBillNo, SrcBillentryseq = erpDto.FSrcBillEntrySeq, FREQSRC = erpDto.FReqSrc, Freqsrc = erpDto.FReqSrc, SaleOrderNo = erpDto.FSALEORDERNO, SaleOrderEntryseq = erpDto.FSaleOrderEntrySeq, ForceCloserid = erpDto.FFORCECLOSERID, CloseType = erpDto.FCloseType, SrcSplitBillno = erpDto.FDescription, SRCSPLITSEQ = erpDto.SrcSplitSeq, Srcsplitseq = erpDto.SrcSplitSeq, Erpid = Convert.ToDecimal(erpDto.FID), FSUBENTRYID = erpDto.FSUBENTRYID, FPURORDERNO = erpDto.FPurOrderNo, FPURORDERENTRYSEQ = Fsubentryid = Convert.ToDecimal(erpDto.FSUBENTRYID), Fpurorderno = erpDto.FPurOrderNo, Fpurorderentryseq = erpDto .FPurOrderEntrySeq, //Convert.ToInt32(erpDto.FPurOrderEntrySeq), FBASESTOCKINQTY = Convert.ToDecimal(erpDto.FBaseStockInQty), FBASENOSTOCKINQTY = Convert.ToDecimal(erpDto.FBaseNoStockInQty), FINSTOCKOWNERID = erpDto.FInStockOwnerId, Fbasestockinqty = erpDto.FBaseStockInQty, Fbasenostockinqty = erpDto.FBaseNoStockInQty, Finstockownerid = erpDto.FInStockOwnerId, //PlanConfirmation = erpDto.PlanConfirmation != null // ? DateTime.ParseExact(erpDto.PlanConfirmation, // "yyyy-MM-dd HH:mm:ss", null) // : null, Typea = erpDto.TypeA, F_WWDD_SCTZD = erpDto.F_WWDD_SCTZD, F_WWDD_XH = erpDto.F_WWDD_XH, F_XIFG_TEXT_TZK = erpDto.F_XIFG_Text_tzk // F_WWDD_SCTZD = erpDto.F_WWDD_SCTZD, // F_WWDD_XH = erpDto.F_WWDD_XH, //F_XIFG_TEXT_TZK = erpDto.F_XIFG_Text_tzk }; var single = base.GetSingle(it => it.Erpid == entity.Erpid); @@ -209,8 +209,8 @@ Denominator = Convert.ToDecimal(erpDto.FDenominator), Erpid = Convert.ToDecimal(erpDto.FPPOMENTRYID), Eid = Convert.ToDecimal(erpDto.FPPOMID), SCRAPQTY = Convert.ToDecimal(erpDto.FFixScrapQty), SCRAPRATE = Convert.ToDecimal(erpDto.FScrapRate), Scrapqty = Convert.ToDecimal(erpDto.FFixScrapQty), Scraprate = Convert.ToDecimal(erpDto.FScrapRate), MaterialType = erpDto.FMaterialType, //Unit2 = erpDto.FUnitID3, Freplacegroup = Convert.ToInt32(erpDto.FReplaceGroup), @@ -230,10 +230,10 @@ Fmemo = erpDto.FMEMO, Typeb = erpDto.TypeB, ErpProductionEntryCode = erpDto.FSUBENTRYID, FOWNERTYPEID = erpDto.FOwnerTypeId, F_XIFG_BASE_RE5 = erpDto.F_XIFG_Base_re5, FUNITID2 = erpDto.FUnitID2, FUNITID3 = erpDto.FUnitID3 // FOWNERTYPEID = erpDto.FOwnerTypeId, // F_XIFG_BASE_RE5 = erpDto.F_XIFG_Base_re5, // FUNITID2 = erpDto.FUnitID2, //FUNITID3 = erpDto.FUnitID3 }; var single = StandardInterface/MES.Service/service/WomcaaManager.cs
@@ -154,7 +154,7 @@ var entity = new Womcaa { Erpid = Convert.ToInt32(dto.Id), /// ERPID Caa001 = dto.ppbombillno, /// 单号 Caa001 = dto.FBillNo, /// 单号 Caa021 = dto.FWorkShopID, /// 工作车间 RoutingId = dto.FRoutingId, /// 工艺路线 WorkShopId = dto.FREMWorkShopId, /// 产线 @@ -177,7 +177,8 @@ Mtono = dto.FMTONO, /// 计划跟踪号 Lot = dto.FLot, /// 批号 Caa013 = dto.FBomId, /// BOM版次 Caa015 = dto.CAA015, //销售订单号 Caa015Head = dto.CAA015_line, //销售订单行号 CreateType = dto.FCreateType, /// 生成方式 Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID) ? Convert.ToInt32(dto.PLAN_ID) @@ -193,14 +194,16 @@ CloseType = dto.FCloseType, /// 结案类型 SrcSplitBillno = dto.FSrcSplitBillNo, /// 源拆分订单编号 Caa016 = dto.FDescription, /// 备注 BTBZ = dto.BTBZ, /// 备注 Btbz = dto.BTBZ, /// 备注 PrdOrg = dto.FPrdOrgId, /// 生产组织ID TrustOrg = dto.FEnTrustOrgId, /// 委托组织ID Typea = dto.TypeA, /// 单据状态 RkOrg = dto.RK_ORG, //入库组织 Rcn=dto.RCN, //日产能 //沃尔新增 WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD // WR_F_SCDD_SCTZD = dto.F_SCDD_SCTZD //WR_F_SCDD_XH = dto.F_SCDD_XH }; @@ -220,35 +223,42 @@ var womcab = new Womcab { Erpid = Convert.ToDecimal(dto.ID), Cab001 = dto.FBillNo, Cab002 = dto.FSeq, Cab003 = dto.FMaterialID, Cab006 = Convert.ToDecimal(dto.FNeedQty), MustQty = Convert.ToDecimal(dto.FMustQty), Cab007 = Convert.ToDecimal(dto.FPickedQty), PositionNo = dto.FPositionNO, SupplyOrganization = dto.FChildSupplyOrgId, IssuingOrganization = dto.FSupplyOrg, OwnerId = dto.FOwnerID, Mtono = dto.FMTONO, Lot = dto.FLot, DepotCode = dto.FStockID, IssueType = dto.FIssueType, Cab009 = dto.FUnitID, SupplyType = dto.FSupplyType, Cab012 = Convert.ToDecimal(dto.FStdQty), Freplacegroup = Convert.ToInt32(dto.FReplaceGroup), UseRate = Convert.ToDecimal(dto.FUseRate), MaterialType = dto.FMaterialType, Cab014 = dto.FIsKeyItem, Numerator = Convert.ToDecimal(dto.FNumerator), Denominator = Convert.ToDecimal(dto.FDenominator), Cab001 = dto.FBillNo, //单据编号 Cab002 = dto.FSeq, //序号 Cab003 = dto.FMaterialID, //子项物料编码 Cab006 = Convert.ToDecimal(dto.FNeedQty), //需求数量 MustQty = Convert.ToDecimal(dto.FMustQty), //应发数量 Cab007 = Convert.ToDecimal(dto.FPickedQty), //已领数量 PositionNo = dto.FPositionNO, //位置号 SupplyOrganization = dto.FChildSupplyOrgId, //供应组织 IssuingOrganization = dto.FSupplyOrg, //发料组织 OwnerId = dto.FOwnerID, //货主 Mtono = dto.FMTONO, //计划跟踪号 Lot = dto.FLot, //批号 DepotCode = dto.FStockID, //仓库 IssueType = dto.FIssueType, //发料方式 Cab009 = dto.FUnitID, //单位 SupplyType = dto.FSupplyType, //供应类型 Cab012 = Convert.ToDecimal(dto.FStdQty), // 标准用量 // Freplacegroup = Convert.ToInt32(dto.FReplaceGroup), UseRate = Convert.ToDecimal(dto.FUseRate), //使用比例 MaterialType = dto.FMaterialType, //子项类型 Cab014 = Convert.ToInt32(dto.FIsKeyItem), //替代主料 Numerator = Convert.ToDecimal(dto.FNumerator), //分子 Denominator = Convert.ToDecimal(dto.FDenominator), //分母 Pid = Convert.ToDecimal(dto.PID), Eid = Convert.ToDecimal(dto.PID), SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty), SCRAPRATE = Convert.ToDecimal(dto.FScrapRate), Typeb = dto.TypeB, WR_F_XIFG_Base_qtr = dto.F_XIFG_Base_qtr Scrapqty = Convert.ToDecimal(dto.FFixScrapQty), //固定损耗 Scraprate = Convert.ToDecimal(dto.FScrapRate), //变动损耗率 Wlsl=dto.WLSL, Khwlbm=dto.KWWLBM, Khwlmc =dto.KHWLMC, Slzz=dto.SLZZ, Slbm=dto.SLBM, Xqbm=dto.XQBM, Xqzz=dto.XQZZ, // Typeb = dto.TypeB, // WR_F_XIFG_Base_qtr = dto.F_XIFG_Base_qtr //WR_F_XIFG_Base_83g = dto.F_XIFG_Base_83g };
@@ -122,7 +122,7 @@ //PrdOrg = dto.erP_SCZZ, //TrustOrg = dto.erP_WTZZ, TbTime = DateTime.Now, JaBs = "0" JaBs = 0 }; if (dto.Type == "5") entity.IsXg = 1; @@ -131,7 +131,7 @@ if (dto.FStatus == "6" || dto.FStatus == "7") { entity.JaBs = "1"; entity.JaBs =1; entity.JaTime = DateTime.Now; } @@ -156,7 +156,7 @@ Cab006 = Convert.ToDecimal(dto.FNeedQty), Cab007 = Convert.ToDecimal(dto.FPickedQty), Cab009 = dto.FUnitID, Cab014 = dto.FIsKeyItem, Cab014 = Convert.ToInt32(dto.FIsKeyItem), Pid = Convert.ToDecimal(dto.PID), Eid = Convert.ToDecimal(dto.PID), PositionNo = dto.FPositionNO, @@ -170,8 +170,8 @@ SupplyType = dto.FSupplyType, Numerator = Convert.ToDecimal(dto.FNumerator), Denominator = Convert.ToDecimal(dto.FDenominator), SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty), SCRAPRATE = Convert.ToDecimal(dto.FScrapRate) Scrapqty = Convert.ToDecimal(dto.FFixScrapQty), Scraprate = Convert.ToDecimal(dto.FScrapRate) //SalesOrder = dto.FXSHTBH, };
