diff --git a/WCS_YongFeng_XB/Model/Entity/I_Task.cs b/WCS_YongFeng_XB/Model/Entity/I_Task.cs index eaca269..690f0d9 100644 --- a/WCS_YongFeng_XB/Model/Entity/I_Task.cs +++ b/WCS_YongFeng_XB/Model/Entity/I_Task.cs @@ -35,6 +35,7 @@ namespace WCS_YongFeng public int EmptyOutFlag { get; set; } public int FullInFlag { get; set; } public string FullInPlace { get; set; } + public int Weight { get; set; } } } \ No newline at end of file diff --git a/WCS_YongFeng_XB/Model/WebApi/Request/ReqTaskFinish.cs b/WCS_YongFeng_XB/Model/WebApi/Request/ReqTaskFinish.cs index 5808166..39928e2 100644 --- a/WCS_YongFeng_XB/Model/WebApi/Request/ReqTaskFinish.cs +++ b/WCS_YongFeng_XB/Model/WebApi/Request/ReqTaskFinish.cs @@ -17,5 +17,9 @@ /// 高度(只在入库请求时反馈) /// public int Height { get; set; } + /// + /// 重量,任务完成反馈 + /// + public int Weight { get; set; } } } \ No newline at end of file diff --git a/WCS_YongFeng_XB/Service/Comm/BaseBll.cs b/WCS_YongFeng_XB/Service/Comm/BaseBll.cs index 3d5783e..94d377d 100644 --- a/WCS_YongFeng_XB/Service/Comm/BaseBll.cs +++ b/WCS_YongFeng_XB/Service/Comm/BaseBll.cs @@ -338,7 +338,8 @@ namespace WCS_YongFeng { TaskNo = task.tNo_WMS, State = 100, - Height = 0 + Height = 0, + Weight = task.Weight }; var interfaceresult = WcsWebApiClient.FinishTask(reqTaskFinish); @@ -915,6 +916,7 @@ namespace WCS_YongFeng lstColumnValues.Add("FromPlace", from); lstColumnValues.Add("ToPlace", to); lstColumnValues.Add("TaskSetp", task.TaskSetp + 1); + lstColumnValues.Add("Weight", task.Weight); var updateresult = baseDal.Update(lstColumnValues, a => a.tNo == task.tNo); if (updateresult.Success) diff --git a/WCS_YongFeng_XB/Service/DevicesExcute/StationDRExcute.cs b/WCS_YongFeng_XB/Service/DevicesExcute/StationDRExcute.cs index bd87eb7..ae518e8 100644 --- a/WCS_YongFeng_XB/Service/DevicesExcute/StationDRExcute.cs +++ b/WCS_YongFeng_XB/Service/DevicesExcute/StationDRExcute.cs @@ -70,7 +70,8 @@ namespace WCS_YongFeng BaseDal baseDal = new BaseDal(); baseDal.BeginTran(); - + // 传入重量,更新到任务表中,任务完成的时候回传到WMS + taskresur.Weight = weight; var updateresult = _bll.NextStateChange2(taskresur, pose.wcName, baseDal); if (updateresult.Success) {