diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java
index 8ce6abbe..a128d9d4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java
@@ -337,6 +337,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                 device_map.put(device_id,rows);
             }
         }
+        //已预排月计划
+        HashMap<String,JSONObject> have_map = new HashMap<String,JSONObject>();
         //排序
         HashMap<String,JSONArray> device_map2 = new HashMap<String,JSONArray>();
         device_map.forEach((key,rows)->{
@@ -375,7 +377,34 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                 }
             });
             rows = JSONArray.parseArray(JSON.toJSONString(list));
-            device_map2.put(key,rows);
+            JSONArray new_rows = new JSONArray();
+            for(int i=0;i<rows.size();i++){
+                JSONObject jo = rows.getJSONObject(i);
+                String before_date = jo.getString("plan_finish_date");
+                Date date = DateUtil.parse(before_date);
+                date = DateUtil.offsetDay(date,6);
+                long before_time = date.getTime();
+                if(i==0 || !have_map.containsKey(jo.getString("task_code"))){
+                    have_map.put(jo.getString("task_code"),jo);
+                    new_rows.add(jo);
+                    for(int j=0;j<rows.size();j++){
+                        JSONObject jo_j = rows.getJSONObject(j);
+                        if(have_map.containsKey(jo_j.getString("task_code"))){
+                            continue;
+                        }else{
+                            String material_id = jo_j.getString("material_id");
+                            String plan_finish_date = jo_j.getString("plan_finish_date");
+                            Date finish_date = DateUtil.parse(plan_finish_date);
+                            long finish_time = finish_date.getTime();
+                            if(jo.getString("material_id").equals(material_id) && finish_time<=before_time){
+                                new_rows.add(jo_j);
+                                have_map.put(jo_j.getString("task_code"),jo_j);
+                            }
+                        }
+                    }
+                }
+            }
+            device_map2.put(key,new_rows);
         });
 
         String finalChecked = checked;
@@ -389,9 +418,9 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
             }
             //当天产能是否有剩余
             double pcsn_num_day = 0;
+            JSONObject jo_before = null;
                 for(int i=0;i<rows.size();i++){
                     JSONObject jo = rows.getJSONObject(i);
-
                     double fact_weight = jo.getDouble("fact_weight");
                     double standard_weight = jo.getDouble("standard_weight");
 
@@ -405,6 +434,29 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                     int totalproducecapacity_qty = series.getInteger("totalproducecapacity_qty");
                     //若初始日期不为空，取此初始日期
                     if(finalChecked.equals("true")){
+                        JSONObject last = jo_before;
+                        if(last!=null && jo.getString("old_mark").equals(last.getString("old_mark"))) {
+                            JSONObject total_last = WQL.getWO("QPDM_PRODUCTPLANPROC")
+                                    .addParam("flag", "6")
+                                    .addParam("device_id", jo.getString("device_id"))
+                                    .addParam("planstart_date", last.getString("planstart_date"))
+                                    .process()
+                                    .uniqueResult(0);
+                            pcsn_num_day = totalproducecapacity_qty - total_last.getInteger("total_product_num");
+
+                            nowstart_date = last.getString("planstart_date");
+                            date = DateUtil.parse(nowstart_date);
+                            if (pcsn_num_day <= 0) {
+                                date = DateUtil.offsetDay(date, 1);
+                            }
+                        }else{
+                            if(last!=null){
+                                nowstart_date = last.getString("planstart_date");
+                                date = DateUtil.parse(nowstart_date);
+                                date = DateUtil.offsetDay(date,1);
+                                pcsn_num_day = 0;
+                            }
+                        }
                         while(pcsn_num > 0){
                             JSONObject ProcessRoute = WQL.getWO("QPDM_PRODUCTPLANPROC").addParam("flag","5")
                                     .addParam("material_code",jo.getString("material_id")).process().uniqueResult(0);
@@ -485,6 +537,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                 fact_weight = 0;
                             }
                         }
+                        jo_before = jo;
                     }else{//若初始日期为空，获取日计划表设备标识=此分组设备的最后一个计划
 
                         //第一条查数据库
@@ -599,6 +652,33 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
                                 }
                             }
                         }else{
+                            JSONObject last = MPS_BD_ProductDailyPlan.query("device_id='"+jo.getString("device_id")+"'","planstart_date desc,create_time desc").uniqueResult(0);
+                            if(last ==null ){
+                                throw new BadRequestException("日计划表此分组设备的最后一个计划为空！");
+                            }
+                            JSONObject mater = MD_ME_ProducMaterialExt.query("material_id='"+last.getString("material_id")+"'").uniqueResult(0);
+                            String old_mark = mater.getString("old_mark");
+
+                            if(jo.getString("old_mark").equals(old_mark)) {
+                                JSONObject total_last = WQL.getWO("QPDM_PRODUCTPLANPROC")
+                                        .addParam("flag", "6")
+                                        .addParam("device_id", jo.getString("device_id"))
+                                        .addParam("planstart_date", last.getString("planstart_date"))
+                                        .process()
+                                        .uniqueResult(0);
+                                pcsn_num_day = totalproducecapacity_qty - total_last.getInteger("total_product_num");
+
+                                nowstart_date = last.getString("planstart_date");
+                                date = DateUtil.parse(nowstart_date);
+                                if (pcsn_num_day <= 0) {
+                                    date = DateUtil.offsetDay(date, 1);
+                                }
+                            }else{
+                                nowstart_date = last.getString("planstart_date");
+                                date = DateUtil.parse(nowstart_date);
+                                date = DateUtil.offsetDay(date,1);
+                                pcsn_num_day = 0;
+                            }
                             while(pcsn_num > 0){
                                 JSONObject ProcessRoute = WQL.getWO("QPDM_PRODUCTPLANPROC").addParam("flag","5")
                                         .addParam("material_code",jo.getString("material_id")).process().uniqueResult(0);