From cbefbf6129b24d70cae05879098ee05b73a0200c Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Sun, 4 Jan 2026 13:34:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=20wms=20=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=8D=95=E6=8D=AE=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CheckStockinController.java | 3 ++- .../controller/InMydoJobController.java | 3 ++- .../controller/OutMydoJobController.java | 3 ++- .../controller/OutStockoutController.java | 3 ++- ruoyi-ui/src/views/check/job/in/index.vue | 2 +- ruoyi-ui/src/views/check/job/out/index.vue | 2 +- ruoyi-ui/src/views/check/stockCheck/index.vue | 2 +- ruoyi-ui/src/views/in/job/index.vue | 2 +- ruoyi-ui/src/views/in/stockIn/index.vue | 19 +++++++------------ ruoyi-ui/src/views/job/outJobManagement.vue | 2 +- ruoyi-ui/src/views/out/outStockoutManage.vue | 2 +- 11 files changed, 21 insertions(+), 22 deletions(-) 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..ce3e427 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 @@ -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 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); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java index cb2a54d..f6ea2d4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java @@ -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 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); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java index baa48bc..7a5e39b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java @@ -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 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); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java index f53e452..dd5563e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java @@ -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 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); diff --git a/ruoyi-ui/src/views/check/job/in/index.vue b/ruoyi-ui/src/views/check/job/in/index.vue index 208fdd6..56bc200 100644 --- a/ruoyi-ui/src/views/check/job/in/index.vue +++ b/ruoyi-ui/src/views/check/job/in/index.vue @@ -248,7 +248,7 @@ export default { pageNum: 1, pageSize: 10, jobId: null, - status: '1', + status: null, onLineType: null, taskNo: null, supplierId: null, diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue index 542d17c..d4d74af 100644 --- a/ruoyi-ui/src/views/check/job/out/index.vue +++ b/ruoyi-ui/src/views/check/job/out/index.vue @@ -182,7 +182,7 @@ export default { pageNum: 1, pageSize: 10, jobId: null, - status: '1', + status: null, onLineType: null, taskNo: null, supplierId: null, diff --git a/ruoyi-ui/src/views/check/stockCheck/index.vue b/ruoyi-ui/src/views/check/stockCheck/index.vue index 461dbb6..27e5c6f 100644 --- a/ruoyi-ui/src/views/check/stockCheck/index.vue +++ b/ruoyi-ui/src/views/check/stockCheck/index.vue @@ -285,7 +285,7 @@ export default { checkType: null, createDate: null, createManId: null, - status: '1', + status: null, warehouseId: null, finishDate: null, erpBill: null, diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue index 620861c..1a53be1 100644 --- a/ruoyi-ui/src/views/in/job/index.vue +++ b/ruoyi-ui/src/views/in/job/index.vue @@ -220,7 +220,7 @@ export default { pageNum: 1, pageSize: 10, jobId: null, - status: '1', + status: null, onLineType: null, taskNo: null, supplierId: null, diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue index 7b2d062..36ebf8b 100644 --- a/ruoyi-ui/src/views/in/stockIn/index.vue +++ b/ruoyi-ui/src/views/in/stockIn/index.vue @@ -116,7 +116,7 @@ - 绑定托盘 - - + 打印条码<!–打印条码–> - --> + >打印条码 + @@ -145,7 +145,6 @@ - - + @@ -296,7 +291,7 @@ import { reviewStockIn, confirmationStockIn } from "@/api/in/stockIn" -import {listStockInDetail, barcodePrinting, bindTray} from "@/api/in/stockInDetail" +import {listStockInDetail, barcodePrinting} from "@/api/in/stockInDetail" import {getLodop} from "@/plugins/LodopFuncs.js" import {listWarehouse} from "@/api/bas/warehouse"; import vueEasyPrint from 'vue-easy-print' diff --git a/ruoyi-ui/src/views/job/outJobManagement.vue b/ruoyi-ui/src/views/job/outJobManagement.vue index 7b4fbbe..283c137 100644 --- a/ruoyi-ui/src/views/job/outJobManagement.vue +++ b/ruoyi-ui/src/views/job/outJobManagement.vue @@ -247,7 +247,7 @@ export default { pageNum: 1, pageSize: 10, // jobId: null, - status: '1', + status: null, onLineType: null, taskNo: null, supplierId: null, diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue index fbe85b8..e98c4c2 100644 --- a/ruoyi-ui/src/views/out/outStockoutManage.vue +++ b/ruoyi-ui/src/views/out/outStockoutManage.vue @@ -472,7 +472,7 @@ export default { productName: null, startDate: null, finishDate: null, - status: '1' + status: null }, // 子表分页参数 detailQueryParams: {