From ecb2fe17229f0212ca05b0a39645ab2f092c519d Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Mon, 20 Oct 2025 10:26:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=20=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=20=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=AF=B9=E5=BA=94=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BD=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bas/BasProduct/domain/BasProduct.java     |  2 +
 .../service/impl/InStockinServiceImpl.java    |  3 +-
 .../stockindetail/domain/InStockinDetail.java |  2 +
 .../mapper/in/InStockinDetailFinishMapper.xml |  4 +-
 .../mapper/in/InStockinDetailMapper.xml       |  6 +--
 .../src/views/in/stockIn/add/index_new.vue    | 52 ++++++++++++-------
 ruoyi-ui/src/views/in/stockIn/index.vue       |  5 +-
 7 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
index 383df92..0a4a5e3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
@@ -217,5 +217,7 @@ public class BasProduct extends BaseEntity
 
     private String updateId;
 
+    private String supplierId;
+
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
index 6143a8a..2b34a99 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
@@ -102,7 +102,7 @@ public class InStockinServiceImpl implements IInStockinService
         inStockin.setCreateDate(DateUtil.formatDateTime(DateUtil.date()));
         inStockin.setCreateManId(Convert.toStr(SecurityUtils.getUserId()));
         inStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
-        inStockin.setSupplierNo(inStockinVo.getSupplierId());
+        //inStockin.setSupplierNo(inStockinVo.getSupplierId());
         inStockin.setErpBill(inStockinVo.getErpBill());
         inStockin.setInType(inStockinVo.getInType());
         inStockin.setWarehouseId(inStockinVo.getWarehouseId());
@@ -112,6 +112,7 @@ public class InStockinServiceImpl implements IInStockinService
         for (int i = 1; i <= productVoList.size(); i++) {
             BasProduct basProduct = productVoList.get(i-1);
             InStockinDetail inStockinDetail = new InStockinDetail();
+            inStockinDetail.setSupplierId(basProduct.getSupplierId());
             BeanUtil.copyProperties(basProduct,inStockinDetail);
             inStockinDetail.setStockinGuid(inStockin.getStockinGuid());
             inStockinDetail.setStockinDetailId(inStockin.getStockinId()+"-"+i);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
index 7a20124..8291daa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
@@ -97,6 +97,8 @@ public class InStockinDetail extends BaseEntity
     /** 供应商编码 */
     @Excel(name = "供应商编码")
     private String supplierId;
+    @Excel(name = "供应商名称")
+    private String supplierName;
 
     /** 客户编码 */
     @Excel(name = "客户编码")
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
index faf7b44..818dda7 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="scanNumX"    column="scan_num_x"    />
         <result property="scanNumJ"    column="scan_num_j"    />
         <result property="productName"    column="product_name"    />
+        <result property="supplierName"    column="supplier_name"    />
 
         <!--<association property="extraField" javaType="ExtraField">
             <result property="productId"    column="product_id"    />
@@ -95,9 +96,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
             isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
             bp.product_name,
-            isd.spare7,isd.spare8,isd.spare9
+            isd.spare7,isd.spare8,isd.spare9,bs.supplier_name
         from in_stockin_detail_finish isd
                  left join bas_product bp on bp.product_id = isd.product_id
+                 left join bas_supplier bs on bs.supplier_no = isd.supplier_id
     </sql>
 
     <select id="selectInStockinDetailFinishList" parameterType="InStockinDetailFinish" resultMap="InStockinDetailFinishResult">
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
index 59f283f..5797f3c 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="warehouseId"    column="warehouse_id"    />
         <result property="productName"    column="product_name"    />
+        <result property="supplierName"    column="supplier_name"    />
 <!--        <association property="extraField" javaType="ExtraField">-->
 <!--            <result property="productId"    column="product_id"    />-->
 <!--            <result property="materialDesc"    column="product_name"    />-->
@@ -61,9 +62,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
             isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
             bp.product_name,
-            isd.spare7,isd.spare8,isd.spare9
+            isd.spare7,isd.spare8,isd.spare9,bs.supplier_name
         from in_stockin_detail isd
         left join bas_product bp on bp.product_id = isd.product_id
+        left join bas_supplier bs on bs.supplier_no = isd.supplier_id
     </sql>
 
     <select id="selectInStockinDetailList" parameterType="InStockinDetail" resultMap="InStockinDetailResult">
@@ -138,7 +140,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
             <if test="spare9 != null">spare9,</if>
-            <if test="spec != null">spec,</if>
             <if test="scanNum != null">scan_num,</if>
             <if test="scanNumX != null">scan_num_x,</if>
             <if test="scanNumJ != null">scan_num_j,</if>
@@ -174,7 +175,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare7 != null">#{spare7},</if>
             <if test="spare8 != null">#{spare8},</if>
             <if test="spare9 != null">#{spare9},</if>
-            <if test="spec != null">#{spec},</if>
             <if test="scanNum != null">#{scanNum},</if>
             <if test="scanNumX != null">#{scanNumX},</if>
             <if test="scanNumJ != null">#{scanNumJ},</if>
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 8940dd9..1ab8f4e 100644
--- a/ruoyi-ui/src/views/in/stockIn/add/index_new.vue
+++ b/ruoyi-ui/src/views/in/stockIn/add/index_new.vue
@@ -41,14 +41,7 @@
             </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>
@@ -71,8 +64,18 @@
 
       <el-table :data="productList" border style="width: 100%">
         <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 fixed label="物料编码" align="left" prop="productId"  />
+        <el-table-column fixed label="物料名称" align="left" prop="productName" />
+        <el-table-column label="供应商" align="left" prop="supplierId">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.supplierName"
+              placeholder="请选择供应商"
+              @click.native="openSupplierSelectorForRow(scope.row, scope.$index)"
+              readonly
+            />
+          </template>
+        </el-table-column>
         <el-table-column label="规格型号" align="left" prop="spec" />
         <el-table-column label="生产图号" align="left" prop="cargoNo" />
         <el-table-column label="单位" align="left" prop="unit" />
@@ -349,10 +352,8 @@ export default {
           {required: true, message: "请选择供应商", trigger: "change"}
         ],
         inType:[
-          {required: true, message: "请选择单据类型", trigger: "change"}
+          {required: true, message: "请选择形态类型", trigger: "change"}
         ]
-
-
       },
       // 仓库选项
       warehouseOptions: [],
