diff --git a/ruoyi-ui/src/views/bas/basProduct/index.vue b/ruoyi-ui/src/views/bas/basProduct/index.vue
index ff87d4d..2c3ff51 100644
--- a/ruoyi-ui/src/views/bas/basProduct/index.vue
+++ b/ruoyi-ui/src/views/bas/basProduct/index.vue
@@ -200,7 +200,7 @@
       <el-table-column label="库存上限" align="center" prop="spare5" />
       <el-table-column label="库存下限" align="center" prop="spare6" />
       <el-table-column label="单价" align="center" prop="price" />
-      <el-table-column label="备注" align="center" prop="remak" />
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <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 b50ccd0..8940dd9 100644
--- a/ruoyi-ui/src/views/in/stockIn/add/index_new.vue
+++ b/ruoyi-ui/src/views/in/stockIn/add/index_new.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div>
       <div class="page-header">
-        <span>新建入库</span>
+        <span>单据信息</span>
       </div>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
@@ -12,13 +12,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="供应商" prop="supplierId">
-              <el-input
-                 v-model="form.supplierName"
-                 placeholder="请选择供应商"
-                 @click.native="openSupplierSelector"
-                 readonly
-               />
+            <el-form-item label="形态类型" prop="inType"><!--形态类型-->
+              <el-select v-model="form.productType" placeholder="请选择形态类型" >
+                <el-option
+                  v-for="dict in dict.type.product_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -33,13 +35,21 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="4">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" placeholder="请输入备注"/>
             </el-form-item>
           </el-col>
-
+          <el-col :span="4">
+            <el-form-item label="供应商" prop="supplierId">
+              <el-input
+                 v-model="form.supplierName"
+                 placeholder="请选择供应商"
+                 @click.native="openSupplierSelector"
+                 readonly
+               />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </div>
@@ -60,112 +70,106 @@
       </div>
 
       <el-table :data="productList" border style="width: 100%">
-        <el-table-column type="index" label="序号" width="50" align="center"/>
-        <!--      <el-table-column label="主键" align="center" prop="productGuid" />-->
-        <el-table-column fixed label="物料编码" align="left" prop="productId"  />
-        <el-table-column fixed label="物料名称" align="left" prop="productName" />
-        <el-table-column  label="型号" align="left">
+        <el-table-column type="index" label="序号" align="center"/>
+        <el-table-column label="物料编码" align="left" prop="productId"  />
+        <el-table-column label="物料名称" align="left" prop="productName" />
+        <el-table-column label="规格型号" align="left" prop="spec" />
+        <el-table-column label="生产图号" align="left" prop="cargoNo" />
+        <el-table-column label="单位" align="left" prop="unit" />
+        <el-table-column label="单价" align="left" prop="price" />
+        <el-table-column label="来源" align="left" prop="spare1" >
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.spare1"
-              controls-position="right"
-              required="required"/>
+            <el-select v-model="scope.row.spare1" placeholder="请选择来源" >
+              <el-option
+                v-for="dict in dict.type.origin_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="净重" align="right">
+        <el-table-column label="状态" align="left" prop="spare2" >
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.spare2"
-              controls-position="right"
-              required="required"/>
+            <el-select v-model="scope.row.spare2" placeholder="请选择状态" >
+              <el-option
+                v-for="dict in dict.type.turnover_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="颜色" align="left">
+        <el-table-column label="套账" align="left" prop="spare3" >
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.spare3"
-              controls-position="right"
-              required="required"/>
+            <el-select v-model="scope.row.spare3" placeholder="请选择套账" >
+              <el-option
+                v-for="dict in dict.type.account_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="序列号" align="left">
+        <el-table-column label="用途" align="left" prop="spare4" >
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.spare4"
-              controls-position="right"
-              required="required"/>
+            <el-select v-model="scope.row.spare4" placeholder="请选择用途" >
+              <el-option
+                v-for="dict in dict.type.purpose_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="电压" align="right">
+        <el-table-column label="台次" align="left" prop="spare5">
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.spare5"
-              controls-position="right"
-              required="required"/>
+            <el-input v-model="scope.row.spare5" placeholder="请输入台次"></el-input>
           </template>
         </el-table-column>
-        <el-table-column label="功率" align="right">
+        <el-table-column label="合同号" align="left" prop="spare6">
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.spare6"
-              controls-position="right"
-              required="required"/>
+            <el-input v-model="scope.row.spare6" placeholder="请输入合同号"></el-input>
           </template>
         </el-table-column>
-        <el-table-column label="相位" align="right">
+        <el-table-column label="件次" align="left" prop="spare7" >
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.spare7"
-              controls-position="right"
-              required="required"/>
+            <el-input v-model="scope.row.spare7" placeholder="请输入件次"></el-input>
           </template>
         </el-table-column>
-        <el-table-column label="毛重" align="right">
+        <el-table-column label="批次" align="left" prop="lotNo" >
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.spare8"
-              controls-position="right"
-              required="required"/>
+            <el-input v-model="scope.row.lotNo" placeholder="请输入批次"></el-input>
           </template>
         </el-table-column>
-        <el-table-column label="数量" width="120" align="right">
+        <el-table-column label="单价" align="left" prop="price" >
           <template slot-scope="scope">
-            <el-input-number
-              v-model="scope.row.quantity"
-              :min="1"
-              controls-position="right"
-              required="required"/>
+            <el-input v-model="scope.row.price" placeholder="请输入单价"></el-input>
           </template>
         </el-table-column>
