diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue
index f579fe8..32afab4 100644
--- a/ruoyi-ui/src/views/check/create/index.vue
+++ b/ruoyi-ui/src/views/check/create/index.vue
@@ -83,24 +83,45 @@
 
         <el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="物资编号" align="left" prop="productId" />
-          <el-table-column label="物资名称" align="left" prop="productName" />
-          <el-table-column label="数量" align="right" prop="quantity" />
-          <el-table-column label="批号" align="left" prop="lotNo" />
-          <el-table-column label="仓库" align="left" prop="warehouseName" />
-          <el-table-column label="规格" align="left" prop="spare1" />
-          <el-table-column label="单位" align="left" prop="spare3" />
-          <el-table-column label="型号" align="left" prop="spare4" />
-          <el-table-column label="颜色" align="left" prop="spare5" />
-          <el-table-column label="序列号" align="left" prop="spare6" />
-          <el-table-column label="电压" align="left" prop="voltage" />
-          <el-table-column label="功率" align="left" prop="power" />
-          <el-table-column label="相位" align="left" prop="phase" />
-          <el-table-column label="净重" align="left" prop="netWeight" />
-          <el-table-column label="毛重" align="left" prop="grossWeight" />
-          <el-table-column label="分销" align="left" prop="distribution" />
-          <el-table-column label="机型" align="left" prop="model" />
-          <el-table-column label="订单号" align="left" prop="orderId" />
+          <el-table-column label="品号" align="center" prop="productId" />
+          <el-table-column label="NC号" align="center" prop="spare9" />
+          <el-table-column label="品名" align="center" prop="productName" />
+          <el-table-column label="规格" align="center" prop="spec" />
+          <el-table-column label="品号描述" align="center" prop="price" />
+          <el-table-column label="英文描述" align="center" prop="cargoNo" />
+          <el-table-column label="图号" align="center" prop="unit" />
+          <el-table-column label="电压" align="center" prop="spare5" />
+          <el-table-column label="电源线" align="center" prop="spare10" />
+          <el-table-column label="插头" align="center" prop="spare11" />
+          <el-table-column label="接嘴" align="center" prop="spare12" />
+          <el-table-column label="快捷码" align="center" prop="spare13" />
+          <el-table-column label="库存单位编号" align="center" prop="spare14" />
+          <el-table-column label="库存单位名称" align="center" prop="spare15" />
+          <el-table-column label="品号群组" align="center" prop="spare16" />
+          <el-table-column label="归类品" align="center" prop="spare17" />
+          <el-table-column label="计量体系" align="center" prop="spare18" />
+          <el-table-column label="群组名称" align="center" prop="spare19" />
+          <el-table-column label="批号管理" align="center" prop="spare20" />
+          <el-table-column label="状态" align="center" prop="spare21" />
+          <el-table-column label="产品大类" align="center" prop="spare22" />
+          <el-table-column label="产品二类" align="center" prop="spare23" />
+          <el-table-column label="产品线/产品系列" align="center" prop="spare24" />
+          <el-table-column label="BOM状态" align="center" prop="spare25" />
+          <el-table-column label="产品定位" align="center" prop="spare26" />
+          <el-table-column label="电脑板型号" align="center" prop="spare27" />
+          <el-table-column label="非标要求" align="center" prop="spare28" />
+          <el-table-column label="品牌" align="center" prop="spare29" />
+          <el-table-column label="非标颜色" align="center" prop="spare30" />
+          <el-table-column label="主颜色" align="center" prop="spare31" />
+          <el-table-column label="辅助颜色" align="center" prop="spare32" />
+          <el-table-column label="是否标准款" align="center" prop="spare33" />
+          <el-table-column label="包装方式" align="center" prop="spare34" />
+          <el-table-column label="主要包装方式" align="center" prop="spare35" />
+          <el-table-column label="描述" align="center" prop="remark" />
+          <el-table-column label="长" align="center" prop="spare36" />
+          <el-table-column label="宽" align="center" prop="spare37" />
+          <el-table-column label="高" align="center" prop="spare38" />
+          <el-table-column label="包装材积" align="center" prop="spare39" />
         </el-table>
 
         <pagination
