| entity/MesInvItemArn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| entity/MesInvItemBarcodes.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| entity/MesInvItemInCDetails.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| entity/MesInvItemIns.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| entity/MesRohIn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| entity/MesRohInData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| entity/TransferOut.cs | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| service/Warehouse/MesInvItemInCDetailsManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
entity/MesInvItemArn.cs
@@ -241,6 +241,12 @@ /// </summary> [SugarColumn(ColumnName = "organize_code")] public string? OrganizeCode { get; set; } /// <summary> /// 收料组织 ///</summary> [SugarColumn(ColumnName = "ReceiveOrgId")] public string? ReceiveOrgId { get; set; } [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; }
@@ -493,14 +493,20 @@ public long? GxId { get; set; } /// <summary> /// 供应商id /// </summary> [SugarColumn(ColumnName = "supp_id")] public string? SuppId { get; set; } /// <summary> /// 临时批量guid /// </summary> [SugarColumn(ColumnName = "tmpGuid")] public Guid? TmpGuid { get; set; } /// <summary> /// 供应商id /// 关联表的guid /// </summary> [SugarColumn(ColumnName = "supp_id")] public string? SuppId { get; set; } [SugarColumn(ColumnName = "ABOUT_GUID")] public Guid? AboutGuid { get; set; } } entity/MesInvItemInCDetails.cs
@@ -18,7 +18,7 @@ /// 入库单id /// </summary> [SugarColumn(ColumnName = "ITEM_IN_ID")] public Guid ItemInId { get; set; } public Guid? ItemInId { get; set; } /// <summary> /// 物料条码PSN @@ -374,7 +374,16 @@ [SugarColumn(ColumnName = "ITEM_ID")] public long? ItemId { get; set; } [SugarColumn(ColumnName = "SUPP_ID")] public string? SuppId { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "SUPP_ID")] public string? SuppId { get; set; } /// <summary> /// 收料组织 /// </summary> [SugarColumn(ColumnName = "ReceiveOrgId")] public string? ReceiveOrgId { get; set; } // 添加的字段，并且它们不属于数据库表 entity/MesInvItemIns.cs
@@ -101,51 +101,61 @@ public string? CheckUser { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string? TaskNo { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "INS_DATE")] public DateTime? InsDate { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "CHECK_RES")] public string? CheckRes { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "CHECK_QTY")] public long? CheckQty { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "MMLIST")] public string? Mmlist { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "EBELN")] public string? Ebeln { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "DEPOTS_CODE")] public string? DepotsCode { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "TRANSCTION_NO")] public string? TransctionNo { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string? SuppNo { get; set; } @@ -158,59 +168,70 @@ public byte? Fstatus { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// /// 默认值: ((0)) /// </summary> [SugarColumn(ColumnName = "SAPSTATUS")] public byte? Sapstatus { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "SAPNO")] public string? Sapno { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "SAPYEAR")] public short? Sapyear { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "SAPTEXT")] public string? Saptext { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "ISCHECK")] public byte? Ischeck { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "INSBY")] public string? Insby { get; set; } /// <summary> /// /// 默认值: ((0)) /// </summary> [SugarColumn(ColumnName = "IS_VISUAL")] public byte? IsVisual { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// /// 默认值: ((0)) /// </summary> [SugarColumn(ColumnName = "URGENT_FLAG")] public byte? UrgentFlag { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "LINE_NO")] public string? LineNo { get; set; } @@ -295,10 +316,17 @@ public string? Bgr { get; set; } /// <summary> /// /// </summary> [SugarColumn(ColumnName = "SUPP_ID")] public string? SuppId { get; set; } /// <summary> /// 收料组织 ///</summary> [SugarColumn(ColumnName = "ReceiveOrgId")] public string? ReceiveOrgId { get; set; } //在数据库查询时忽略这个字段 [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; } entity/MesRohIn.cs
@@ -19,25 +19,25 @@ /// 采购单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } public string? BillNo { get; set; } /// <summary> /// 单据状态 /// </summary> [SugarColumn(ColumnName = "DOCUMENT_STATUS")] public string DocumentStatus { get; set; } public string? DocumentStatus { get; set; } /// <summary> /// 单据类型 /// </summary> [SugarColumn(ColumnName = "DOCUMENT_TYPE")] public string DocumentType { get; set; } public string? DocumentType { get; set; } /// <summary> /// 业务类型 /// </summary> [SugarColumn(ColumnName = "BUSINESS_TYPE")] public string BusinessType { get; set; } public string? BusinessType { get; set; } /// <summary> /// 采购日期 @@ -49,97 +49,97 @@ /// 供应商 /// </summary> [SugarColumn(ColumnName = "SUPPLIER")] public string Supplier { get; set; } public string? Supplier { get; set; } /// <summary> /// 关闭状态 /// </summary> [SugarColumn(ColumnName = "CLOSE_STATUS")] public string CloseStatus { get; set; } public string? CloseStatus { get; set; } /// <summary> /// 采购组织 /// </summary> [SugarColumn(ColumnName = "PURCHASE_ORG")] public string PurchaseOrg { get; set; } public string? PurchaseOrg { get; set; } /// <summary> /// 采购部门 /// </summary> [SugarColumn(ColumnName = "PURCHASE_DEPT")] public string PurchaseDept { get; set; } public string? PurchaseDept { get; set; } /// <summary> /// 采购组 /// </summary> [SugarColumn(ColumnName = "PURCHASE_GROUP")] public string PurchaseGroup { get; set; } public string? PurchaseGroup { get; set; } /// <summary> /// 数量验收 /// </summary> [SugarColumn(ColumnName = "QTY_ACCEPTANCE")] public string QtyAcceptance { get; set; } public string? QtyAcceptance { get; set; } /// <summary> /// 采购员 /// </summary> [SugarColumn(ColumnName = "PURCHASER")] public string Purchaser { get; set; } public string? Purchaser { get; set; } /// <summary> /// 质量要求 /// </summary> [SugarColumn(ColumnName = "QUALITY_REQ")] public string QualityReq { get; set; } public string? QualityReq { get; set; } /// <summary> /// 结算方 /// </summary> [SugarColumn(ColumnName = "SETTLEMENT_PARTY")] public string SettlementParty { get; set; } public string? SettlementParty { get; set; } /// <summary> /// 收款方 /// </summary> [SugarColumn(ColumnName = "PAYMENT_PARTY")] public string PaymentParty { get; set; } public string? PaymentParty { get; set; } /// <summary> /// 邮箱 /// </summary> [SugarColumn(ColumnName = "EMAIL")] public string Email { get; set; } public string? Email { get; set; } /// <summary> /// 运输方式 /// </summary> [SugarColumn(ColumnName = "TRANSPORT_METHOD")] public string TransportMethod { get; set; } public string? TransportMethod { get; set; } /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "REMARKS")] public string Remarks { get; set; } public string? Remarks { get; set; } /// <summary> /// 治具丶模具加工及采购 /// </summary> [SugarColumn(ColumnName = "FIXTURE_MOLD_PROCUREMENT")] public string FixtureMoldProcurement { get; set; } public string? FixtureMoldProcurement { get; set; } /// <summary> /// 作废状态 /// </summary> [SugarColumn(ColumnName = "CANCELLATION_STATUS")] public string CancellationStatus { get; set; } public string? CancellationStatus { get; set; } /// <summary> /// 作废人 /// </summary> [SugarColumn(ColumnName = "CANCELLATION_PERSON")] public string CancellationPerson { get; set; } public string? CancellationPerson { get; set; } /// <summary> /// 作废日期 @@ -151,7 +151,7 @@ /// 创建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } public string? CreateBy { get; set; } /// <summary> /// 创建日期 @@ -169,19 +169,19 @@ /// 最后修改人 /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } public string? LastupdateBy { get; set; } /// <summary> /// 审核人 /// </summary> [SugarColumn(ColumnName = "ERP_CHECK_BY")] public string ErpCheckBy { get; set; } public string? ErpCheckBy { get; set; } /// <summary> /// 审核时间 /// </summary> [SugarColumn(ColumnName = "ERP_CHECK_DATE")] public string ErpCheckDate { get; set; } public string? ErpCheckDate { get; set; } /// <summary> /// ERP的ID号 @@ -199,7 +199,7 @@ /// 审核人 /// </summary> [SugarColumn(ColumnName = "CHECK_BY")] public string CheckBy { get; set; } public string? CheckBy { get; set; } /// <summary> /// 审核标识 @@ -211,46 +211,46 @@ /// 打印次数 /// </summary> [SugarColumn(ColumnName = "REMARK1")] public string Remark1 { get; set; } public string? Remark1 { get; set; } /// <summary> /// 自定义字段2 /// </summary> [SugarColumn(ColumnName = "REMARK2")] public string Remark2 { get; set; } public string? Remark2 { get; set; } /// <summary> /// 自定义字段3 /// </summary> [SugarColumn(ColumnName = "REMARK3")] public string Remark3 { get; set; } public string? Remark3 { get; set; } /// <summary> /// 自定义字段4 /// </summary> [SugarColumn(ColumnName = "REMARK4")] public string Remark4 { get; set; } public string? Remark4 { get; set; } /// <summary> /// 自定义字段5 /// </summary> [SugarColumn(ColumnName = "REMARK5")] public string Remark5 { get; set; } public string? Remark5 { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "CHANGEREASON")] public string Changereason { get; set; } public string? Changereason { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } public string? Factory { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } public string? Company { get; set; } /// <summary> /// </summary> @@ -258,42 +258,43 @@ public DateTime? Prearrivaldate { get; set; } /// <summary> /// 收料组织 /// </summary> [SugarColumn(ColumnName = "ReceiveOrgId")] public string ReceiveOrgId { get; set; } public string? ReceiveOrgId { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "Provider_Id")] public string ProviderId { get; set; } public string? ProviderId { get; set; } /// <summary> /// 联系人 /// </summary> [SugarColumn(ColumnName = "anred")] public string Anred { get; set; } public string? Anred { get; set; } /// <summary> /// 电话 /// </summary> [SugarColumn(ColumnName = "telf1")] public string Telf1 { get; set; } public string? Telf1 { get; set; } /// <summary> /// 固定电话 /// </summary> [SugarColumn(ColumnName = "Fixed_Telephone")] public string FixedTelephone { get; set; } public string? FixedTelephone { get; set; } /// <summary> /// 通讯地址 /// </summary> [SugarColumn(ColumnName = "Address")] public string Address { get; set; } public string? Address { get; set; } /// <summary> /// 验收方式 /// </summary> [SugarColumn(ColumnName = "Acctype")] public string Acctype { get; set; } public string? Acctype { get; set; } } entity/MesRohInData.cs
@@ -18,31 +18,31 @@ /// 采购单号 /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } public string? BillNo { get; set; } /// <summary> /// 销售订单号 /// </summary> [SugarColumn(ColumnName = "SALES_ORDER_ID")] public string SalesOrderId { get; set; } public string? SalesOrderId { get; set; } /// <summary> /// 采购订单行号 /// </summary> [SugarColumn(ColumnName = "ORDER_LINE_ID")] public string OrderLineId { get; set; } public string? OrderLineId { get; set; } /// <summary> /// 物料编码 /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public string ItemId { get; set; } public string? ItemId { get; set; } /// <summary> /// 采购单位 /// </summary> [SugarColumn(ColumnName = "PURCHASE_UNIT")] public string PurchaseUnit { get; set; } public string? PurchaseUnit { get; set; } /// <summary> /// 采购数量 @@ -54,13 +54,13 @@ /// 库存单位 /// </summary> [SugarColumn(ColumnName = "INVENTORY_UNIT")] public string InventoryUnit { get; set; } public string? InventoryUnit { get; set; } /// <summary> /// 计价单位 /// </summary> [SugarColumn(ColumnName = "PRICING_UNIT")] public string PricingUnit { get; set; } public string? PricingUnit { get; set; } /// <summary> /// 计价数量 @@ -90,73 +90,73 @@ /// 需求组织 /// </summary> [SugarColumn(ColumnName = "DEMAND_ORG")] public string DemandOrg { get; set; } public string? DemandOrg { get; set; } /// <summary> /// 收料组织 /// </summary> [SugarColumn(ColumnName = "RECEIVING_ORG")] public string ReceivingOrg { get; set; } public string? ReceivingOrg { get; set; } /// <summary> /// 结算组织 /// </summary> [SugarColumn(ColumnName = "SETTLEMENT_ORG")] public string SettlementOrg { get; set; } public string? SettlementOrg { get; set; } /// <summary> /// 是否赠品 /// </summary> [SugarColumn(ColumnName = "IS_GIFT")] public string IsGift { get; set; } public string? IsGift { get; set; } /// <summary> /// 备注 /// </summary> [SugarColumn(ColumnName = "REMARKS")] public string Remarks { get; set; } public string? Remarks { get; set; } /// <summary> /// 供应商物料编码 /// </summary> [SugarColumn(ColumnName = "SUPPLIER_ITEM_CODE")] public string SupplierItemCode { get; set; } public string? SupplierItemCode { get; set; } /// <summary> /// 供应商物料名称 /// </summary> [SugarColumn(ColumnName = "SUPPLIER_ITEM_NAME")] public string SupplierItemName { get; set; } public string? SupplierItemName { get; set; } /// <summary> /// 委外订单编号 /// </summary> [SugarColumn(ColumnName = "OUTSOURCING_ORDER_ID")] public string OutsourcingOrderId { get; set; } public string? OutsourcingOrderId { get; set; } /// <summary> /// 批号 /// </summary> [SugarColumn(ColumnName = "BATCH_NUMBER")] public string BatchNumber { get; set; } public string? BatchNumber { get; set; } /// <summary> /// 业务关闭 /// </summary> [SugarColumn(ColumnName = "BUSINESS_CLOSE")] public string BusinessClose { get; set; } public string? BusinessClose { get; set; } /// <summary> /// 业务冻结 /// </summary> [SugarColumn(ColumnName = "BUSINESS_FREEZE")] public string BusinessFreeze { get; set; } public string? BusinessFreeze { get; set; } /// <summary> /// 冻结人 /// </summary> [SugarColumn(ColumnName = "FREEZER")] public string Freezer { get; set; } public string? Freezer { get; set; } /// <summary> /// 冻结时间 @@ -168,13 +168,13 @@ /// 业务终止 /// </summary> [SugarColumn(ColumnName = "BUSINESS_TERMINATE")] public string BusinessTerminate { get; set; } public string? BusinessTerminate { get; set; } /// <summary> /// 终止人 /// </summary> [SugarColumn(ColumnName = "TERMINATOR")] public string Terminator { get; set; } public string? Terminator { get; set; } /// <summary> /// 终止时间 @@ -228,49 +228,49 @@ /// 源单类型 /// </summary> [SugarColumn(ColumnName = "SOURCE_DOCUMENT_TYPE")] public string SourceDocumentType { get; set; } public string? SourceDocumentType { get; set; } /// <summary> /// 源单单号 /// </summary> [SugarColumn(ColumnName = "SOURCE_DOCUMENT_ID")] public string SourceDocumentId { get; set; } public string? SourceDocumentId { get; set; } /// <summary> /// 需求跟踪号 /// </summary> [SugarColumn(ColumnName = "DEMAND_TRACKING_ID")] public string DemandTrackingId { get; set; } public string? DemandTrackingId { get; set; } /// <summary> /// 计划跟踪号 /// </summary> [SugarColumn(ColumnName = "PLAN_TRACKING_ID")] public string PlanTrackingId { get; set; } public string? PlanTrackingId { get; set; } /// <summary> /// 变更标志 /// </summary> [SugarColumn(ColumnName = "CHANGE_FLAG")] public string ChangeFlag { get; set; } public string? ChangeFlag { get; set; } /// <summary> /// 需求来源 /// </summary> [SugarColumn(ColumnName = "DEMAND_SOURCE")] public string DemandSource { get; set; } public string? DemandSource { get; set; } /// <summary> /// 需求单据编号 /// </summary> [SugarColumn(ColumnName = "DEMAND_DOCUMENT_ID")] public string DemandDocumentId { get; set; } public string? DemandDocumentId { get; set; } /// <summary> /// 需求单据行号 /// </summary> [SugarColumn(ColumnName = "DEMAND_DOCUMENT_LINE_ID")] public string DemandDocumentLineId { get; set; } public string? DemandDocumentLineId { get; set; } /// <summary> /// ERP的ID号 @@ -282,25 +282,25 @@ /// 客户货号 /// </summary> [SugarColumn(ColumnName = "REMARK1")] public string Remark1 { get; set; } public string? Remark1 { get; set; } /// <summary> /// 包装单号 /// </summary> [SugarColumn(ColumnName = "REMARK2")] public string Remark2 { get; set; } public string? Remark2 { get; set; } /// <summary> /// 主产品 /// </summary> [SugarColumn(ColumnName = "REMARK3")] public string Remark3 { get; set; } public string? Remark3 { get; set; } /// <summary> /// SMT备注 /// </summary> [SugarColumn(ColumnName = "REMARK4")] public string Remark4 { get; set; } public string? Remark4 { get; set; } /// <summary> /// ERP的头ID号 @@ -311,22 +311,22 @@ /// <summary> /// </summary> [SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")] public string PurchaseOrderLineNumber { get; set; } public string? PurchaseOrderLineNumber { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "DEMAND")] public string Demand { get; set; } public string? Demand { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "RECEIVING")] public string Receiving { get; set; } public string? Receiving { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "SETTLEMENT")] public string Settlement { get; set; } public string? Settlement { get; set; } /// <summary> /// erp推来的已交货数量 @@ -338,12 +338,12 @@ /// <summary> /// </summary> [SugarColumn(ColumnName = "DEMAND_DEPARTMENT")] public string DemandDepartment { get; set; } public string? DemandDepartment { get; set; } /// <summary> /// </summary> [SugarColumn(ColumnName = "RECEIVING_DEPARTMENT")] public string ReceivingDepartment { get; set; } public string? ReceivingDepartment { get; set; } /// <summary> /// </summary> @@ -353,5 +353,5 @@ /// <summary> /// </summary> [SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")] public string FdemandbillnoLine { get; set; } public string? FdemandbillnoLine { get; set; } } entity/TransferOut.cs
service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -42,11 +42,15 @@ if (inventory == null) throw new Exception("此条码找不到对应收货单！"); // var inventoryDetails = Db.Queryable<MesInvItemArnDetail>() // .Where(it => it.ParentGuid == inventory.Guid // && it.ItemId == itemBarcodeDetails.ItemId // && it.EbelnLine == itemBarcodeDetails.WorkLine // && it.Ebeln == itemBarcodeDetails.WorkNo) // .First(); var inventoryDetails = Db.Queryable<MesInvItemArnDetail>() .Where(it => it.ParentGuid == inventory.Guid && it.ItemId == itemBarcodeDetails.ItemId && it.EbelnLine == itemBarcodeDetails.WorkLine && it.Ebeln == itemBarcodeDetails.WorkNo) .Where(it => it.Guid == itemBarcodeDetails.AboutGuid) .First(); if (inventoryDetails == null) @@ -171,7 +175,8 @@ : (byte)0, CbillNo = itemBarcodeDetails.BillNo, Fstatus = 0, Status = 0 Status = 0, ReceiveOrgId = inventory.ReceiveOrgId }).IgnoreColumns(true).ExecuteCommand(); } @@ -287,7 +292,8 @@ TaskNo = detail.WorkNo, EbelnK3id = detail.EbelnK3id, LineK3id = detail.LineK3id, ItemId = detail.ItemId ItemId = detail.ItemId, ReceiveOrgId = inventory.ReceiveOrgId }).IgnoreColumns(true).ExecuteCommand(); } else @@ -377,7 +383,8 @@ TaskNo = detail.WorkNo, EbelnK3id = detail.EbelnK3id, LineK3id = detail.LineK3id, ItemId = detail.ItemId ItemId = detail.ItemId, ReceiveOrgId = inventory.ReceiveOrgId }).IgnoreColumns(true).ExecuteCommand(); cSyQty = 0; // Remaining quantity fulfilled @@ -500,7 +507,8 @@ Ischeck = true, CheckDate = inventoryDetails.CheckDate, CheckRes = inventoryDetails.CheckRes, CheckStates = inventoryDetails.CheckStates CheckStates = inventoryDetails.CheckStates, ReceiveOrgId = inventory.ReceiveOrgId }).IgnoreColumns(true).ExecuteCommand(); // 插入 mes_inv_business2 表
