diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainRunUpInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainRunUpInput.cs index e25142a3..c203a81e 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainRunUpInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainRunUpInput.cs @@ -35,6 +35,8 @@ public string item_id { get; set; } public string result { get; set; } + + public string reason { get; set; } } public class MaintainItemResult diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainItemRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainItemRecord.cs index 4483c96c..9336b074 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainItemRecord.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainItemRecord.cs @@ -48,5 +48,7 @@ public partial class ToolMoldMaintainItemRecord : BaseEntity public string plan_id { get; set; } public string result { get; set; } + + public string reason { get; set; } } diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs index 63c0924d..651c3855 100644 --- a/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs +++ b/EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs @@ -481,7 +481,8 @@ namespace Tnb.EquipMgr item_group_id = item.item_group_id, item_id = item.item_id, status = 1, - result = item.result + result = item.result, + reason = item.reason, }; records.Add(record); } diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 7eba305d..a006bc37 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -1800,18 +1800,18 @@ namespace Tnb.ProductionMgr #region 质检模块 //质检模块 - TriggerPlanEntity entity = new() - { - materialid = prdMoTask.material_id, - processid = prdMoTask.process_id, - workid = prdMoTask.workstation_id - }; - int? reported = prdMoTask.reported_work_qty == null ? 0 : prdMoTask.reported_work_qty; - int? scrap = prdMoTask.scrap_qty == null ? 0 : prdMoTask.scrap_qty; - entity.oldpronum = reported + scrap; - entity.newpronum = input.reported_qty; - entity.triggerevent = EnumTriggerEvent.生产检定量; - await _qcCheckPlanService.CreateTask(entity); + // TriggerPlanEntity entity = new() + // { + // materialid = prdMoTask.material_id, + // processid = prdMoTask.process_id, + // workid = prdMoTask.workstation_id + // }; + // int? reported = prdMoTask.reported_work_qty == null ? 0 : prdMoTask.reported_work_qty; + // int? scrap = prdMoTask.scrap_qty == null ? 0 : prdMoTask.scrap_qty; + // entity.oldpronum = reported + scrap; + // entity.newpronum = input.reported_qty; + // entity.triggerevent = EnumTriggerEvent.生产检定量; + // await _qcCheckPlanService.CreateTask(entity); #endregion _ = prdMoTask.reported_work_qty == null ? await db.Updateable() diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index 302c5685..e47a06d3 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -399,7 +399,7 @@ namespace Tnb.WarehouseMgr thirdWebapiRecord.name = "采购入库"; thirdWebapiRecord.method = "POST"; thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN+"uapws/rest/purchaseIn/save"; - thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData); + thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); thirdWebapiRecord.create_time = DateTime.Now; await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync();