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

2026-01-04 13:34:46 +08:00
parent b80ec1a6b9
commit cbefbf6129
11 changed files with 21 additions and 22 deletions
--- 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<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);
--- 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<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);
--- 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<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);
--- 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<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);
--- 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,
--- 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,
--- 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,
--- 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,
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -116,7 +116,7 @@
      </el-col>
      <el-col :span="1.5">

-        <el-button
+<!--        <el-button
          type="info"
          plain
          icon="el-icon-download"
@@ -125,8 +125,8 @@
          @click="bindTrayCode"
          v-hasPermi="['in:stockIn:barcodePrinting']"
        >绑定托盘
-        </el-button>
-<!--        <el-button
+        </el-button>-->
+        <el-button
          type="info"
          plain
          icon="el-icon-download"
@@ -134,8 +134,8 @@
          :disabled="detailMultiple"
          @click="handleBarcodePrinting"
          v-hasPermi="['in:stockIn:barcodePrinting']"
-        >打印条码&lt;!&ndash;打印条码&ndash;&gt;
-        </el-button>-->
+        >打印条码<!--打印条码-->
+        </el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
@@ -145,7 +145,6 @@
      <el-table-column type="selection" width="55" align="center"/>
      <el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
      <el-table-column label="入库订单" align="left" prop="stockinId" width="150"/><!--入库订单-->
-      <el-table-column label="订单号" align="left" prop="erpBill"  width="150"/><!--入库订单-->
      <el-table-column label="入库类型" align="left" prop="inType"><!--入库类型-->
        <template slot-scope="scope">
          <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
@@ -161,11 +160,7 @@
          <dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
        </template>
      </el-table-column>
-<!--      <el-table-column label="形态类型" align="left" prop="spare1">&lt;!&ndash;形态类型&ndash;&gt;
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.product_type" :value="scope.row.spare1"/>
-        </template>
-      </el-table-column>-->
+      <el-table-column label="上位单号" align="left" prop="erpBill"  width="150"/><!--入库订单-->
      <el-table-column label="仓库" align="left" prop="warehouseName"/><!--仓库-->
      <el-table-column label="创建人" align="left" prop="createManName"/><!--创建人-->
      <el-table-column label="部门" align="left" prop="departmentName"/><!--部门-->
@@ -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'
--- 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,
--- 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: {