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 b7fd0270..3bed4152 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,8 +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",jsonMst.getString("remark"));
-            new_jo.put("remark","10");
+            new_jo.put("remark",jsonMst.getString("remark"));
+            new_jo.put("status","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 9d2fa9c0..c799fd42 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
@@ -201,17 +201,12 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
                 continue;
             }
             JSONObject param = new JSONObject();
-            param.put("workorder_id", String.valueOf(workorder_id));
-            param.put("is_delete", "1");
-            param.put("update_optid", currentUserId);
-            param.put("update_optname", nickName);
-            param.put("update_time", now);
-            PDM_BI_WorkOrder.update(param);
+            String workorder_id2 = String.valueOf(workorder_id);
+            PDM_BI_WorkOrder.delete("workorder_id='"+workorder_id2+"'");
             String source_bill_id = jo.getString("source_bill_id");
-
-            JSONArray ja = PDM_BI_WorkOrder.query("is_delete='0' and source_bill_id='"+source_bill_id+"'").getResultJSONArray(0);
-            if(ja.size() == 0){
-                if (StrUtil.isNotEmpty(source_bill_id)) {
+            if (StrUtil.isNotEmpty(source_bill_id)) {
+                JSONArray ja = PDM_BI_WorkOrder.query("is_delete='0' and source_bill_id='"+source_bill_id+"'").getResultJSONArray(0);
+                if(ja.size() == 0){
                     JSONObject param2 = new JSONObject();
                     param2.put("status", "01");
                     MPS_BD_ProductDailyPlan.update(param2,"dailyplan_id='"+source_bill_id+"'");