@@ -364,6 +365,10 @@ export default {
       supplierList: [],
       // 选中的供应商
       selectedSupplier: null,
+      // 当前操作的行
+      currentRow: null,
+      // 当前操作的行索引
+      currentRowIndex: null,
       // 供应商总数
       supplierTotal: 0,
       // 供应商加载状态
@@ -449,8 +454,10 @@ export default {
       });
     },
 
-    /** 打开供应商选择对话框 */
-    openSupplierSelector() {
+    /** 打开供应商选择对话框（表格行） */
+    openSupplierSelectorForRow(row, index) {
+      this.currentRowIndex = index;
+      this.currentRow = row;
       this.getSupplierListForDialog();
       this.supplierDialog = true;
     },
@@ -490,9 +497,14 @@ export default {
         this.$modal.msgError("请选择一个供应商");
         return;
       }
-      this.form.supplierId = this.selectedSupplier.supplierNo;
-      this.form.supplierName = this.selectedSupplier.supplierName;
+      if (this.currentRow) {
+        // 为表格行设置供应商
+        this.currentRow.supplierId = this.selectedSupplier.supplierNo;
+        this.currentRow.supplierName = this.selectedSupplier.supplierName;
+      }
       this.supplierDialog = false;
+      this.currentRow = null;
+      this.currentRowIndex = null;
     },
 
     /** 取消选择供应商 */
@@ -651,7 +663,11 @@ export default {
               spare8: item.spare8,
               spare9: item.spare9,
               unit:item.unit,
-              productName: item.productName
+              productName: item.productName,
+              price: item.price,
+              spec : item.spec,
+              cargoNo: item.cargoNo,
+              supplierId: item.supplierId,
             }))
           };
           addStockinNew(data).then(() => {
diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue
index ab75325..67bd927 100644
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -151,7 +151,6 @@
         </template>
       </el-table-column>
       <el-table-column label="仓库" align="left" prop="warehouseName"/><!--仓库-->
-      <el-table-column label="供应商" align="left" prop="supplierName"/><!--供应商-->
       <el-table-column label="创建人" align="left" prop="createManName"/><!--创建人-->
       <el-table-column label="部门" align="left" prop="departmentName"/><!--部门-->
       <el-table-column label="建立时间" align="left" prop="createDate"/><!--建立时间-->
@@ -172,6 +171,7 @@
       <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="supplierName"/><!--供应商-->
       <el-table-column label="规格型号" align="left" prop="spec" />
       <el-table-column label="生产图号" align="left" prop="cargoNo" />
       <el-table-column label="单位" align="left" prop="unit" />
@@ -198,7 +198,7 @@
       <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="lotNo"/>
       <el-table-column label="单价" align="left" prop="price"/>
       <el-table-column label="管理号" align="left" prop="spare9"/>
       <el-table-column label="计划数量" align="right" prop="quantity"/><!--计划数量-->
@@ -210,6 +210,7 @@
         </template>
       </el-table-column>
 
+
     </el-table>
     <pagination
       v-show="detailTotal>0"