diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java
index f2e305b3..6f2406e1 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java
@@ -1,6 +1,7 @@
 package org.nl.wms.flow_manage.flow.service.classprocessimpl;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -65,7 +66,6 @@ public class SyncReceiptProcessHandler implements ClassProcess {
         if (StringUtils.isEmpty(formid)) {
             throw new BadRequestException("回传失败:回传数据form_data中数据格式不是formid,data类型");
         }
-
         handleBillEntity(pmFormData.getForm_type(), formData);
         String json = formData.toJSONString();
         try {
@@ -113,7 +113,7 @@ public class SyncReceiptProcessHandler implements ClassProcess {
     private void handleBillEntity(String formType, JSONObject formData) {
         JSONArray fEntityArray = formData.getJSONObject("Model").getJSONArray("FEntity");
         //判断生产入库的手工录入与MRP生成方式需回传不同的源单信息
-        if ("0".equals(formData.getString("FSrcEntryId")) && "PRD_INSTOCK".equals(formType)) {
+        if ("0".equals(formData.getString("FSrcEntryId")) && "RECEIPT_PRD".equals(formType)) {
             //查询工序汇报单
             ErpQuery reportQuery = new ErpQuery();
             reportQuery.setFilterString("FMoNumber ='" + formData.getString("moNumber") + "'");
@@ -142,11 +142,11 @@ public class SyncReceiptProcessHandler implements ClassProcess {
             }
         }
         //判断生产领料单的批次与辅助单位
-        if ("PRD_PickMtrl".equals(formType)) {
+        if ("RECEIPT_PickMtrl".equals(formType)) {
             for (int i = 0; i < fEntityArray.size(); i++) {
-                List<MdMeMaterialbase> materialList = iMdMeMaterialbaseService.list(new LambdaQueryWrapper<MdMeMaterialbase>().eq(MdMeMaterialbase::getMaterial_id, formData.getString("material_id")));
-                MdMeMaterialbase materialInfo = materialList.get(0);
                 JSONObject fEntity = fEntityArray.getJSONObject(i);
+                List<MdMeMaterialbase> materialList = iMdMeMaterialbaseService.list(new LambdaQueryWrapper<MdMeMaterialbase>().eq(MdMeMaterialbase::getMaterial_code,JSON.parseObject(fEntity.getString("FMaterialId")).getString("FNumber") ));
+                MdMeMaterialbase materialInfo = materialList.get(0);
                 //没有启用批次号
                 if ("0".equals(materialInfo.getPrint_no())) {
                     if (fEntity.containsKey("FLot")) {
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
index 3f137487..8e76ad2c 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
@@ -81,7 +81,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void groupDick(JSONObject forms) {
         List<Map> tableData = (List)forms.remove("item");
         if (CollectionUtils.isEmpty(forms)){
@@ -171,6 +171,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
     }
 
     @Override
+    @Transactional
     public void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
         try {
             InputStream inputStream = file.getInputStream();
diff --git a/wms_pro/qd/src/views/wms/md_manage/group_dick/ViewDialog.vue b/wms_pro/qd/src/views/wms/md_manage/group_dick/ViewDialog.vue
index bc902a6b..b7315fb5 100644
--- a/wms_pro/qd/src/views/wms/md_manage/group_dick/ViewDialog.vue
+++ b/wms_pro/qd/src/views/wms/md_manage/group_dick/ViewDialog.vue
@@ -8,45 +8,45 @@
     @close="close"
     @open="open"
   >
-  <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form"  size="mini" label-width="85px" label-suffix=":">
-    <el-form-item label="组盘编码" prop="code">
-      <el-input v-model="form.code" disabled style="width: 150px" />
-    </el-form-item>
-    <el-form-item label="父托盘" prop="parent_vehicle_code">
-      <el-input v-model="form.parent_vehicle_code" disabled  clearable style="width: 150px" />
-    </el-form-item>
-    <el-form-item label="单据状态" prop="bill_status">
-      <el-select
-        v-model="form.status"
-        clearable
-        style="width: 120px"
-        placeholder="单据状态"
-        class="filter-item"
-        disabled
-      >
-        <el-option
-          v-for="item in dict.FORM_STATUS"
-          :key="item.id"
-          :label="item.label"
-          :value="item.value"
-        />
-      </el-select>
-    </el-form-item>
-    <el-form-item label="源单类型" prop="source_form_type">
-      <el-input v-model="form.source_form_type" disabled style="width: 150px" />
-    </el-form-item>
-    <el-form-item label="源单id" prop="source_form_id">
-      <el-input v-model="form.source_form_id" disabled style="width: 150px" />
-    </el-form-item>
-    <template v-for="(col,index) in cols">
-      <el-form-item label="col.lable" prop="bill_code">
-        <label slot="label">{{col.lable}}:</label>
-        <el-input v-model="form.form_data[col.value]" :value="col.value" disabled style="width: 150px" />
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
+      <el-form-item label="组盘编码" prop="code">
+        <el-input v-model="form.code" disabled style="width: 150px" />
+      </el-form-item>
+      <el-form-item label="父托盘" prop="parent_vehicle_code">
+        <el-input v-model="form.parent_vehicle_code" disabled clearable style="width: 150px" />
+      </el-form-item>
+      <el-form-item label="单据状态" prop="bill_status">
+        <el-select
+          v-model="form.status"
+          clearable
+          style="width: 120px"
+          placeholder="单据状态"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in dict.FORM_STATUS"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="源单类型" prop="source_form_type">
+        <el-input v-model="form.source_form_type" disabled style="width: 150px" />
+      </el-form-item>
+      <el-form-item label="源单id" prop="source_form_id">
+        <el-input v-model="form.source_form_id" disabled style="width: 150px" />
+      </el-form-item>
+      <template v-for="(col,index) in cols">
+        <el-form-item label="col.lable" prop="bill_code">
+          <label slot="label">{{ col.lable }}:</label>
+          <el-input v-model="form.form_data[col.value]" :value="col.value" disabled style="width: 150px" />
+        </el-form-item>
+      </template>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" disabled style="width: 380px;" rows="2" type="textarea" />
       </el-form-item>
-    </template>
-    <el-form-item label="备注" prop="remark">
-      <el-input v-model="form.remark" disabled style="width: 380px;" rows="2" type="textarea"  />
-    </el-form-item>
     </el-form>
 
     <div class="crud-opts2">
@@ -65,20 +65,21 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
       >
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column show-overflow-tooltip prop="stor_code"  label="仓库" width="160" align="center" />
+        <el-table-column show-overflow-tooltip prop="stor_code" label="仓库" width="160" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="vehicle_code" label="托盘编号" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="parent_vehicle_code" label="父托盘编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_id" label="物料id" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编号" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
         <el-table-column prop="pcsn" label="批次" width="150" align="center" />
         <el-table-column prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
         <el-table-column prop="frozen_qty" :formatter="crud.formatNum3" label="冻结数" align="center" />
         <el-table-column prop="unit_id" label="单位" align="center" />
-        <el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型"  align="center" />
+        <el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" align="center" />
         <el-table-column show-overflow-tooltip prop="source_form_id" label="源单号" align="center" />
-        <el-table-column show-overflow-tooltip width="150" v-for="(item, index) in dtlCols" :key="item.value"  :label="item.lable" >
-          <template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>
+        <el-table-column v-for="(item, index) in dtlCols" :key="item.value" show-overflow-tooltip width="150" :label="item.lable">
+          <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
         </el-table-column>
         <el-table-column show-overflow-tooltip prop="has_child" label="含子托盘" align="center" />
         <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
@@ -98,8 +99,8 @@ import crudVehicleMater from '@/views/wms/md_manage/vehicleMater/vehicleMater'
 export default {
   name: 'ViewDialog',
   components: { formstruc, crudVehicleMater },
-  mixins: [ crud() ],
-  dicts: [ 'FORM_STATUS' ],
+  mixins: [crud()],
+  dicts: ['FORM_STATUS'],
   props: {
     dialogShow: {
       type: Boolean,
@@ -136,9 +137,9 @@ export default {
       formstruc.getHeader('md_group_dick').then(res => {
         this.cols = res
       }),
-        formstruc.getHeader('md_pb_vehicleMater').then(res => {
-          this.dtlCols = res
-        })
+      formstruc.getHeader('md_pb_vehicleMater').then(res => {
+        this.dtlCols = res
+      })
     },
     setForm(row) {
       this.dialogVisible = true