lhq/FT542-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 更新产品分类和价格字段名称，优化状态判断逻辑，添加物料和供应商名称字段，优化入库新增单据供应商选择

Browse Source
This commit is contained in:
escapemoon
2025-12-15 15:03:35 +08:00
parent 2fd2e66138
commit 2369a74dd4
15 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
View File

@@ -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;
/** 英文描述 */

2
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java
View File

@@ -43,7 +43,7 @@ public class CheckStockinController extends BaseController
{
startPage();
List<CheckStockin> 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);

2
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java
View File

@@ -42,7 +42,7 @@ public class CheckStockinDetailController extends BaseController
{
startPage();
List<CheckStockinDetail> 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);

2
ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java
View File

@@ -50,7 +50,7 @@ public class InStockinController extends BaseController
{
startPage();
List<InStockin> 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);

2
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java
View File

@@ -43,7 +43,7 @@ public class InStockinDetailController extends BaseController
{
startPage();
List<InStockinDetail> 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);

7
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
View File

@@ -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;
}

2
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/controller/ReceiveStockinController.java
View File

@@ -48,7 +48,7 @@ public class ReceiveStockinController extends BaseController
{
startPage();
List<ReceiveStockin> 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);

2
ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/controller/ReceiveStockinDetailController.java
View File

@@ -43,7 +43,7 @@ public class ReceiveStockinDetailController extends BaseController
{
startPage();
List<ReceiveStockinDetail> 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);