| MES.Service/Dto/webApi/ErpRohIn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Dto/webApi/ErpRohinData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Modes/MesRohIn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Modes/MesRohInData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/service/BasicData/MesRohInManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
MES.Service/Dto/webApi/ErpRohIn.cs
@@ -3,10 +3,10 @@ public class ErpRohIn { 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? Type { get; set; } public string? FBusinessType { get; set; } public string? FDate { get; set; } public string? FSupplierId { get; set; } @@ -14,25 +14,11 @@ public string? FPurchaseOrgId { get; set; } public string? FPurchaseDeptId { get; set; } public string? FPurchaserGroupId { get; set; } public string? Facctype { get; set; } public string? FPurchaserId { get; set; } // public string? F_UNW_Remarks_zlyq { get; set; } // public string? F_UNW_GYSLXR { get; set; } // public string? F_UNW_LXRDH { get; set; } // public string? FProviderJob { get; set; } // public string? FProviderPhone { get; set; } // public string? FProviderAddress { get; set; } public string? FSettleId { get; set; } public string? FChargeId { get; set; } // public string? FProviderEMail { get; set; } // public string? F_UNW_Text_ysfs { get; set; } public string? FProviderEMail { get; set; } public string? F_XIFG_Text_qtr1 { get; set; } // public string? F_UNW_Combo_zjmj { get; set; } public string? FCancelStatus { get; set; } public string? FCancellerId { get; set; } public string? FCancelDate { get; set; } @@ -42,12 +28,8 @@ public string? FModifyDate { get; set; } public string? FApproverId { get; set; } public string? FApproveDate { get; set; } public string? FCHANGEREASON { get; set; } //采购订单A 采购订单变更单B //public string? FBILLTYPE { get; set; } public string? FChangeReason { get; set; } public string? FPREARRIVALDATE { get; set; } public string? FRECEIVEORGID { get; set; } public string? FReceiveOrgId { get; set; } public string? F_XIFG_PrintTimes_qtr { get; set; } } MES.Service/Dto/webApi/ErpRohinData.cs
@@ -5,12 +5,15 @@ public string id { get; set; } public string Eid { get; set; } public string? FBillNo { get; set; } public string? FDEMANDBILLNO { get; set; } public string? FSEQ { get; set; } public string? F_XIFG_Text_k79 { 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; } @@ -18,9 +21,9 @@ public string? FRequireDeptId { get; set; } public string? FReceiveOrgId { get; set; } public string? FReceiveDeptId { get; set; } public string? FSETTLEORGID { get; set; } public string? FEntrySettleOrgId { get; set; } public string? FGiveAway { get; set; } public string? Fnote { get; set; } public string? FEntryNote { get; set; } public string? FSupMatId { get; set; } public string? FSupMatName { get; set; } public string? FSUBREQBILLNO { get; set; } @@ -32,33 +35,24 @@ public string? FMRPTerminateStatus { get; set; } public string? FTerminaterId { get; set; } public string? FTerminateDate { get; set; } public string? FEntrySettleOrgId { get; set; } public string? FBASERECEIVEQTY { get; set; } public string? FRemainReceiveQty { get; set; } public string? FReceiveQty { get; set; } //累计收料 public string? FBASESTOCKINQTY { get; set; } public string? FRemainStockINQty { get; set; } public string? FMrbQty { get; set; } public string? FStockInQty { get; set; } //累计入库数 public string? FCHECKRETQTY { get; set; } //收料可退数 public string? FSTOCKRETQTY { get; set; } //库存可退数 public string? FBASECHECKRETQTY { get; set; } public string? FBASESTOCKRETQTY { get; set; } public string? FSrcBillTypeId { get; set; } public string? FSrcBillNo { get; set; } public string? FSourceBillNo { get; set; } public string? FReqTraceNo { get; set; } public string? FMtoNo { get; set; } public string? FChangeFlag { get; set; } public string? FDEMANDTYPE { get; set; } //public string? FDEMANDBILLNO { get; set; } public string? FDEMANDBILLNO { get; set; } public string? FDEMANDBILLENTRYSEQ { get; set; } // public string? fentryid { get; set; } public string? F_XIFG_Text_k79 { get; set; } public string? FPREARRIVALDATE { get; set; } public string? F_XIFG_Text_ne1 { get; set; } public string? F_XIFG_Text_6oq { get; set; } public string? F_XIFG_Base_c1c { get; set; } public string? F_XIFG_Text_qtr4 { get; set; } public string? FdemandbillnoLine { get; set; } public string? ElectricalProductModel { get; set; } public string? ElectricalProductName { get; set; } } MES.Service/Modes/MesRohIn.cs
@@ -9,11 +9,17 @@ public class MesRohIn { /// <summary> /// 主键 /// 默认值: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// SEQ_BASEINFO_ID /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BASEINFO_ID", IsPrimaryKey = true)] public decimal Id { get; set; } [SugarColumn(ColumnName = "ID")] public long Id { get; set; } /// <summary> /// 采购单号 @@ -87,6 +93,11 @@ [SugarColumn(ColumnName = "PURCHASER")] public string? Purchaser { get; set; } /// <summary> /// 质量要求 /// </summary> [SugarColumn(ColumnName = "QUALITY_REQ")] public string? QualityReq { get; set; } /// <summary> /// 结算方 @@ -100,6 +111,17 @@ [SugarColumn(ColumnName = "PAYMENT_PARTY")] public string? PaymentParty { get; set; } /// <summary> /// 邮箱 /// </summary> [SugarColumn(ColumnName = "EMAIL")] public string? Email { get; set; } /// <summary> /// 运输方式 /// </summary> [SugarColumn(ColumnName = "TRANSPORT_METHOD")] public string? TransportMethod { get; set; } /// <summary> /// 备注 @@ -107,6 +129,11 @@ [SugarColumn(ColumnName = "REMARKS")] public string? Remarks { get; set; } /// <summary> /// 治具丶模具加工及采购 /// </summary> [SugarColumn(ColumnName = "FIXTURE_MOLD_PROCUREMENT")] public string? FixtureMoldProcurement { get; set; } /// <summary> /// 作废状态 @@ -127,33 +154,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; } @@ -162,29 +193,90 @@ /// ERP的ID号 /// </summary> [SugarColumn(ColumnName = "EBELN_K3ID")] public decimal? EbelnK3id { get; set; } public long? EbelnK3id { get; set; } /// <summary> /// 变更原因 /// 审核日期 /// </summary> [SugarColumn(ColumnName = "changereason")] public string? Changereason { get; set; } [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// 到货日期 /// 审核人 /// </summary> [SugarColumn(ColumnName = "FPREARRIVALDATE")] public DateTime? FPREARRIVALDATE { get; set; } [SugarColumn(ColumnName = "CHECK_BY")] public string? CheckBy { get; set; } /// <summary> /// 收料组织 /// 审核标识 /// 默认值: ((0)) /// </summary> [SugarColumn(ColumnName = "FRECEIVEORGID")] public string? FRECEIVEORGID { get; set; } [SugarColumn(ColumnName = "CHECK_FALG")] public bool? CheckFalg { get; set; } /// <summary> /// 打印次数 /// </summary> [SugarColumn(ColumnName = "remark1")] public string? remark1 { get; set; } [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; } /// <summary> /// 变更原因 /// </summary> [SugarColumn(ColumnName = "CHANGEREASON")] public string? Changereason { get; set; } /// <summary> /// 工厂 /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// 公司编号 /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// 邮箱 /// </summary> [SugarColumn(ColumnName = "EMAIL")] public string? Emall { get; set; } /// <summary> /// 到货日期 /// </summary> [SugarColumn(ColumnName = "Prearrivaldate")] public DateTime? Prearrivaldate { get; set; } /// <summary> /// 收料组织 /// </summary> [SugarColumn(ColumnName = "ReceiveOrgId")] public string? ReceiveOrgId { get; set; } } MES.Service/Modes/MesRohInData.cs
@@ -9,6 +9,13 @@ public class MesRohInData { /// <summary> /// 主键 /// 默认值: (newid()) /// </summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] public Guid Guid { get; set; } /// <summary> /// 采购单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] @@ -32,7 +39,6 @@ [SugarColumn(ColumnName = "ITEM_ID")] public string? ItemId { get; set; } /// <summary> /// 采购单位 /// </summary> @@ -51,6 +57,17 @@ [SugarColumn(ColumnName = "INVENTORY_UNIT")] public string? InventoryUnit { get; set; } /// <summary> /// 计价单位 /// </summary> [SugarColumn(ColumnName = "PRICING_UNIT")] public string? PricingUnit { get; set; } /// <summary> /// 计价数量 /// </summary> [SugarColumn(ColumnName = "PRICING_QTY")] public decimal? PricingQty { get; set; } /// <summary> /// 交货日期 @@ -113,25 +130,25 @@ public string? SupplierItemName { get; set; } /// <summary> /// 委外订单编号 /// 委外订单号 /// </summary> [SugarColumn(ColumnName = "OUTSOURCING_ORDER_ID")] public string? OutsourcingOrderId { get; set; } /// <summary> /// 批号 /// 批次号 /// </summary> [SugarColumn(ColumnName = "BATCH_NUMBER")] public string? BatchNumber { get; set; } /// <summary> /// 业务关闭 A:正常，B:业务终止 /// 业务关闭标识 /// </summary> [SugarColumn(ColumnName = "BUSINESS_CLOSE")] public string? BusinessClose { get; set; } /// <summary> /// 业务冻结 A:正常，B:业务终止 /// 业务冻结标识 /// </summary> [SugarColumn(ColumnName = "BUSINESS_FREEZE")] public string? BusinessFreeze { get; set; } @@ -149,7 +166,7 @@ public DateTime? FreezeTime { get; set; } /// <summary> /// 业务终止 /// 业务终止标识 /// </summary> [SugarColumn(ColumnName = "BUSINESS_TERMINATE")] public string? BusinessTerminate { get; set; } @@ -167,19 +184,19 @@ public DateTime? TerminateTime { get; set; } /// <summary> /// 累计收料数量 /// 总已收数量 /// </summary> [SugarColumn(ColumnName = "TOTAL_RECEIVED_QTY")] public decimal? TotalReceivedQty { get; set; } /// <summary> /// 剩余收料数量 /// 剩余收货数量 /// </summary> [SugarColumn(ColumnName = "REMAINING_RECEIVED_QTY")] public decimal? RemainingReceivedQty { get; set; } /// <summary> /// 累计入库数量 /// 总已入库数量 /// </summary> [SugarColumn(ColumnName = "TOTAL_STORED_QTY")] public decimal? TotalStoredQty { get; set; } @@ -191,31 +208,31 @@ public decimal? RemainingStoredQty { get; set; } /// <summary> /// 累计退料数量 /// 总退货数量 /// </summary> [SugarColumn(ColumnName = "TOTAL_RETURNED_QTY")] public decimal? TotalReturnedQty { get; set; } /// <summary> /// 收料可退数量 /// 可退收货数量 /// </summary> [SugarColumn(ColumnName = "RETURNABLE_RECEIVED_QTY")] public decimal? ReturnableReceivedQty { get; set; } /// <summary> /// 库存可退数量 /// 可退入库数量 /// </summary> [SugarColumn(ColumnName = "RETURNABLE_STORED_QTY")] public decimal? ReturnableStoredQty { get; set; } /// <summary> /// 源单类型 /// 来源单据类型 /// </summary> [SugarColumn(ColumnName = "SOURCE_DOCUMENT_TYPE")] public string? SourceDocumentType { get; set; } /// <summary> /// 源单单号 /// 来源单据号 /// </summary> [SugarColumn(ColumnName = "SOURCE_DOCUMENT_ID")] public string? SourceDocumentId { get; set; } @@ -233,7 +250,7 @@ public string? PlanTrackingId { get; set; } /// <summary> /// 变更标志 /// 变更标识 /// </summary> [SugarColumn(ColumnName = "CHANGE_FLAG")] public string? ChangeFlag { get; set; } @@ -245,7 +262,7 @@ public string? DemandSource { get; set; } /// <summary> /// 需求单据编号 /// 需求单据号 /// </summary> [SugarColumn(ColumnName = "DEMAND_DOCUMENT_ID")] public string? DemandDocumentId { get; set; } @@ -257,20 +274,49 @@ public string? DemandDocumentLineId { get; set; } /// <summary> /// ERP的ID号 /// 采购订单行号（K3系统） /// </summary> [SugarColumn(ColumnName = "EBELN_K3ID")] public decimal? EbelnK3id { get; set; } /// <summary> /// SEQ_BASEINFO_ID /// 备注1 /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BASEINFO_ID", IsPrimaryKey = true)] public decimal Id { get; set; } [SugarColumn(ColumnName = "REMARK1")] public string? Remark1 { get; set; } /// <summary> /// ERP头ID /// 备注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; } /// <summary> /// 主键ID /// </summary> [SugarColumn(ColumnName = "ID")] public int Id { get; set; } /// <summary> /// ERP系统中的ID /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public decimal? ErpId { get; set; } @@ -278,26 +324,45 @@ /// <summary> /// 采购订单行号 /// </summary> [SugarColumn(ColumnName = "purchase_order_line_number")] [SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")] public string? PurchaseOrderLineNumber { get; set; } /// <summary> /// 需求组织 /// 需求组织（扩展） /// </summary> [SugarColumn(ColumnName = "DEMAND")] public string? Demand { get; set; } /// <summary> /// 收料组织 /// 收料组织（扩展） /// </summary> [SugarColumn(ColumnName = "RECEIVING")] public string? Receiving { get; set; } /// <summary> /// 结算组织 /// 结算组织（扩展） /// </summary> [SugarColumn(ColumnName = "SETTLEMENT")] public string? Settlement { get; set; } /// <summary> /// 预留字段CGB014 /// 默认值: ((0)) /// </summary> [SugarColumn(ColumnName = "CGB014")] public decimal? Cgb014 { get; set; } /// <summary> /// 工厂 /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// 公司编号 /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// 需求部门 @@ -314,48 +379,6 @@ /// <summary> /// 预计到货时间 /// </summary> [SugarColumn(ColumnName = "FPREARRIVALDATE")] public DateTime? FPREARRIVALDATE { get; set; } /// <summary> /// 客户货号 /// </summary> [SugarColumn(ColumnName = "REMARK1")] public string? Remark1 { get; set; } /// <summary> /// 包装单号 /// </summary> [SugarColumn(ColumnName = "REMARK2")] public string? Remark2 { get; set; } /// <summary> /// 主产品 /// </summary> [SugarColumn(ColumnName = "REMARK3")] public string? Remark3 { get; set; } /// <summary> /// SMT备注 /// </summary> [SugarColumn(ColumnName = "REMARK4")] public string? Remark4 { get; set; } /// <summary> /// 销售订单行号 /// </summary> [SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")] public string? FdemandbillnoLine { get; set; } /// <summary> /// 电气成品型号 /// </summary> [SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_MODEL")] public string? ElectricalProductModel { get; set; } /// <summary> /// 电气成品名称 /// </summary> [SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_NAME")] public string? ElectricalProductName { get; set; } [SugarColumn(ColumnName = "prearrivaldate")] public DateTime? prearrivaldate { get; set; } } MES.Service/service/BasicData/MesRohInManager.cs
@@ -14,7 +14,8 @@ { var rohInErpRohIn = rohIn.ErpRohIn; var mesRohIn = GetMesRohIn(rohInErpRohIn); var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type); var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type); return UseTransaction(db => { @@ -23,7 +24,9 @@ case "2": case "4": case "5": return SaveOrUpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0; return SaveOrUpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0; case "3": return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0; default: @@ -115,9 +118,9 @@ } // 将 ErpRohIn 对象转换为 MesRohIn 对象的方法 public MesRohIn GetMesRohIn(ErpRohIn rohIn) private MesRohIn GetMesRohIn(ErpRohIn rohIn) { var eid = Convert.ToDecimal(rohIn.id); var eid = long.Parse(rohIn.id); var mesRohIn = new MesRohIn(); var single = base.GetSingle(it => it.EbelnK3id == eid); @@ -138,15 +141,11 @@ mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId; mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId; mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId; mesRohIn.QtyAcceptance = rohIn.Facctype; mesRohIn.Purchaser = rohIn.FPurchaserId; //mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq; mesRohIn.SettlementParty = rohIn.FSettleId; mesRohIn.PaymentParty = rohIn.FChargeId; // mesRohIn.Email = rohIn.FProviderEMail; // mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs; mesRohIn.Emall = rohIn.FProviderEMail; mesRohIn.Remarks = rohIn.F_XIFG_Text_qtr1; // mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj; mesRohIn.CancellationStatus = rohIn.FCancelStatus; mesRohIn.CancellationPerson = rohIn.FCancellerId; @@ -169,21 +168,21 @@ mesRohIn.ErpCheckBy = rohIn.FApproverId; mesRohIn.ErpCheckDate = rohIn.FApproveDate; mesRohIn.Changereason = rohIn.FCHANGEREASON; mesRohIn.FPREARRIVALDATE = rohIn.FPREARRIVALDATE != null mesRohIn.Changereason = rohIn.FChangeReason; mesRohIn.Prearrivaldate = rohIn.FPREARRIVALDATE != null ? DateTime.ParseExact(rohIn.FPREARRIVALDATE, "yyyy-MM-dd HH:mm:ss", null) : null; mesRohIn.FRECEIVEORGID = rohIn.FRECEIVEORGID; mesRohIn.ReceiveOrgId = rohIn.FReceiveOrgId; mesRohIn.remark1 = rohIn.F_XIFG_PrintTimes_qtr; mesRohIn.Remark1 = rohIn.F_XIFG_PrintTimes_qtr; return mesRohIn; } // 将 ErpRohinData 对象转换为 MesRohInData 对象的方法 public List<MesRohInData> GetMesRohInDatas( private List<MesRohInData> GetMesRohInDatas( List<ErpRohinData> erpRohinDatas, string type) { return erpRohinDatas.Select(s => @@ -194,11 +193,13 @@ ErpId = Convert.ToDecimal(s.Eid), BillNo = s.FBillNo, SalesOrderId = s.F_XIFG_Text_k79, OrderLineId = s.FSEQ, 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) @@ -211,8 +212,13 @@ ? DateTime.ParseExact(s.FDeliveryLastDate, "yyyy-MM-dd HH:mm:ss", null) : null, DemandOrg = s.FRequireOrgId, DemandDepartment = s.FRequireDeptId, ReceivingOrg = s.FReceiveOrgId, ReceivingDepartment = s.FReceiveDeptId, SettlementOrg = s.FEntrySettleOrgId, IsGift = s.FGiveAway, Remarks = s.Fnote, Remarks = s.FEntryNote, SupplierItemCode = s.FSupMatId, SupplierItemName = s.FSupMatName, OutsourcingOrderId = s.FSUBREQBILLNO, @@ -230,32 +236,25 @@ ? DateTime.ParseExact(s.FTerminateDate, "yyyy-MM-dd HH:mm:ss", null) : null, TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), //累计收料数 TotalReceivedQty = Convert.ToDecimal(s.FBASERECEIVEQTY), //累计收料数 RemainingReceivedQty = Convert.ToDecimal(s.FRemainReceiveQty), TotalStoredQty = Convert.ToDecimal(s.FStockInQty), //累计入库数 TotalStoredQty = Convert.ToDecimal(s.FBASESTOCKINQTY), //累计入库数 RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty), TotalReturnedQty = Convert.ToDecimal(s.FMrbQty), ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY), //收料可退数 ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), //库存可退数 ReturnableReceivedQty = Convert.ToDecimal(s.FBASECHECKRETQTY), //收料可退数 ReturnableStoredQty = Convert.ToDecimal(s.FBASESTOCKRETQTY), //库存可退数 SourceDocumentType = s.FSrcBillTypeId, SourceDocumentId = s.FSrcBillNo, SourceDocumentId = s.FSourceBillNo, DemandTrackingId = s.FReqTraceNo, PlanTrackingId = s.FMtoNo, ChangeFlag = s.FChangeFlag, DemandSource = s.FDEMANDTYPE, DemandDocumentId = s.FDEMANDBILLNO, DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ, DemandOrg = s.FRequireOrgId, ReceivingOrg = s.FReceiveOrgId, SettlementOrg = s.FEntrySettleOrgId, PurchaseOrderLineNumber = s.FSEQ, Demand = s.FRequireOrgId, Receiving = s.FReceiveOrgId, Settlement = s.FSETTLEORGID, DemandDepartment = s.FRequireDeptId, ReceivingDepartment = s.FReceiveDeptId, FPREARRIVALDATE = s.FPREARRIVALDATE != null prearrivaldate = s.FTerminateDate != null ? DateTime.ParseExact(s.FPREARRIVALDATE, "yyyy-MM-dd HH:mm:ss", null) : null, @@ -263,9 +262,6 @@ Remark2 = s.F_XIFG_Text_6oq, Remark3 = s.F_XIFG_Base_c1c, Remark4 = s.F_XIFG_Text_qtr4, FdemandbillnoLine = s.FdemandbillnoLine, ElectricalProductModel = s.ElectricalProductModel, ElectricalProductName = s.ElectricalProductName }; var single = rohInDataManager.GetSingle(it =>
