diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java
index be2ad4f..c11801c 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java
@@ -179,10 +179,16 @@ public class MdWorkstationController extends BaseController
             return AjaxResult.error("工作站名称已存在！");
         }
         ProProcess process = proProcessService.selectProProcessByProcessId(mdWorkstation.getProcessId());
+        if(!StringUtils.isNotNull(process)){
+            return AjaxResult.error("工序不存在！");
+        }
         mdWorkstation.setProcessCode(process.getProcessCode());
         mdWorkstation.setProcessName(process.getProcessName());
 
         MdWorkshop workshop = mdWorkshopService.selectMdWorkshopByWorkshopId(mdWorkstation.getWorkshopId());
+        if(!StringUtils.isNotNull(workshop)){
+            return AjaxResult.error("车间不存在！");
+        }
         mdWorkstation.setWorkshopCode(workshop.getWorkshopCode());
         mdWorkstation.setWorkshopName(workshop.getWorkshopName());
 
diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskController.java
index bc04d3a..0761693 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskController.java
@@ -233,20 +233,37 @@ public class ProTaskController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody ProTask proTask)
     {
+        ProTask theTask = proTaskService.selectProTaskByTaskId(proTask.getTaskId());
+
         if(proTask.getQuantity().compareTo(BigDecimal.ZERO) !=1){
             return AjaxResult.error("排产数量必须大于0！");
         }
 
         if(!StringUtils.isNotNull(proTask.getWorkstationId())){
-            return AjaxResult.error("请选择工作站！");
+            proTask.setWorkstationId(theTask.getWorkstationId());
+        }
+
+        if(!StringUtils.isNotNull(proTask.getWorkorderId())){
+            proTask.setWorkorderId(theTask.getWorkorderId());
+        }
+
+        if(!StringUtils.isNotNull(proTask.getProcessId())){
+            proTask.setProcessId(theTask.getProcessId());
+        }
+
+        if(!StringUtils.isNotNull(proTask.getRouteId())){
+            proTask.setRouteId(theTask.getRouteId());
         }
 
         if(proTask.getDuration()<=0){
-            return AjaxResult.error("生产时长必须大于0！");
+            proTask.setDuration(theTask.getDuration());
         }
 
         //生产工单
         ProWorkorder order = proWorkorderService.selectProWorkorderByWorkorderId(proTask.getWorkorderId());
+        if(!StringUtils.isNotNull(order)){
+            return AjaxResult.error("生产工单不存在!");
+        }
         proTask.setWorkorderCode(order.getWorkorderCode());
         proTask.setWorkorderName(order.getWorkorderName());
         proTask.setItemId(order.getProductId());