From 592ab99c4972338eee9fe0431a0c60bc4f8855f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?=
 <9290821+guowen-the-cat@user.noreply.gitee.com>
Date: Mon, 15 Sep 2025 16:49:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../in/stockin/domain/vo/InstockInVo.java     |  3 +
 .../service/impl/InStockinServiceImpl.java    |  1 +
 .../src/views/in/stockIn/add/index_new.vue    | 64 +++++++++++++------
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java
index 22db15f..e1a9007 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java
@@ -24,6 +24,9 @@ public class InstockInVo {
     @NotNull
     private String inType;
 
+    @NotNull
+    private String erpBill;
+
 
     private List<BasProduct> productVoList;
 
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 535fd3e..3ec1ef2 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
@@ -90,6 +90,7 @@ public class InStockinServiceImpl implements IInStockinService
         inStockin.setCreateManId(Convert.toStr(SecurityUtils.getUserId()));
         inStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
         inStockin.setSupplierNo(inStockinVo.getSupplierId());
+        inStockin.setErpBill(inStockinVo.getErpBill());
         inStockin.setInType(inStockinVo.getInType());
         inStockin.setWarehouseId(inStockinVo.getWarehouseId());
         inStockin.setStatus("1");
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 1e9b850..899d9ab 100644
--- a/ruoyi-ui/src/views/in/stockIn/add/index_new.vue
+++ b/ruoyi-ui/src/views/in/stockIn/add/index_new.vue
@@ -6,18 +6,18 @@
       </div>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="6">
-            <el-form-item label="仓库" prop="warehouseId">
-              <el-select v-model="form.warehouseId" placeholder="请选择仓库">
-                <el-option
-                  v-for="item in warehouseOptions"
-                  :key="item.warehouseId"
-                  :label="item.warehouseName"
-                  :value="item.warehouseId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="仓库" prop="warehouseId">-->
+<!--              <el-select v-model="form.warehouseId" placeholder="请选择仓库">-->
+<!--                <el-option-->
+<!--                  v-for="item in warehouseOptions"-->
+<!--                  :key="item.warehouseId"-->
+<!--                  :label="item.warehouseName"-->
+<!--                  :value="item.warehouseId"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="6">
             <el-form-item label="供应商" prop="supplierId">
               <el-input
@@ -28,7 +28,11 @@
                />
             </el-form-item>
           </el-col>
-
+          <el-col :span="6">
+            <el-form-item label="订单号" prop="erpBill">
+              <el-input v-model="form.erpBill" placeholder="请输入订单号"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" placeholder="请输入备注"/>
@@ -85,6 +89,22 @@
               required="required"/>
           </template>
         </el-table-column>
+        <el-table-column label="机型" width="120" align="right">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.unit"
+              controls-position="right"
+              required="required"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="分销" width="120" align="right">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.spare9"
+              controls-position="right"
+              required="required"/>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="100" align="center">
           <template slot-scope="scope">
             <el-button
@@ -232,6 +252,7 @@ export default {
         supplierId: undefined,
         supplierName: undefined,
         remark: undefined,
+        erpBill:undefined,
         totalQuantity: 0,
         // totalAmount: 0,
         totalNetWeight:0,
@@ -241,8 +262,8 @@ export default {
       },
       // 表单校验
       rules: {
-        warehouseId: [
-          {required: true, message: "请选择仓库", trigger: "change"}
+        erpBill: [
+          {required: true, message: "请输入订单号", trigger: "change"}
         ],
         supplierId: [
           {required: true, message: "请选择供应商", trigger: "change"}
@@ -426,7 +447,7 @@ export default {
         parentId: item.parentId,
         price: item.price,
         cargoNo: item.cargoNo,
-        unit: item.unit,
+        unit: "",
         spec: item.spec,
         remark: item.remark,
         productName: item.productName,
@@ -439,6 +460,7 @@ export default {
         spare6: item.spare6,
         spare7: item.spare7,
         spare8: item.spare8,
+        spare9:"",
         lotNo:"",
         totalNetWeight: 0,
         netWeight: 0,
@@ -481,17 +503,18 @@ export default {
             return;
           }
           //校验lotNo productGuid quantity 不能为空
-          if (this.productList.some(item =>  !item.productGuid || !item.quantity|| !item.lotNo)) {
+          if (this.productList.some(item =>  !item.productGuid || !item.quantity|| !item.lotNo||!item.spare9||!item.unit)) {
             this.$modal.msgError('入库物料信息不完整');
             return;
           }
 
           // 构建请求数据
           const data = {
-            warehouseId: this.form.warehouseId,
+            warehouseId: "01",
             supplierId: this.form.supplierId,
             remark: this.form.remark,
             inType:"1",
+            erpBill:this.form.erpBill,
             productVoList: this.productList.map(item => ({
               productId: item.productId,
               quantity: item.quantity,
@@ -505,12 +528,11 @@ export default {
               spare6: item.spare6,
               spare7: item.spare7,
               spare8: item.spare8,
+              spare9: item.spare9,
+              unit:item.unit,
               productName: item.productName
             }))
           };
-
-          // 提交收货单
-          console.log(data)
           addStockinNew(data).then(() => {
             this.$modal.msgSuccess('添加成功');
             // 重置表单数据