入库单据管理

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java

@@ -19,7 +19,7 @@ public class InstockInVo {
     private String warehouseId;
 
     @NotNull
-    private String supplierNo;
+    private String supplierId;
 
     @NotNull
     private String inType;

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java

@@ -89,7 +89,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.getSupplierNo());
+        inStockin.setSupplierNo(inStockinVo.getSupplierId());
         inStockin.setInType(inStockinVo.getInType());
         inStockin.setWarehouseId(inStockinVo.getWarehouseId());
         inStockin.setStatus("1");

ruoyi-ui/src/views/in/stockIn/add/index_new.vue

@@ -79,7 +79,7 @@
         </el-table-column>
         <el-table-column label="批号" width="120" align="right">
           <template slot-scope="scope">
-            <el-input-number
+            <el-input
               v-model="scope.row.lotNo"
               controls-position="right"
               required="required"/>