diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java
index 5c24489..314bbe8 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java
@@ -198,8 +198,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
                 " sd.plan_qty, " +
                 " sd.actual_qty, " +
                 " s.shipping_code, " +
-                " sd.part_no, " +
-                " sd.modify_date_time, " +
+                " sd.part_no  " +
                 " from  mes_shipping_detail  sd " +
                 " left join mes_shipping s on s.id=sd.pid  " +
                 " WHERE  sd.status in (20) " +//todo 发运 20
@@ -207,12 +206,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
         hql.append(" and sd.organize_code = :organizeCode ");
         hql.append(" and sd.is_deleted = :isDeleted ");
         hql.append(" and sd.is_valid = :isValid ");
-        if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){
-            hql.append(" and  sd.modify_date_time >= '"+detail.getModifyDateTimeStart()+"' ");
-        }
-        if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){
-            hql.append(" and  sd.modify_date_time <= '"+detail.getModifyDateTimeEnd()+"' ");
-        }
+
         if (!StringUtil.isEmpty(detail.getShippingCode())){
             hql.append(" and  s.shipping_code = '"+detail.getShippingCode()+"' ");
         }
@@ -239,7 +233,6 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
             model.setActualQty(StringUtils.isEmpty(cells[2]) ? 1 : Integer.parseInt(String.valueOf(cells[2])));
             model.setShippingCode(StringUtils.isEmpty(cells[3]) ? "" : String.valueOf(cells[3]));
             model.setPartNo(StringUtils.isEmpty(cells[4]) ? "" : String.valueOf(cells[4]));
-            model.setModifyDatetime(StringUtils.isEmpty(cells[5]) ? "" : String.valueOf(cells[5]));
             modelList.add(model);
         }
 
@@ -254,7 +247,12 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
         hql.append(" WHERE wop.organize_code = :organizeCode ");
         hql.append(" and wop.is_deleted = :isDeleted ");
         hql.append(" and wop.is_valid = :isValid ");
-
+        if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){
+            hql.append(" and  wo.shipping_time >= '"+detail.getModifyDateTimeStart()+"' ");
+        }
+        if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){
+            hql.append(" and  wo.shipping_time <= '"+detail.getModifyDateTimeEnd()+"' ");
+        }
         if (!StringUtil.isEmpty(detail.getPartNo())){
             hql.append(" and wop.part_no ='"+detail.getPartNo()+"' ");
         }
@@ -286,13 +284,19 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
                 " wo.work_center_code, " +
                 " wop.part_no, " +
                 " wop.part_name, " +
-                " wop.item_qty " +
+                " wop.item_qty, " +
+                " wo.shipping_time " +
                 " from mes_work_order_part  wop  " +
                 " left join mes_work_order wo on wop.work_order_no=wo.work_order_no " );
         hql.append(" WHERE wop.organize_code = :organizeCode ");
         hql.append(" and wop.is_deleted = :isDeleted ");
         hql.append(" and wop.is_valid = :isValid ");
-
+        if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){
+            hql.append(" and  wo.shipping_time >= '"+detail.getModifyDateTimeStart()+"' ");
+        }
+        if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){
+            hql.append(" and  wo.shipping_time <= '"+detail.getModifyDateTimeEnd()+"' ");
+        }
         if (!StringUtil.isEmpty(detail.getPartNo())){
             hql.append(" and wop.part_no ='"+detail.getPartNo()+"' ");
         }
@@ -320,6 +324,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
             model.setPartNo(StringUtils.isEmpty(cells[1]) ? "" : String.valueOf(cells[1]));
             model.setPartName(StringUtils.isEmpty(cells[2]) ? "" : String.valueOf(cells[2]));
             model.setItemQty(StringUtils.isEmpty(cells[3]) ? 1 : Double.parseDouble(String.valueOf(cells[3])));
+            model.setShippingTime(StringUtils.isEmpty(cells[4]) ? "" : String.valueOf(cells[4]));
             modelList.add(model);
         }
 
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
index cbd0104..f48e606 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
@@ -134,7 +134,6 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
                     mesWorkOrderPart.setItemQty(mesWorkOrderPart.getItemQty()*managementDetail.getPlanQty());
                     mesWorkOrderPart.setShippingCode(managementDetail.getShippingCode());
                     mesWorkOrderPart.setTotalPartNo(managementDetail.getPartNo());
-                    mesWorkOrderPart.setShippingTime(managementDetail.getModifyDatetime());
                 }
             }
         }