From b7ae473d8e3063d7f077760532fda879f3ba1b0d Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Tue, 7 Nov 2023 11:35:25 +0800 Subject: [PATCH] 1 --- .../Dto/PrdManage/NewMaterialReceiptInput.cs | 8 ++++---- .../Tnb.ProductionMgr/PrdMaterialReceiptService.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/NewMaterialReceiptInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/NewMaterialReceiptInput.cs index 62dde488..8759ff05 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/NewMaterialReceiptInput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/NewMaterialReceiptInput.cs @@ -24,12 +24,12 @@ namespace Tnb.ProductionMgr.Entities.Dto public class NewMaterialReceiptDInput { public string material_id{get;set;} - public decimal num {get;set;} - public string batch {get;set;} + public decimal codeqty {get;set;} + public string code_batch {get;set;} public string unit_id {get;set;} public string barcode {get;set;} - public string member_carry_id {get;set;} - public string member_carry_code {get;set;} + public string member_carryid {get;set;} + public string member_carrycode {get;set;} public string supplier_id {get;set;} public DateTime? instock_time {get;set;} public string check_conclusion {get;set;} diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs index a001b296..e6a66826 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs @@ -300,14 +300,14 @@ namespace Tnb.ProductionMgr { material_receipt_id = prdMaterialReceiptH.id, material_id = item.material_id, - num = item.num, - batch = item.batch, + num = item.codeqty, + batch = item.code_batch, unit_id = item.unit_id, carry_id = carry.id, barcode = item.barcode, is_all_feeding = 0, - member_carry_id = item.member_carry_id, - member_carry_code = item.member_carry_code, + member_carry_id = item.member_carryid, + member_carry_code = item.member_carrycode, feeding_num = 0, supplier_id = item.supplier_id, instock_time = item.instock_time,