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 1097f943..2023a2a2 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
@@ -51,6 +51,14 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
         if (StrUtil.isNotEmpty(material_id)) {
             map.put("material_id", "%" + material_id + "%");
         }
+        String begin_time = map.get("begin_time");
+        if (StrUtil.isNotEmpty(begin_time)) {
+            map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
+        }
+        String end_time = map.get("end_time");
+        if (StrUtil.isNotEmpty(end_time)) {
+            map.put("end_time", end_time.substring(0,10)+" 23:59:59");
+        }
         JSONObject json = WQL.getWO("QPDM_WORKORDER01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder.workorder_code");
         return json;
     }
@@ -92,6 +100,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
         }
         // 插入主表
         json.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId());
+        json.put("workordercard_id",json.getString("workorder_id"));
         String workorder_code = CodeUtil.getNewCode("GL_CODE");
         json.put("workorder_code", workorder_code);
         json.put("is_delete", "0");
@@ -269,9 +278,9 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
                 if ("GX001".equals(workprocedure_code)) {
                     jsonMst.put("workorder_qty", jsonMst.getDouble("billpure_qty")+"");
                 }else{
-                   if(StrUtil.isNotEmpty(jsonMst.getString("bill_qty"))){
-                       jsonMst.put("workorder_qty", jsonMst.getDouble("bill_qty")+"");
-                   }
+                    if(StrUtil.isNotEmpty(jsonMst.getString("bill_qty"))){
+                        jsonMst.put("workorder_qty", jsonMst.getDouble("bill_qty")+"");
+                    }
                 }
                 JSONArray devices = new JSONArray();
                 jsonMst.put("device_id", "");