-        <el-table-column label="批号" width="120" align="right">
+        <el-table-column label="管理号" align="left" prop="spare9" >
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.lotNo"
-              controls-position="right"
-              required="required"/>
+            <el-input v-model="scope.row.spare9" placeholder="请输入管理号"></el-input>
           </template>
         </el-table-column>
-        <el-table-column label="机型" width="120" align="right">
+        <el-table-column label="数量" align="left" prop="quantity" >
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.unit"
-              controls-position="right"
-              required="required"/>
+            <el-input v-model="scope.row.quantity" placeholder="请输入数量"></el-input>
           </template>
         </el-table-column>
-        <el-table-column label="分销" width="120" align="right">
+        <el-table-column label="质量" align="left" prop="spare8">
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.spare9"
-              controls-position="right"
-              required="required"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="描述" align="left" prop="remark">
-          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.remark"
-              controls-position="right"/>
+            <el-select v-model="scope.row.spare8" placeholder="请选择质量" >
+                <el-option
+                  v-for="dict in dict.type.quality_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
           </template>
         </el-table-column>
         <el-table-column label="操作" width="100" align="center">
@@ -191,45 +195,29 @@
       <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="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-column label="物料编码" align="center" prop="productId" />
+        <el-table-column label="物料名称" align="center" prop="productName" />
+        <el-table-column label="规格型号" align="center" prop="spec" />
+        <el-table-column label="图号" align="center" prop="cargoNo" />
+        <el-table-column label="常用编码" align="center" prop="parentId" />
+        <el-table-column label="物料状态" align="center" prop="spare1" />
+        <el-table-column label="单位" align="center" prop="unit" />
+        <el-table-column label="启用标识" align="center" prop="spare7" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.spare7"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否系统项" align="center" prop="spare2" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.spare2"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="spare3" />
+        <el-table-column label="创建用户" align="center" prop="spare4" />
+        <el-table-column label="库存上限" align="center" prop="spare5" />
+        <el-table-column label="库存下限" align="center" prop="spare6" />
+        <el-table-column label="单价" align="center" prop="price" />
+        <el-table-column label="备注" align="center" prop="remak" />
       </el-table>
       <pagination
         v-show="productTotal>0"
@@ -334,7 +322,7 @@ import {listWarehouse} from "@/api/bas/warehouse"
 
 export default {
   name: "InAdd",
-  dicts: ['sys_normal_disable', 'is_active', 'storage_cond', 'is_available','in_bill_type'],
+  dicts: ['sys_normal_disable', 'is_active', 'storage_cond', 'is_available','in_bill_type','product_type','origin_type','account_type','turnover_type','purpose_type','quality_type'],
   data() {
     return {
       // 表单参数
@@ -539,22 +527,13 @@ export default {
       const newProducts = this.selectedProducts.map(item => ({
         productGuid: item.productGuid,
         productId: item.productId,
-        parentId: item.parentId,
         price: item.price,
         cargoNo: item.cargoNo,
-        unit: "",
+        unit: item.unit,
         spec: item.spec,
-        remark: item.remark,
+        // remark: item.remark,
         productName: item.productName,
         quantity: 1,
-        spare1: item.spare1,
-        spare2: item.spare2,
-        spare3: item.spare3,
-        spare4: item.spare4,
-        spare5: item.spare5,
-        spare6: item.spare6,
-        spare7: item.spare7,
-        spare8: item.spare8,
         spare9:"",
         lotNo:"",
         totalNetWeight: 0,
diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue
index 9cf92f6..ab75325 100644
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -172,21 +172,43 @@
       <el-table-column label="主单ID" align="left" prop="stockinId" width="160"/><!--主单ID-->
       <el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
       <el-table-column label="物料名称" align="left" prop="productName" width="160"/><!--物料编码-->
-      <el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
-      <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
-      <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
-      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
-      <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
-      <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
-      <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="spare7"/><!--相位-->
-      <el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
+      <el-table-column label="规格型号" align="left" prop="spec" />
+      <el-table-column label="生产图号" align="left" prop="cargoNo" />
+      <el-table-column label="单位" align="left" prop="unit" />
+      <el-table-column label="来源" align="left" prop="spare1"><!--来源-->
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.origin_type" :value="scope.row.spare1"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="left" prop="spare2">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.turnover_type" :value="scope.row.spare2"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="套账" align="left" prop="spare3"><!--套账-->
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="用途" align="left" prop="spare4"><!--用途-->
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.purpose_type" :value="scope.row.spare4"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="台次" align="left" prop="spare5"/>
+      <el-table-column label="合同号" align="left" prop="spare6"/>
+      <el-table-column label="件次" align="left" prop="spare7"/>
+      <el-table-column label="批次" align="left" prop="spare8"/>
+      <el-table-column label="单价" align="left" prop="price"/>
+      <el-table-column label="管理号" align="left" prop="spare9"/>
       <el-table-column label="计划数量" align="right" prop="quantity"/><!--计划数量-->
       <el-table-column label="扫码数量" align="right" prop="scanNum"/><!--扫码数量-->
       <el-table-column label="实际数量" align="right" prop="assignNum"/><!--实际数量-->
+      <el-table-column label="质量" align="left" prop="spare8"><!--用途-->
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
+        </template>
+      </el-table-column>
 
     </el-table>
     <pagination
@@ -230,7 +252,7 @@ import VueQr from 'vue-qr'
 
 export default {
   name: "StockIn",
-  dicts: ['bill_resource', 'in_bill_status', 'in_bill_type','bill_resource'],
+  dicts: ['bill_resource', 'in_bill_status', 'in_bill_type','bill_resource','product_type','origin_type','account_type','turnover_type','purpose_type','quality_type'],
   components: {
     vueEasyPrint,
     VueQr