@@ -175,24 +196,45 @@
           append-to-body
         >
           <el-table :data="trayDetailList">
-            <el-table-column label="物资编号" align="left" prop="extraField.productId" />
-            <el-table-column label="物资名称" align="left" prop="productName" />
-            <el-table-column label="数量" align="right" prop="quantity" />
-            <el-table-column label="批号" align="left" prop="lotNo" />
-            <el-table-column label="仓库" align="left" prop="warehouseName" />
-            <el-table-column label="规格" align="left" prop="spare1" />
-            <el-table-column label="单位" align="left" prop="spare3" />
-            <el-table-column label="型号" align="left" prop="spare4" />
-            <el-table-column label="颜色" align="left" prop="spare5" />
-            <el-table-column label="序列号" align="left" prop="spare6" />
-            <el-table-column label="电压" align="left" prop="voltage" />
-            <el-table-column label="功率" align="left" prop="power" />
-            <el-table-column label="相位" align="left" prop="phase" />
-            <el-table-column label="净重" align="left" prop="netWeight" />
-            <el-table-column label="毛重" align="left" prop="grossWeight" />
-            <el-table-column label="分销" align="left" prop="distribution" />
-            <el-table-column label="机型" align="left" prop="model" />
-            <el-table-column label="订单号" align="left" prop="orderId" />
+            <el-table-column label="品号" align="center" prop="productId" />
+            <el-table-column label="NC号" align="center" prop="spare9" />
+            <el-table-column label="品名" align="center" prop="productName" />
+            <el-table-column label="规格" align="center" prop="spec" />
+            <el-table-column label="品号描述" align="center" prop="price" />
+            <el-table-column label="英文描述" align="center" prop="cargoNo" />
+            <el-table-column label="图号" align="center" prop="unit" />
+            <el-table-column label="电压" align="center" prop="spare5" />
+            <el-table-column label="电源线" align="center" prop="spare10" />
+            <el-table-column label="插头" align="center" prop="spare11" />
+            <el-table-column label="接嘴" align="center" prop="spare12" />
+            <el-table-column label="快捷码" align="center" prop="spare13" />
+            <el-table-column label="库存单位编号" align="center" prop="spare14" />
+            <el-table-column label="库存单位名称" align="center" prop="spare15" />
+            <el-table-column label="品号群组" align="center" prop="spare16" />
+            <el-table-column label="归类品" align="center" prop="spare17" />
+            <el-table-column label="计量体系" align="center" prop="spare18" />
+            <el-table-column label="群组名称" align="center" prop="spare19" />
+            <el-table-column label="批号管理" align="center" prop="spare20" />
+            <el-table-column label="状态" align="center" prop="spare21" />
+            <el-table-column label="产品大类" align="center" prop="spare22" />
+            <el-table-column label="产品二类" align="center" prop="spare23" />
+            <el-table-column label="产品线/产品系列" align="center" prop="spare24" />
+            <el-table-column label="BOM状态" align="center" prop="spare25" />
+            <el-table-column label="产品定位" align="center" prop="spare26" />
+            <el-table-column label="电脑板型号" align="center" prop="spare27" />
+            <el-table-column label="非标要求" align="center" prop="spare28" />
+            <el-table-column label="品牌" align="center" prop="spare29" />
+            <el-table-column label="非标颜色" align="center" prop="spare30" />
+            <el-table-column label="主颜色" align="center" prop="spare31" />
+            <el-table-column label="辅助颜色" align="center" prop="spare32" />
+            <el-table-column label="是否标准款" align="center" prop="spare33" />
+            <el-table-column label="包装方式" align="center" prop="spare34" />
+            <el-table-column label="主要包装方式" align="center" prop="spare35" />
+            <el-table-column label="描述" align="center" prop="remark" />
+            <el-table-column label="长" align="center" prop="spare36" />
+            <el-table-column label="宽" align="center" prop="spare37" />
+            <el-table-column label="高" align="center" prop="spare38" />
+            <el-table-column label="包装材积" align="center" prop="spare39" />
           </el-table>
           <div slot="footer" class="dialog-footer">
             <el-button @click="trayDetailVisible = false">关闭</el-button>
