From 2369a74dd4e8e916e30b564b91b05ade6464a279 Mon Sep 17 00:00:00 2001 From: escapemoon <18834580489@163.com> Date: Mon, 15 Dec 2025 15:03:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=92=8C=E4=BB=B7=E6=A0=BC=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=BC=98=E5=8C=96=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=92=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AE=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bas/BasProduct/domain/BasProduct.java | 6 +-- .../controller/CheckStockinController.java | 2 +- .../CheckStockinDetailController.java | 2 +- .../controller/InStockinController.java | 2 +- .../controller/InStockinDetailController.java | 2 +- .../stockindetail/domain/InStockinDetail.java | 7 ++++ .../controller/ReceiveStockinController.java | 2 +- .../ReceiveStockinDetailController.java | 2 +- ruoyi-ui/src/views/bas/basProduct/index.vue | 8 ++-- ruoyi-ui/src/views/check/create/index.vue | 4 +- ruoyi-ui/src/views/in/job/index.vue | 12 +++--- ruoyi-ui/src/views/in/receive/add/index.vue | 2 +- .../src/views/in/stockIn/add/index_new.vue | 37 ++++++++++++++----- ruoyi-ui/src/views/in/stockIn/index.vue | 8 ++-- .../src/views/search/StockSummary/index.vue | 6 +-- 15 files changed, 64 insertions(+), 38 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 296a901..82dd795 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 @@ -32,11 +32,11 @@ public class BasProduct extends BaseEntity private String productId; /** 产品分类 */ - @Excel(name = "常用编码") + @Excel(name = "产品分类") private String parentId; - /** 品号描述 */ - @Excel(name = "单价") + /** 价格 */ + @Excel(name = "价格") private String price; /** 英文描述 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java index ac8d8cb..93601ba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java @@ -43,7 +43,7 @@ public class CheckStockinController extends BaseController { startPage(); List list = new ArrayList<>(); - if (Convert.toInt(checkStockin.getStatus())<4){ + if (Convert.toInt(checkStockin.getStatus(), 0) < 4){ list = checkStockinService.selectCheckStockinList(checkStockin); }else { list = checkStockinFinishService.selectCheckStockinList(checkStockin); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java index c2a2bd7..ef44a41 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java @@ -42,7 +42,7 @@ public class CheckStockinDetailController extends BaseController { startPage(); List list = new ArrayList<>(); - if (Convert.toInt(checkStockinDetail.getStatus())<4){ + if (Convert.toInt(checkStockinDetail.getStatus(), 0) < 4){ list = checkStockinDetailService.selectCheckStockinDetailList(checkStockinDetail); }else { list = checkStockinDetailFinishService.selectCheckStockinDetailList(checkStockinDetail); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java index 29ad349..1bbe14f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java @@ -50,7 +50,7 @@ public class InStockinController extends BaseController { startPage(); List list = new ArrayList<>(); - if (Convert.toInt(inStockin.getStatus())<4){ + if (Convert.toInt(inStockin.getStatus(), 0) < 4){ list = inStockinService.selectInStockinList(inStockin); }else { list = inStockinFinishService.selectInStockinFinishListByInStockin(inStockin); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java index 93f11fb..b9d6a8b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java @@ -43,7 +43,7 @@ public class InStockinDetailController extends BaseController { startPage(); List list = new ArrayList<>(); - if (Convert.toInt(inStockinDetail.getStatus())<4){ + if (Convert.toInt(inStockinDetail.getStatus(), 0) < 4){ list = inStockinDetailService.selectInStockinDetailList(inStockinDetail); }else { list = inStockinDetailFinishService.selectInStockinDetailList(inStockinDetail); 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 fb71624..894fa9a 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 @@ -153,5 +153,12 @@ public class InStockinDetail extends BaseEntity private String warehouseName; private String warehouseId; + /** 物料名称 */ + @Excel(name = "物料名称") + private String productName; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String supplierName; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/controller/ReceiveStockinController.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/controller/ReceiveStockinController.java index 4b8816f..b6195ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/controller/ReceiveStockinController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/controller/ReceiveStockinController.java @@ -48,7 +48,7 @@ public class ReceiveStockinController extends BaseController { startPage(); List list = new ArrayList<>() ; - if (Convert.toInt(receiveStockin.getStatus())<1){ + if (Convert.toInt(receiveStockin.getStatus(), 0) < 1){ list = receiveStockinService.selectReceiveStockinList(receiveStockin); }else { list = receiveStockinFinishService.selectReceiveStockinList(receiveStockin); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/controller/ReceiveStockinDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/controller/ReceiveStockinDetailController.java index 2df542b..e4e7b1e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/controller/ReceiveStockinDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/controller/ReceiveStockinDetailController.java @@ -43,7 +43,7 @@ public class ReceiveStockinDetailController extends BaseController { startPage(); List list = new ArrayList<>(); - if (Convert.toInt(receiveStockinDetail.getStatus())<1){ + if (Convert.toInt(receiveStockinDetail.getStatus(), 0) < 1){ list = receiveStockinDetailService.selectReceiveStockinDetailList(receiveStockinDetail); }else { list =receiveStockinDetailFinishService.selectReceiveStockinDetailList(receiveStockinDetail); diff --git a/ruoyi-ui/src/views/bas/basProduct/index.vue b/ruoyi-ui/src/views/bas/basProduct/index.vue index 6cec3c4..1cd439a 100644 --- a/ruoyi-ui/src/views/bas/basProduct/index.vue +++ b/ruoyi-ui/src/views/bas/basProduct/index.vue @@ -113,11 +113,11 @@ - + - - + + diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue index 3338753..0e7ea87 100644 --- a/ruoyi-ui/src/views/check/create/index.vue +++ b/ruoyi-ui/src/views/check/create/index.vue @@ -82,7 +82,7 @@ - + - +