diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
index 7b186da4..b7fd0270 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
@@ -405,7 +405,8 @@ public class DailyplanServiceImpl implements DailyplanService {
             new_jo.put("workorder_qty",jo.getString("standard_weight"));
             new_jo.put("planstart_time",jo.getString("planstart_date").substring(0,10)+" 08:00:00");
             new_jo.put("planend_time",jo.getString("planend_date").substring(0,10)+" 23:59:59");
-            new_jo.put("status","10");
+            new_jo.put("status",jsonMst.getString("remark"));
+            new_jo.put("remark","10");
             new_jo.put("create_mode","03");
             new_jo.put("source_bill_id",jo.getString("dailyplan_id"));
             new_jo.put("source_bill_type",jo.getString("workorder_type"));
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
index 1c9c482e..9d2fa9c0 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
@@ -127,15 +127,12 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
                 json.put("create_time", now);
                 json.put("sysdeptid", deptId);
                 json.put("syscompanyid", deptId);
-                String create_mode  = json.getString("create_mode");
-                if("01".equals(create_mode)){
-                    String planstart_time = json.getString("planstart_time");
-                    Date date = DateUtil.parse(planstart_time);
-                    int days = this.getDays(json.getString("material_id"));
-                    Date planend_date = DateUtil.offsetDay(date,days-1);
-                    String planend_time = DateUtil.formatDate(planend_date).substring(0,10);
-                    json.put("planend_time",planend_time+" 23:59:59");
-                }
+                String planstart_time = json.getString("planstart_time");
+                Date date = DateUtil.parse(planstart_time);
+                int days = this.getDays(json.getString("material_id"));
+                Date planend_date = DateUtil.offsetDay(date,days-1);
+                String planend_time = DateUtil.formatDate(planend_date).substring(0,10);
+                json.put("planend_time",planend_time+" 23:59:59");
                 mstTab.insert(json);
                 this.updatePcsn(json);
             }
@@ -176,15 +173,12 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
                this.updatePcsn(whereJson);
            }
         }
-        String create_mode  = whereJson.getString("create_mode");
-        if("01".equals(create_mode)){
-            String planstart_time = whereJson.getString("planstart_time");
-            Date date = DateUtil.parse(planstart_time);
-            int days = this.getDays(whereJson.getString("material_id"));
-            Date planend_date = DateUtil.offsetDay(date,days-1);
-            String planend_time = DateUtil.formatDate(planend_date).substring(0,10);
-            whereJson.put("planend_time",planend_time+" 23:59:59");
-        }
+        String planstart_time = whereJson.getString("planstart_time");
+        Date date = DateUtil.parse(planstart_time);
+        int days = this.getDays(whereJson.getString("material_id"));
+        Date planend_date = DateUtil.offsetDay(date,days-1);
+        String planend_time = DateUtil.formatDate(planend_date).substring(0,10);
+        whereJson.put("planend_time",planend_time+" 23:59:59");
         mstTab.update(whereJson);
 
     }