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 f52b4f2..22db15f 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 @@ -19,7 +19,7 @@ public class InstockInVo { private String warehouseId; @NotNull - private String supplierNo; + private String supplierId; @NotNull private String inType; 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 c6d24b1..535fd3e 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 @@ -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"); 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 3c8acd2..1e9b850 100644 --- a/ruoyi-ui/src/views/in/stockIn/add/index_new.vue +++ b/ruoyi-ui/src/views/in/stockIn/add/index_new.vue @@ -79,7 +79,7 @@