diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
index 2c7a621..41efb88 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
@@ -219,11 +219,10 @@ IF 输入.flag = "6"
                 	AND ( point.vehicle_code = '' OR point.vehicle_code IS NULL )
                 	AND task.task_code IS NULL
                 	AND point.point_status = '00'
-                	and point.material_code<>'0'
                 	OPTION 输入.material_type <> ""
                          point.material_type = 输入.material_type
                     ENDOPTION
-                    OPTION 输入.material_code <> ""
+                    OPTION point.material_code <> "0"
                            point.material_code = 输入.material_code
                     ENDOPTION
              ENDSELECT
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java
index ea32306..7dd0e80 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java
@@ -299,15 +299,17 @@ public class ProducetaskServiceImpl implements ProducetaskService {
         } else {
             taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "4").addParam("producetask_id", producetask_id).process().uniqueResult(0);
         }
-
         taskObj.put("product_type", "wms");
         WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class);
         JSONArray arr = new JSONArray();
         arr.add(taskObj);
         wmsToAcsService.sendProduceTask(arr);
-
         JSONObject map = new JSONObject();
-        map.put("producetask_status", "02");
+        String producetask_status = "02";
+        if (StrUtil.equals(device_id, "1560189462410039296")) {
+            producetask_status = "04";
+        }
+        map.put("producetask_status", producetask_status);
         map.put("update_optid", currentUserId);
         map.put("update_optname", nickName);
         map.put("update_time", now);