diff --git a/ruoyi-ui/src/views/in/stockIn/add/index_new.vue b/ruoyi-ui/src/views/in/stockIn/add/index_new.vue
index 8cc1302..ff3e190 100644
--- a/ruoyi-ui/src/views/in/stockIn/add/index_new.vue
+++ b/ruoyi-ui/src/views/in/stockIn/add/index_new.vue
@@ -191,17 +191,45 @@
       <el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
         <el-table-column type="selection" width="55"/>
         <!--      <el-table-column label="主键" align="center" prop="productGuid" />-->
-        <el-table-column label="物料编码" align="left" width="120px" prop="productId" /><!--物料编码-->
-        <el-table-column label="物料名称" align="left" prop="productName" /><!--物料名称-->
-        <el-table-column label="型号" align="left" prop="spare1"/><!--英文描述-->
-        <el-table-column label="颜色" align="center" prop="spare3" /><!--箱号-->
-        <el-table-column label="序列号" align="center" prop="spare4" /><!--包装方式-->
-        <el-table-column label="电压" align="right" prop="spare5" /><!--长MM-->
-        <el-table-column label="功率" align="right" prop="spare6" /><!--宽MM-->
-        <el-table-column label="相位" align="right" prop="spare7" /><!--高MM-->
-        <el-table-column label="净重" align="right" prop="spare2" /><!--单件净重KG-->
-        <el-table-column label="毛重³" align="right" prop="spare8" /><!--体积m³-->
-        <el-table-column label="备注" align="left" prop="remark" /><!--描述-->
+        <el-table-column label="品号" align="center" prop="productId" />
+        <el-table-column label="NC号" align="center" prop="spare9" />
+        <el-table-column label="品名" align="center" prop="productName" />
+        <el-table-column label="规格" align="center" prop="spec" />
+        <el-table-column label="品号描述" align="center" prop="price" />
+        <el-table-column label="英文描述" align="center" prop="cargoNo" />
+        <el-table-column label="图号" align="center" prop="unit" />
+        <el-table-column label="电压" align="center" prop="spare5" />
+        <el-table-column label="电源线" align="center" prop="spare10" />
+        <el-table-column label="插头" align="center" prop="spare11" />
+        <el-table-column label="接嘴" align="center" prop="spare12" />
+        <el-table-column label="快捷码" align="center" prop="spare13" />
+        <el-table-column label="库存单位编号" align="center" prop="spare14" />
+        <el-table-column label="库存单位名称" align="center" prop="spare15" />
+        <el-table-column label="品号群组" align="center" prop="spare16" />
+        <el-table-column label="归类品" align="center" prop="spare17" />
+        <el-table-column label="计量体系" align="center" prop="spare18" />
+        <el-table-column label="群组名称" align="center" prop="spare19" />
+        <el-table-column label="批号管理" align="center" prop="spare20" />
+        <el-table-column label="状态" align="center" prop="spare21" />
+        <el-table-column label="产品大类" align="center" prop="spare22" />
+        <el-table-column label="产品二类" align="center" prop="spare23" />
+        <el-table-column label="产品线/产品系列" align="center" prop="spare24" />
+        <el-table-column label="BOM状态" align="center" prop="spare25" />
+        <el-table-column label="产品定位" align="center" prop="spare26" />
+        <el-table-column label="电脑板型号" align="center" prop="spare27" />
+        <el-table-column label="非标要求" align="center" prop="spare28" />
+        <el-table-column label="品牌" align="center" prop="spare29" />
+        <el-table-column label="非标颜色" align="center" prop="spare30" />
+        <el-table-column label="主颜色" align="center" prop="spare31" />
+        <el-table-column label="辅助颜色" align="center" prop="spare32" />
+        <el-table-column label="是否标准款" align="center" prop="spare33" />
+        <el-table-column label="包装方式" align="center" prop="spare34" />
+        <el-table-column label="主要包装方式" align="center" prop="spare35" />
+        <el-table-column label="描述" align="center" prop="remark" />
+        <el-table-column label="长" align="center" prop="spare36" />
+        <el-table-column label="宽" align="center" prop="spare37" />
+        <el-table-column label="高" align="center" prop="spare38" />
+        <el-table-column label="包装材积" align="center" prop="spare39" />
       </el-table>
       <pagination
         v-show="productTotal>0"