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

现场 wms 去除固定单据 任务状态

Browse Source
This commit is contained in:
liuhanqing
2026-01-04 13:34:46 +08:00
parent b80ec1a6b9
commit cbefbf6129
11 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package com.ruoyi.check.stockcheck.controller;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.check.stockcheck.domain.CheckStockVo;
import com.ruoyi.check.stockcheck.domain.CheckStockin;
import com.ruoyi.check.stockcheck.service.ICheckStockinService;
@@ -43,7 +44,7 @@ public class CheckStockinController extends BaseController
{
startPage();
List<CheckStockin> list = new ArrayList<>();
if (Convert.toInt(checkStockin.getStatus())<4){
if (StrUtil.isEmpty(checkStockin.getStatus()) || Convert.toInt(checkStockin.getStatus())<4){
list = checkStockinService.selectCheckStockinList(checkStockin);
}else {
list = checkStockinFinishService.selectCheckStockinList(checkStockin);

3
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.job.mydojob.controller;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -41,7 +42,7 @@ public class InMydoJobController extends BaseController
startPage();
List<MydoJob> list = null;
//mydoJob.setInOut("1");
if(Integer.parseInt(mydoJob.getStatus())<4) {
if( StrUtil.isEmpty(mydoJob.getStatus()) ||Integer.parseInt(mydoJob.getStatus())<4) {
list = mydoJobService.selectMydoJobList(mydoJob);
}else{
list= mydoJobFinishService.selectMydoJobFinishListByMydoJob(mydoJob);

3
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.job.mydojob.controller;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,7 +37,7 @@ public class OutMydoJobController extends BaseController {
{
startPage();
List<MydoJob> list;
if(Integer.parseInt(mydoJob.getStatus())<4) {
if(StrUtil.isEmpty(mydoJob.getStatus()) || Integer.parseInt(mydoJob.getStatus())<4) {
list = mydoJobService.selectMydoJobList(mydoJob);
}else{
list=mydoJobFinishService.selectMydoJobFinishListByMydoJob(mydoJob);

3
ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.out.outStockout.controller;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -40,7 +41,7 @@ public class OutStockoutController extends BaseController {
public TableDataInfo list(OutStockout outStockout) {
startPage();
List<OutStockout> list = new ArrayList<>();
if(Integer.parseInt(outStockout.getStatus())<4){
if(StrUtil.isEmpty(outStockout.getStatus()) ||Integer.parseInt(outStockout.getStatus())<4){
list =outStockoutService.selectOutStockoutList(outStockout);
}else{
list=outStockoutFinishService.selectOutStockoutFinishListByOutStockout(outStockout);