diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java
index c2a019d..7dedd24 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java
@@ -26,6 +26,7 @@ public class WmsToErpServiceImpl implements WmsToErpService {
         String is_connect_erp = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(SysParamConstant.IS_CONNECT_ERP).getValue();
         if(is_connect_erp.equals("1")){
             try {
+                log.info("instorinfoToErp接口地址------------" +url);
                 String resultMsg = HttpRequest.post(url)
                         .body(String.valueOf(whereJson))
                         .execute().body();
@@ -35,7 +36,7 @@ public class WmsToErpServiceImpl implements WmsToErpService {
 
 
                 String status = result.getString("status");
-                if (!EXTConstant.ERROR.equals(status)) {
+                if (EXTConstant.ERROR.equals(status)) {
                     throw new BadRequestException(result.getString("message"));
                 }
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml
index 2c9cf72..2558955 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml
@@ -119,6 +119,7 @@
         pm_form_data
         left join md_me_materialbase on pm_form_data.material_code = md_me_materialbase.material_code
         <where>
+             (is_merge = 0 or is_merge is null)
             <if test="query.search != null and query.search != ''">
                 and form_data LIKE '%${query.search}%'
             </if>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java
index d597abe..71f78c9 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java
@@ -137,7 +137,7 @@ public class RetrunServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
                     for (IOStorInvDis disDao : iosDisList) {
                         JSONObject param = new JSONObject();
                         // 载具编码
-                        param.put("pallet_sn", disDao.getStoragevehicle_code());
+                        param.put("pallet_sn", mst.getVehicle_code());
                         param.put("instor_time", mst.getConfirm_time());
                         param.put("barcode", mst.getBarcode());
                         wmsToErpService.instorinfoToErp(param);
diff --git a/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue b/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue
index fa61a9e..306fb5c 100644
--- a/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue
+++ b/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue
@@ -189,6 +189,7 @@
         <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_code',crud.data,'物料编码')" />
         <el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_name',crud.data,'物料名称')" />
         <el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
+        <el-table-column prop="vehicle_code" label="托盘编码" show-overflow-tooltip width="220" />
         <el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120" />
         <el-table-column prop="unit_name" label="单位" show-overflow-tooltip width="120" />
         <el-table-column prop="source_form_date" label="源单日期" show-overflow-tooltip width="120" />