diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
index 816242a6..d6dc1f28 100644
--- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
@@ -105,7 +105,7 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
 
             if (!string.IsNullOrEmpty(id))
             {
-                lst = proWorkplanService.GetWorkorderList(id);
+                lst = proWorkplanService.GetWorkorderListByPlanId(id);
             }
 
             return ToResponse(new ApiResult(200, "success", lst));
@@ -136,17 +136,21 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
                     List<ProWorkplan> lstWorkplan = proWorkplanService.GetProWorkplanById(workPlanId);
 
                     // 查询所有生产工单
-                    List<ProWorkorder> lstWorkorder = proWorkplanService.GetWorkorderList(workorderId);
+                    List<ProWorkorder> lstWorkorder = proWorkplanService.GetWorkorderListByPlanId(workPlanId);
 
                     // 计算所有工单的数量和，生产计划的数量：比较
                     if(lstWorkplan!=null && lstWorkplan.Count==1)
                     {
                         int countWorkplan = int.Parse(lstWorkplan[0].ActualplanNumber.Trim());
+
+                        // 计算已有工单的计划数
                         int countWorkorder = 0;
                         foreach (ProWorkorder item in lstWorkorder)
                         {
                             countWorkorder += item.Actualnumber.GetValueOrDefault();
                         }
+
+                        // 再加上当前订单计划数
                         countWorkorder += proWorkorder.Actualnumber.GetValueOrDefault();
 
                         // 计划数>0   计划数要大于等于当前工单总数
@@ -186,7 +190,7 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
                     string isArrange = "0";
 
                     // 查询所有生产工单，根据生产计划ID
-                    List<ProWorkorder> lstWorkorder = proWorkplanService.GetWorkorderList(workPlanId);
+                    List<ProWorkorder> lstWorkorder = proWorkplanService.GetWorkorderListByPlanId(workPlanId);
 
                     // 找到要更新的工单，要判断当前工单状态
                     ProWorkorder currentWorkorder = null;
diff --git a/ZR.Service/mes/pro/IService/IProWorkplanService.cs b/ZR.Service/mes/pro/IService/IProWorkplanService.cs
index d36708bc..fe371233 100644
--- a/ZR.Service/mes/pro/IService/IProWorkplanService.cs
+++ b/ZR.Service/mes/pro/IService/IProWorkplanService.cs
@@ -32,7 +32,7 @@ namespace ZR.Service.mes.pro.IService
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public List<ProWorkorder> GetWorkorderList(string id);
+        public List<ProWorkorder> GetWorkorderListByPlanId(string id);
 
         /// <summary>
         /// 根据工单ID，获取工单
diff --git a/ZR.Service/mes/pro/ProWorkplanService.cs b/ZR.Service/mes/pro/ProWorkplanService.cs
index d9281cb7..1aa6cbc0 100644
--- a/ZR.Service/mes/pro/ProWorkplanService.cs
+++ b/ZR.Service/mes/pro/ProWorkplanService.cs
@@ -55,7 +55,7 @@ namespace ZR.Service.mes.pro
             return Context.Deleteable<ProWorkplan>().In(id).ExecuteCommand();
         }
 
-        public List<ProWorkorder> GetWorkorderList(string id)
+        public List<ProWorkorder> GetWorkorderListByPlanId(string id)
         {
             return Context.Queryable<ProWorkorder>().Where(it => it.FkProPlanId == id).ToList();
         }