diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java
index 42d19fa..3de010f 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java
@@ -167,6 +167,7 @@ public class WmsToJnServiceImpl implements WmsToJnService {
material_jo.put("print_model", materialjo.getString("PRINTTYPE"));
material_jo.put("is_auto_package", materialjo.getString("ISAUTO"));
material_jo.put("material_type", materialjo.getString("TYPEID"));
+ material_jo.put("vehicle_type", materialjo.getString("VEHICLETYPE"));
material_jo.put("is_used", "1");
material_jo.put("update_optid", "1");
material_jo.put("update_optname", "管理员");
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 7dd0e80..292892b 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
@@ -124,6 +124,12 @@ public class ProducetaskServiceImpl implements ProducetaskService {
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
+
+ String material_id = dto.getMaterial_id().toString();
+ //根据物料去找木托盘类型
+ JSONObject materialObj = WQLObject.getWQLObject("md_me_material").query("material_id = '" + material_id + "'").uniqueResult(0);
+ String vehicle_type = materialObj.getString("vehicle_type");
+ dto.setVehicle_type(vehicle_type);
dto.setProducetask_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setProducetask_code(CodeUtil.getNewCode("PRODUCE_CODE"));
dto.setCreate_id(currentUserId);
@@ -133,7 +139,6 @@ public class ProducetaskServiceImpl implements ProducetaskService {
dto.setUpdate_time(now);
dto.setCreate_time(now);
dto.setProducetask_status("01");
-
WQLObject wo = WQLObject.getWQLObject("pdm_mg_producetask");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql
index 0ab21ec..1cce779 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/wql/QIVT_001.wql
@@ -84,7 +84,7 @@
point.point_name like "%" 输入.struct_name "%")
ENDOPTION
OPTION 输入.storagevehicle_code <> ""
- ivt.vehicle_code like "%"输入.storagevehicle_code"%"
+ ivt.vehicle_code like "%" 输入.storagevehicle_code "%"
ENDOPTION
OPTION 输入.sect_uuid <> ""
struct.sect_id = 输入.sect_uuid
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls
index 7f372ea..0424028 100644
Binary files a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls differ
diff --git a/wms/qd/src/views/wms/pdm/produceTask/index.vue b/wms/qd/src/views/wms/pdm/produceTask/index.vue
index af4fd30..f30f8ad 100644
--- a/wms/qd/src/views/wms/pdm/produceTask/index.vue
+++ b/wms/qd/src/views/wms/pdm/produceTask/index.vue
@@ -219,7 +219,7 @@
-
+