diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
index 275576c..22da080 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
@@ -12,7 +12,10 @@ import com.ruoyi.api.domain.RequestEnterResponse;
 import com.ruoyi.api.domain.WmsJobRequest;
 import com.ruoyi.api.service.IToWcsService;
 import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
+import com.ruoyi.bas.cargoSpace.domain.BasCargoSpaceWeight;
 import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
+import com.ruoyi.bas.weightRule.domain.BasCargoSpaceWeightRule;
+import com.ruoyi.bas.weightRule.service.IBasCargoSpaceWeightRuleService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.job.mydojob.domain.MydoJob;
@@ -50,8 +53,13 @@ public class ToWcsServiceImpl implements IToWcsService {
     @Autowired
     private PdaService pdaService;
 
-    public static final String PUSH_OUT_MYDO_JOB = "http://localhost:10012/wcs2Wms/api/receiveOutMydoJob";
-    public static final String CANCEL_MYDOJOB = "http://localhost:10012/wcs2Wms/api/cancelMydoJob";
+    @Autowired
+    private IBasCargoSpaceWeightRuleService basCargoSpaceWeightRuleService;
+
+    public static final String PUSH_OUT_MYDO_JOB_1 = "http://172.19.50.70:10012/wcs2Wms/api/receiveOutMydoJob";
+    public static final String PUSH_OUT_MYDO_JOB_2 = "http://172.19.40.46:10012/wcs2Wms/api/receiveOutMydoJob";
+    public static final String CANCEL_MYDOJOB_1 = "http://172.19.50.70:10012/wcs2Wms/api/cancelMydoJob";
+    public static final String CANCEL_MYDOJOB_2 = "http://172.19.40.46:10012/wcs2Wms/api/cancelMydoJob";
 
 
     @Override
@@ -67,12 +75,22 @@ public class ToWcsServiceImpl implements IToWcsService {
         mydoJobParam.setInOutIds(list);
         List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
         for (MydoJob outMydoJob : outMydoJobs) {
-            RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB, JSONUtil.toJsonStr(outMydoJob), "推送出库任务");
-            if ("1".equals(requestLog.getIsSuccessful())){
-                outMydoJob.setStatus("3");
-                outMydoJob.setExecutionPhase("1");
-                outMydoJob.setStartTime(DateUtil.formatDateTime(new Date()));
-                mydoJobService.updateMydoJob(outMydoJob);
+            if ("01".equals(outMydoJob.getWarehouseId())){
+                RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB_1, JSONUtil.toJsonStr(outMydoJob), "推送出库任务");
+                if ("1".equals(requestLog.getIsSuccessful())){
+                    outMydoJob.setStatus("3");
+                    outMydoJob.setExecutionPhase("1");
+                    outMydoJob.setStartTime(DateUtil.formatDateTime(new Date()));
+                    mydoJobService.updateMydoJob(outMydoJob);
+                }
+            }else if ("02".equals(outMydoJob.getWarehouseId())){
+                RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB_2, JSONUtil.toJsonStr(outMydoJob), "推送出库任务");
+                if ("1".equals(requestLog.getIsSuccessful())){
+                    outMydoJob.setStatus("3");
+                    outMydoJob.setExecutionPhase("1");
+                    outMydoJob.setStartTime(DateUtil.formatDateTime(new Date()));
+                    mydoJobService.updateMydoJob(outMydoJob);
+                }
             }
         }
     }
@@ -82,8 +100,8 @@ public class ToWcsServiceImpl implements IToWcsService {
     public AjaxResult cancelTaskByTaskNo(String taskNo) {
         Map<String,String> map = new HashMap<>();
         map.put("taskNo", taskNo);
-        RequestLog requestLog = requestLogService.getRequestLog(CANCEL_MYDOJOB, JSONUtil.toJsonStr(map), "取消任务");
-        if ("1".equals(requestLog.getIsSuccessful())){
+        RequestLog requestLog = requestLogService.getRequestLog(CANCEL_MYDOJOB_1, JSONUtil.toJsonStr(map), "取消任务");
+        if ("1".equals(requestLog.getIsSuccessful())) {
             return AjaxResult.success();
         }
         return AjaxResult.error(requestLog.getErrorDetails());
@@ -98,9 +116,18 @@ public class ToWcsServiceImpl implements IToWcsService {
         if (requestEnter.getHeight()==0) {
             return AjaxResult.error("未检测到入库高度");
         }
-        /*if (requestEnter.getWeight() ==0){
+        if (requestEnter.getWeight() ==0){
             return AjaxResult.error("未检测到入库重量");
-        }*/
+        }
+        if (StrUtil.isEmpty(requestEnter.getRoadwayId())){
+            return AjaxResult.error("巷道参数不能为空");
+        }
+        if (StrUtil.isEmpty(requestEnter.getWarehouseId())){
+            return AjaxResult.error("仓库参数不能为空");
+        }
+        if (StrUtil.isEmpty(requestEnter.getTrayCode())){
+            return AjaxResult.error("托盘参数不能为空");
+        }
 
         log.info("扫码内容{}，入库高度{}", requestEnter.getTrayCode(), requestEnter.getHeight());
 
@@ -135,11 +162,29 @@ public class ToWcsServiceImpl implements IToWcsService {
             }else {
                 basCargoSpaceParam.setCargoHight("1519");
             }
-            //查找货位
-            BasCargoSpace basCargoSpace = basCargoSpaceService.selectEmptyCargoSpaceByWarehouseId(basCargoSpaceParam);
+            //按 重量规则 查找货位
+            BasCargoSpaceWeightRule weightParam = new BasCargoSpaceWeightRule();
+            weightParam.setWarehouseId(requestEnter.getWarehouseId());
+            weightParam.setRoadwayId(requestEnter.getRoadwayId());
+            weightParam.setSpare1(requestEnter.getHeight().toString());
+            BasCargoSpaceWeightRule basCargoSpaceWeightRule = basCargoSpaceWeightRuleService.selectBasCargoSpaceWeightRuleByWarehouseIdAndRoadwayId(weightParam);
+            BasCargoSpace basCargoSpace = null;
+            if (basCargoSpaceWeightRule!=null){
+                basCargoSpaceParam.setTheFloor(Convert.toLong(basCargoSpaceWeightRule.getFloor()));
+                if (requestEnter.getWeight()>= Convert.toDouble(basCargoSpaceWeightRule.getWeight())){
+                    basCargoSpaceParam.setRule1("1");
+                    basCargoSpace = basCargoSpaceService.selectEmptyCargoSpaceByWarehouseId(basCargoSpaceParam);
+                }else {
+                    basCargoSpaceParam.setRule2("1");
+                    basCargoSpace = basCargoSpaceService.selectEmptyCargoSpaceByWarehouseId(basCargoSpaceParam);
+                }
+            }
             if (ObjUtil.isNull(basCargoSpace)){
                 //去除排的条件 再次查询货位
                 basCargoSpaceParam.setThePlatoon(null);
+                basCargoSpaceParam.setRule1(null);
+                basCargoSpaceParam.setRule2(null);
+                basCargoSpaceParam.setTheFloor(null);
                 basCargoSpace = basCargoSpaceService.selectEmptyCargoSpaceByWarehouseId(basCargoSpaceParam);
                 if (ObjUtil.isNull(basCargoSpace)){
                     return AjaxResult.error("没有空货位");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java
index fce6d1a..10825e1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java
@@ -104,4 +104,8 @@ Y锁、N开 */
     private String spare7;
 
     private String stockStatus;
+
+    private String rule1;
+
+    private String rule2;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java
index 53bf2da..b0ce643 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java
@@ -45,7 +45,7 @@ public class BasCargoSpaceServiceImpl extends ServiceImpl<BasCargoSpaceMapper,Ba
      * @return 库存信息
      */
     @Override
-    @DataScope(warehouseAlias = "bw")
+    //@DataScope(warehouseAlias = "bw")
     public List<BasCargoSpace> selectBasCargoSpaceList(BasCargoSpace basCargoSpace)
     {
         return basCargoSpaceMapper.selectBasCargoSpaceList(basCargoSpace);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
index b17e8d5..76537e0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
@@ -72,9 +72,12 @@ public class CheckStockinServiceImpl implements ICheckStockinService
      * @return 盘库单据主信息
      */
     @Override
-    @DataScope(warehouseAlias = "bw")
+    //@DataScope(warehouseAlias = "bw")
     public List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin)
     {
+        /*if (!"admin".equals(SecurityUtils.getUsername())){
+            checkStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
+        }*/
         return checkStockinMapper.selectCheckStockinList(checkStockin);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/service/impl/CheckStockinFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/service/impl/CheckStockinFinishServiceImpl.java
index 5781c0d..c736f52 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/service/impl/CheckStockinFinishServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/service/impl/CheckStockinFinishServiceImpl.java
@@ -1,10 +1,12 @@
 package com.ruoyi.check.stockcheckfinish.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import com.ruoyi.check.stockcheck.domain.CheckStockin;
 import com.ruoyi.check.stockcheckfinish.domain.CheckStockinFinish;
 import com.ruoyi.check.stockcheckfinish.mapper.CheckStockinFinishMapper;
 import com.ruoyi.check.stockcheckfinish.service.ICheckStockinFinishService;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -95,8 +97,11 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
     }
 
     @Override
-    @DataScope(warehouseAlias = "bw")
+    //@DataScope(warehouseAlias = "bw")
     public List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin) {
+        /*if (!"admin".equals(SecurityUtils.getUsername())){
+            checkStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
+        }*/
         return checkStockinFinishMapper.selectCheckStockinList(checkStockin);
     }
 }
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 0d1b21f..72df758 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
@@ -6,6 +6,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockin.domain.vo.InstockInVo;
@@ -42,7 +43,7 @@ public class InStockinController extends BaseController
     public TableDataInfo list(InStockin inStockin)
     {
         startPage();
-        List<InStockin> list = new ArrayList<>();
+        List<InStockin> list;
         if (inStockin.getStatus()==null || Convert.toInt(inStockin.getStatus())<4){
             list = inStockinService.selectInStockinList(inStockin);
         }else {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
index 396f236..e29254e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
@@ -59,9 +59,12 @@ public class InStockinServiceImpl implements IInStockinService
      * @return 入库单据
      */
     @Override
-    @DataScope(warehouseAlias = "is2")
+    //@DataScope(warehouseAlias = "is2")
     public List<InStockin> selectInStockinList(InStockin inStockin)
     {
+        /*if (!"admin".equals(SecurityUtils.getUsername())){
+            inStockin.setDepartmentNo(cn.hutool.core.convert.Convert.toStr(SecurityUtils.getDeptId()));
+        }*/
         return inStockinMapper.selectInStockinList(inStockin);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java
index 1763b66..af30d42 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java
@@ -121,7 +121,7 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
     }
 
     @Override
-    @DataScope(warehouseAlias = "ist")
+    //@DataScope(warehouseAlias = "ist")
     public InStockinDetail selectStockinByDetailById(InStockinDetail inStockinDetail) {
 
         return   inStockinDetailMapper.selectStockinByDetailById(inStockinDetail);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java
index d6bef4c..acbd8ed 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.in.stockinfinish.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
 import com.ruoyi.in.stockinfinish.mapper.InStockinFinishMapper;
@@ -95,8 +97,11 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
     }
 
     @Override
-    @DataScope(warehouseAlias = "is2")
+    //@DataScope(warehouseAlias = "is2")
     public List<InStockin> selectInStockinFinishListByInStockin(InStockin inStockin) {
+        /*if (!"admin".equals(SecurityUtils.getUsername())){
+            inStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
+        }*/
         return inStockinFinishMapper.selectInStockinFinishListByInStockin(inStockin);
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index a41bdea..19b79a5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -17,6 +17,7 @@ import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
 import com.ruoyi.check.stockcheckdetail.service.ICheckStockinDetailService;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.in.erp.service.ITransferBillCallbackService;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
@@ -103,8 +104,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
      * @return 任务表
      */
     @Override
-    @DataScope(warehouseAlias = "bw")
+    //@DataScope(warehouseAlias = "bw")
     public List<MydoJob> selectMydoJobList(MydoJob mydoJob) {
+        if (!"admin".equals(SecurityUtils.getUsername())){
+            mydoJob.setDepartmentId(Convert.toStr(SecurityUtils.getDeptId()));
+        }
         return mydoJobMapper.selectMydoJobList(mydoJob);
     }
 
@@ -221,9 +225,6 @@ public class MydoJobServiceImpl implements IMydoJobService {
             //插入历史表
             insertHistory(mydoJob.getJobId());
         }
-        //通知wcs
-        AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
-        log.info("取消任务结果：{}", ajaxResult);
         return AjaxResult.success();
     }
 
@@ -351,6 +352,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
                 basCargoSpace.setStatus("2");
                 basCargoSpace.setTrayCode(mydoJob.getTrayCode());
                 basCargoSpace.setCargoSpaceId(mydoJob.getCargoSpaceId());
+                basCargoSpace.setTheType(mydoJob.getLineId());
                 basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
 
                 //插入库存信息
@@ -376,6 +378,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
 
             for (MydoJobDetail mydoJobDetail : mydoJobDetails) {
                 BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1");
+                stockByInStockinDetail.setModel(mydoJob.getDepartmentId());
                 list.add(stockByInStockinDetail);
 
             }
@@ -383,6 +386,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
             basStockService.insertBasStockList(list);
             //修改货位状态
             basCargoSpace.setStatus("2");
+            basCargoSpace.setTheType(mydoJob.getLineId());
             basCargoSpace.setTrayCode(mydoJob.getTrayCode());
             basCargoSpace.setCargoSpaceId(mydoJob.getCargoSpaceId());
             basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
@@ -582,8 +586,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
         //插入历史表
         insertHistory(mydoJob.getJobId());
         //通知wcs
-        AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
-        log.info("取消任务结果：{}", ajaxResult);
+        /*AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
+        log.info("取消任务结果：{}", ajaxResult);*/
         return AjaxResult.success();
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java
index 4b3fe54..ad01992 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java
@@ -1,7 +1,9 @@
 package com.ruoyi.job.mydojobfinish.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.job.mydojob.domain.MydoJob;
 import com.ruoyi.job.mydojobfinish.domain.MydoJobFinish;
 import com.ruoyi.job.mydojobfinish.mapper.MydoJobFinishMapper;
@@ -48,8 +50,11 @@ public class MydoJobFinishServiceImpl implements IMydoJobFinishService
     }
 
     @Override
-    @DataScope(warehouseAlias = "bw")
+    //@DataScope(warehouseAlias = "bw")
     public List<MydoJob> selectMydoJobFinishListByMydoJob(MydoJob mydoJob) {
+        if (!"admin".equals(SecurityUtils.getUsername())){
+            mydoJob.setDepartmentId(Convert.toStr(SecurityUtils.getDeptId()));
+        }
         return mydoJobFinishMapper.selectMydoJobFinishListByMydoJob(mydoJob);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java
index 622b4f6..f0598fc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java
@@ -1,6 +1,10 @@
 package com.ruoyi.out.handAllotStock.service.impl;
 
 import java.util.List;
+
+import cn.hutool.core.convert.Convert;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.out.handAllotStock.mapper.ViewHandAllotStockMapper;
@@ -9,19 +13,19 @@ import com.ruoyi.out.handAllotStock.service.IViewHandAllotStockService;
 
 /**
  * 手动分配库存Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-09-16
  */
 @Service
-public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService 
+public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService
 {
     @Autowired
     private ViewHandAllotStockMapper viewHandAllotStockMapper;
 
     /**
      * 查询手动分配库存
-     * 
+     *
      * @param stockId 手动分配库存主键
      * @return 手动分配库存
      */
@@ -33,19 +37,23 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService
 
     /**
      * 查询手动分配库存列表
-     * 
+     *
      * @param viewHandAllotStock 手动分配库存
      * @return 手动分配库存
      */
     @Override
+    //@DataScope(warehouseAlias = "vhat")
     public List<ViewHandAllotStock> selectViewHandAllotStockList(ViewHandAllotStock viewHandAllotStock)
     {
+        if (!"admin".equals(SecurityUtils.getUsername())){
+            viewHandAllotStock.setModel(Convert.toStr(SecurityUtils.getDeptId()));
+        }
         return viewHandAllotStockMapper.selectViewHandAllotStockList(viewHandAllotStock);
     }
 
     /**
      * 新增手动分配库存
-     * 
+     *
      * @param viewHandAllotStock 手动分配库存
      * @return 结果
      */
@@ -57,7 +65,7 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService
 
     /**
      * 修改手动分配库存
-     * 
+     *
      * @param viewHandAllotStock 手动分配库存
      * @return 结果
      */
@@ -69,7 +77,7 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService
 
     /**
      * 批量删除手动分配库存
-     * 
+     *
      * @param stockIds 需要删除的手动分配库存主键
      * @return 结果
      */
@@ -81,7 +89,7 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService
 
     /**
      * 删除手动分配库存信息
-     * 
+     *
      * @param stockId 手动分配库存主键
      * @return 结果
      */
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 dd5563e..a4f8274 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,11 +1,13 @@
 package com.ruoyi.out.outStockout.controller;
 
+import cn.hutool.core.convert.Convert;
 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;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.out.outStockout.domain.OutStockout;
 import com.ruoyi.out.outStockout.domain.OutStockoutVo;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
index 33b5901..e7a6b4e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
@@ -1,11 +1,13 @@
 package com.ruoyi.out.outStockout.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.ruoyi.api.service.IToWcsService;
 import com.ruoyi.bas.basJobId.service.IBasJobIdService;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.out.outStockout.domain.OutStockout;
 import com.ruoyi.out.outStockout.domain.OutStockoutVo;
@@ -67,6 +69,9 @@ public class OutStockoutServiceImpl implements IOutStockoutService
     @Override
     public List<OutStockout> selectOutStockoutList(OutStockout outStockout)
     {
+        /*if (!"admin".equals(SecurityUtils.getUsername())){
+            outStockout.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
+        }*/
         return outStockoutMapper.selectOutStockoutList(outStockout);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
index fbd51db..cfeb939 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
@@ -11,6 +11,7 @@ import com.ruoyi.check.commit.service.ICheckCommitRecordService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.MessageUtils;
 
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
 import com.ruoyi.job.mydojob.domain.MydoJob;
@@ -247,6 +248,7 @@ public class PdaServiceImp implements PdaService {
         HashMap<String, Object> map = new HashMap<>();
         map.put("v_tray_code", trayCodeMsg.getTrayCode());
         map.put("v_warehouse_id", trayCodeMsg.getWarehouseId());
+        map.put("v_dept_id", SecurityUtils.getDeptId().toString());
         pdaMapper.ktpin(map);
         String result = map.get("v_result").toString();
         if ("10".equals(result)){
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/trayMsg/service/impl/TrayMsgServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/trayMsg/service/impl/TrayMsgServiceImpl.java
index 3848984..8570cf5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/trayMsg/service/impl/TrayMsgServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/trayMsg/service/impl/TrayMsgServiceImpl.java
@@ -40,7 +40,7 @@ public class TrayMsgServiceImpl implements ITrayMsgService
      * @return trayMsg
      */
     @Override
-    @DataScope(warehouseAlias = "w")
+    //@DataScope(warehouseAlias = "w")
     public List<TrayMsg> selectTrayMsgList(TrayMsg trayMsg)
     {
         return trayMsgMapper.selectTrayMsgList(trayMsg);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java
index 5949730..ee4dca5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java
@@ -78,7 +78,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
      * @return 收货单据
      */
     @Override
-    @DataScope(warehouseAlias = "rs")
+    //@DataScope(warehouseAlias = "rs")
     public List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin)
     {
         return receiveStockinMapper.selectReceiveStockinList(receiveStockin);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java
index 1d00001..cf7f422 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java
@@ -95,7 +95,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
     }
 
     @Override
-    @DataScope(warehouseAlias = "rs")
+    //@DataScope(warehouseAlias = "rs")
     public List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin) {
         return receiveStockinFinishMapper.selectReceiveStockinList(receiveStockin);
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java
index f9452a2..33b148d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java
@@ -40,7 +40,7 @@ public class StockSummaryServiceImpl implements IStockSummaryService
      * @return 库存汇总
      */
     @Override
-    @DataScope(warehouseAlias = "bw")
+    //@DataScope(warehouseAlias = "bw")
     public List<StockSummary> selectStockSummaryList(StockSummary stockSummary)
     {
         return stockSummaryMapper.selectStockSummaryList(stockSummary);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java
index 29ceda1..aaf4df7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java
@@ -41,7 +41,7 @@ public class ViewFlatWarehouseInFlowServiceImpl implements IViewFlatWarehouseInF
      * @return 平库入库流水
      */
     @Override
-    @DataScope(warehouseAlias = "vfwif")
+    //@DataScope(warehouseAlias = "vfwif")
     public List<ViewFlatWarehouseInFlow> selectViewFlatWarehouseInFlowList(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow)
     {
         return viewFlatWarehouseInFlowMapper.selectViewFlatWarehouseInFlowList(viewFlatWarehouseInFlow);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java
index 1233edd..069b683 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java
@@ -41,7 +41,7 @@ public class ViewFlatWarehouseOutFlowServiceImpl implements IViewFlatWarehouseOu
      * @return 平库出库流水
      */
     @Override
-    @DataScope(warehouseAlias = "vfwof")
+    //@DataScope(warehouseAlias = "vfwof")
     public List<ViewFlatWarehouseOutFlow> selectViewFlatWarehouseOutFlowList(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow)
     {
         return viewFlatWarehouseOutFlowMapper.selectViewFlatWarehouseOutFlowList(viewFlatWarehouseOutFlow);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
index ea4aa97..7684bdb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
@@ -14,6 +14,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class ViewInJobFlow extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
+    /** 仓库编码 */
+    @Excel(name = "仓库编码")
+    private String warehouseId;
 
     /** 子任务编码 */
     @Excel(name = "子任务编码")
@@ -22,6 +25,13 @@ public class ViewInJobFlow extends BaseEntity
     /** 任务编码 */
     @Excel(name = "任务编码")
     private String jobId;
+    /** 入库单 */
+    @Excel(name = "入库单")
+    private String inOrOutId;
+
+    /** 入库子单 */
+    @Excel(name = "入库子单")
+    private String inOrOutDId;
 
     /** 任务号 */
     @Excel(name = "任务号")
@@ -35,26 +45,30 @@ public class ViewInJobFlow extends BaseEntity
     @Excel(name = "任务类型",dictType = "in_job_type")
     private Long inOrOut;
 
+
+
+
+
+    /** 入口 */
+    //@Excel(name = "入口")
+    private String entranceId;
+
+    /** 合同号 */
+    @Excel(name = "合同号")
+    private String contract;
+    /** 产品号 */
+    @Excel(name = "产品号")
+    private String cases;
+    /** 代号 */
+    @Excel(name = "代号")
+    private String managementNo;
+    /** 台次 */
+    @Excel(name = "台次")
+    private String units;
     /** 托盘条码 */
     @Excel(name = "托盘条码")
     private String trayCode;
 
-    /** 开始时间 */
-    @Excel(name = "开始时间")
-    private String startTime;
-
-    /** 结束时间 */
-    @Excel(name = "结束时间")
-    private String finishTime;
-
-    /** 入口 */
-    @Excel(name = "入口")
-    private String entranceId;
-
-    /** 仓库编码 */
-    @Excel(name = "仓库编码")
-    private String warehouseId;
-
     /** 物料编码 */
     @Excel(name = "物料编码")
     private String productId;
@@ -62,110 +76,103 @@ public class ViewInJobFlow extends BaseEntity
     /** 物料名称 */
     @Excel(name = "物料名称")
     private String productName;
-
-    /** 常用码 */
-    @Excel(name = "常用码")
-    private String parentId;
-
-    /** 单价 */
-    @Excel(name = "单价")
-    private String price;
-
-    /** 图号 */
-    @Excel(name = "图号")
-    private String cargoNo;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String unit;
-
     /** 规格 */
     @Excel(name = "规格")
     private String spec;
-
-    /** 物料类型 */
-    @Excel(name = "物料类型",dictType = "product_type")
-    private String productType;
-
-    /** 是否系统项 */
-    @Excel(name = "是否系统项",dictType = "sys_yes_no")
-    private String systemItem;
-
-    /** 创建时间 */
-    @Excel(name = "创建时间")
-    private String productCtm;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    private String productCtu;
-
-    /** 库存上限 */
-    @Excel(name = "库存上限")
-    private String upperNum;
-
-    /** 库存下限 */
-    @Excel(name = "库存下限")
-    private String limitNum;
-
-    /** 是否启用 */
-    @Excel(name = "是否启用",dictType = "sys_yes_no")
-    private String enableFlag;
-
     /** 入库数量 */
     @Excel(name = "入库数量")
     private String inQuantity;
+    /** 开始时间 */
+    @Excel(name = "开始时间")
+    private String startTime;
+
+    /** 结束时间 */
+    @Excel(name = "结束时间")
+    private String finishTime;
+    /** 常用码 */
+    //@Excel(name = "常用码")
+    private String parentId;
+
+    /** 单价 */
+    //@Excel(name = "单价")
+    private String price;
+
+    /** 图号 */
+    //@Excel(name = "图号")
+    private String cargoNo;
+
+    /** 单位 */
+    //@Excel(name = "单位")
+    private String unit;
+
+
+
+    /** 物料类型 */
+    //@Excel(name = "物料类型",dictType = "product_type")
+    private String productType;
+
+    /** 是否系统项 */
+    //@Excel(name = "是否系统项",dictType = "sys_yes_no")
+    private String systemItem;
+
+    /** 创建时间 */
+   // @Excel(name = "创建时间")
+    private String productCtm;
+
+    /** 创建人 */
+    //@Excel(name = "创建人")
+    private String productCtu;
+
+    /** 库存上限 */
+    //@Excel(name = "库存上限")
+    private String upperNum;
+
+    /** 库存下限 */
+    //@Excel(name = "库存下限")
+    private String limitNum;
+
+    /** 是否启用 */
+    //@Excel(name = "是否启用",dictType = "sys_yes_no")
+    private String enableFlag;
+
+
 
     /** 批次号 */
-    @Excel(name = "批次号")
+    //@Excel(name = "批次号")
     private String lotNo;
 
-    /** 入库单 */
-    @Excel(name = "入库单")
-    private String inOrOutId;
 
-    /** 入库子单 */
-    @Excel(name = "入库子单")
-    private String inOrOutDId;
 
     /** 入库金额 */
-    @Excel(name = "入库金额")
+    //@Excel(name = "入库金额")
     private String priceTotal;
 
     /** 来源 */
-    @Excel(name = "来源",dictType = "origin_type")
+    //@Excel(name = "来源",dictType = "origin_type")
     private String origin;
 
     /** 周转类型 */
-    @Excel(name = "周转类型",dictType = "turnover_type")
+   // @Excel(name = "周转类型",dictType = "turnover_type")
     private String turnovertype;
 
     /** 套账 */
-    @Excel(name = "套账",dictType = "account_type")
+   // @Excel(name = "套账",dictType = "account_type")
     private String account;
 
     /** 用途 */
-    @Excel(name = "用途",dictType = "purpose_type")
+    //@Excel(name = "用途",dictType = "purpose_type")
     private String purpose;
 
-    /** 台次 */
-    @Excel(name = "台次")
-    private String units;
 
-    /** 合同号 */
-    @Excel(name = "合同号")
-    private String contract;
 
-    /** 件次 */
-    @Excel(name = "件次")
-    private String cases;
+
+
 
     /** 质量 */
-    @Excel(name = "质量",dictType = "quality_type")
+    //@Excel(name = "质量",dictType = "quality_type")
     private String quality;
 
-    /** 管理号 */
-    @Excel(name = "管理号")
-    private String managementNo;
+
 
     public void setJobDetailId(String jobDetailId)
     {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java
index 7e9dd46..99ec28b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.search.ViewInJobFlow.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -10,19 +12,19 @@ import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService;
 
 /**
  * 入库作业流水Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-10-28
  */
 @Service
-public class ViewInJobFlowServiceImpl implements IViewInJobFlowService 
+public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
 {
     @Autowired
     private ViewInJobFlowMapper viewInJobFlowMapper;
 
     /**
      * 查询入库作业流水
-     * 
+     *
      * @param jobDetailId 入库作业流水主键
      * @return 入库作业流水
      */
@@ -34,11 +36,12 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
 
     /**
      * 查询入库作业流水列表
-     * 
+     *
      * @param viewInJobFlow 入库作业流水
      * @return 入库作业流水
      */
     @Override
+    //@DataScope(warehouseAlias = "vijf")
     public List<ViewInJobFlow> selectViewInJobFlowList(ViewInJobFlow viewInJobFlow)
     {
         return viewInJobFlowMapper.selectViewInJobFlowList(viewInJobFlow);
@@ -46,7 +49,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
 
     /**
      * 新增入库作业流水
-     * 
+     *
      * @param viewInJobFlow 入库作业流水
      * @return 结果
      */
@@ -59,7 +62,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
 
     /**
      * 修改入库作业流水
-     * 
+     *
      * @param viewInJobFlow 入库作业流水
      * @return 结果
      */
@@ -71,7 +74,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
 
     /**
      * 批量删除入库作业流水
-     * 
+     *
      * @param jobDetailIds 需要删除的入库作业流水主键
      * @return 结果
      */
@@ -83,7 +86,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService
 
     /**
      * 删除入库作业流水信息
-     * 
+     *
      * @param jobDetailId 入库作业流水主键
      * @return 结果
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
index 5ca1115..efc4c84 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
@@ -15,6 +15,9 @@ public class ViewOutJobFlow extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 仓库编码 */
+    @Excel(name = "仓库编码")
+    private String warehouseId;
     /** 子任务 */
     @Excel(name = "子任务")
     private String jobDetailId;
@@ -22,6 +25,13 @@ public class ViewOutJobFlow extends BaseEntity
     /** 任务编码 */
     @Excel(name = "任务编码")
     private String jobId;
+    /** 单据编码 */
+    @Excel(name = "单据编码")
+    private String inOrOutId;
+
+    /** 子单据编码 */
+    @Excel(name = "子单据编码")
+    private String inOrOutDId;
 
     /** 任务号 */
     @Excel(name = "任务号")
@@ -34,27 +44,21 @@ public class ViewOutJobFlow extends BaseEntity
     /** 任务类型 */
     @Excel(name = "任务类型",dictType = "out_job_type")
     private Long inOrOut;
-
+    /** 合同号 */
+    @Excel(name = "合同号")
+    private String contract;
+    /** 产品号 */
+    @Excel(name = "产品号")
+    private String cases;
+    /** 代号 */
+    @Excel(name = "代号")
+    private String managementNo;
+    /** 台次 */
+    @Excel(name = "台次")
+    private String units;
     /** 托盘码 */
     @Excel(name = "托盘码")
     private String trayCode;
-
-    /** 开始时间 */
-    @Excel(name = "开始时间")
-    private String startTime;
-
-    /** 结束时间 */
-    @Excel(name = "结束时间")
-    private String finishTime;
-
-    /** 出口 */
-    @Excel(name = "出口")
-    private String exitId;
-
-    /** 仓库编码 */
-    @Excel(name = "仓库编码")
-    private String warehouseId;
-
     /** 物料编码 */
     @Excel(name = "物料编码")
     private String productId;
@@ -63,109 +67,105 @@ public class ViewOutJobFlow extends BaseEntity
     @Excel(name = "物料名称")
     private String productName;
 
+
+
+    /** 出口 */
+    //@Excel(name = "出口")
+    private String exitId;
+
+
+
     /** 常用编码 */
-    @Excel(name = "常用编码")
+    //@Excel(name = "常用编码")
     private String parentId;
 
     /** 单价 */
-    @Excel(name = "单价")
+    //@Excel(name = "单价")
     private String price;
 
     /** 图号 */
-    @Excel(name = "图号")
+    //@Excel(name = "图号")
     private String cargoNo;
 
     /** 单位 */
-    @Excel(name = "单位")
+    //@Excel(name = "单位")
     private String unit;
 
     /** 规格 */
     @Excel(name = "规格")
     private String spec;
-
-    /** 物料类型 */
-    @Excel(name = "物料类型",dictType = "product_type")
-    private String productType;
-
-    /** 是否系统项 */
-    @Excel(name = "是否系统项",dictType = "sys_yes_no")
-    private String systemItem;
-
-    /** 物料创建时间 */
-    @Excel(name = "物料创建时间")
-    private String productCtm;
-
-    /** 物料创建人 */
-    @Excel(name = "物料创建人")
-    private String productCtu;
-
-    /** 库存上限 */
-    @Excel(name = "库存上限")
-    private String upperNum;
-
-    /** 库存下限 */
-    @Excel(name = "库存下限")
-    private String limitNum;
-
-    /** 是否可用 */
-    @Excel(name = "是否可用",dictType = "sys_yes_no")
-    private String enableFlag;
-
     /** 出库数量 */
     @Excel(name = "出库数量")
     private String outQuantity;
+    /** 开始时间 */
+    @Excel(name = "开始时间")
+    private String startTime;
+
+    /** 结束时间 */
+    @Excel(name = "结束时间")
+    private String finishTime;
+
+    /** 物料类型 */
+    //@Excel(name = "物料类型",dictType = "product_type")
+    private String productType;
+
+    /** 是否系统项 */
+    //@Excel(name = "是否系统项",dictType = "sys_yes_no")
+    private String systemItem;
+
+    /** 物料创建时间 */
+   // @Excel(name = "物料创建时间")
+    private String productCtm;
+
+    /** 物料创建人 */
+    //@Excel(name = "物料创建人")
+    private String productCtu;
+
+    /** 库存上限 */
+    //@Excel(name = "库存上限")
+    private String upperNum;
+
+    /** 库存下限 */
+    //@Excel(name = "库存下限")
+    private String limitNum;
+
+    /** 是否可用 */
+    //@Excel(name = "是否可用",dictType = "sys_yes_no")
+    private String enableFlag;
+
+
 
     /** 批次号 */
-    @Excel(name = "批次号")
+    //@Excel(name = "批次号")
     private String lotNo;
 
-    /** 单据编码 */
-    @Excel(name = "单据编码")
-    private String inOrOutId;
 
-    /** 子单据编码 */
-    @Excel(name = "子单据编码")
-    private String inOrOutDId;
 
     /** 金额 */
-    @Excel(name = "金额")
+    //@Excel(name = "金额")
     private String priceTotal;
 
     /** 来源 */
-    @Excel(name = "来源",dictType = "origin_type")
+    //@Excel(name = "来源",dictType = "origin_type")
     private String origin;
 
     /** 周转类型 */
-    @Excel(name = "周转类型",dictType = "turnover_type")
+    //@Excel(name = "周转类型",dictType = "turnover_type")
     private String turnovertype;
 
     /** 套账 */
-    @Excel(name = "套账",dictType = "account_type")
+    //@Excel(name = "套账",dictType = "account_type")
     private String account;
 
     /** 用途 */
-    @Excel(name = "用途",dictType = "purpose_type")
+    //@Excel(name = "用途",dictType = "purpose_type")
     private String purpose;
 
-    /** 台次 */
-    @Excel(name = "台次")
-    private String units;
-
-    /** 合同 */
-    @Excel(name = "合同")
-    private String contract;
-
-    /** 件次 */
-    @Excel(name = "件次")
-    private String cases;
 
     /** 质量 */
-    @Excel(name = "质量",dictType = "quality_type")
+    //@Excel(name = "质量",dictType = "quality_type")
     private String quality;
 
-    /** 管理号 */
-    @Excel(name = "管理号")
-    private String managementNo;
 
     public void setJobDetailId(String jobDetailId)
     {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java
index 62302e5..0d15709 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.search.ViewOutJobFlow.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -10,19 +12,19 @@ import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService;
 
 /**
  * 出库作业流水ControllerService业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-10-28
  */
 @Service
-public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService 
+public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
 {
     @Autowired
     private ViewOutJobFlowMapper viewOutJobFlowMapper;
 
     /**
      * 查询出库作业流水Controller
-     * 
+     *
      * @param jobDetailId 出库作业流水Controller主键
      * @return 出库作业流水Controller
      */
@@ -34,11 +36,12 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
 
     /**
      * 查询出库作业流水Controller列表
-     * 
+     *
      * @param viewOutJobFlow 出库作业流水Controller
      * @return 出库作业流水Controller
      */
     @Override
+    //@DataScope(warehouseAlias = "vojf")
     public List<ViewOutJobFlow> selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow)
     {
         return viewOutJobFlowMapper.selectViewOutJobFlowList(viewOutJobFlow);
@@ -46,7 +49,7 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
 
     /**
      * 新增出库作业流水Controller
-     * 
+     *
      * @param viewOutJobFlow 出库作业流水Controller
      * @return 结果
      */
@@ -59,7 +62,7 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
 
     /**
      * 修改出库作业流水Controller
-     * 
+     *
      * @param viewOutJobFlow 出库作业流水Controller
      * @return 结果
      */
@@ -71,7 +74,7 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
 
     /**
      * 批量删除出库作业流水Controller
-     * 
+     *
      * @param jobDetailIds 需要删除的出库作业流水Controller主键
      * @return 结果
      */
@@ -83,7 +86,7 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService
 
     /**
      * 删除出库作业流水Controller信息
-     * 
+     *
      * @param jobDetailId 出库作业流水Controller主键
      * @return 结果
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
index 2dd23c8..db7d268 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
@@ -25,75 +25,86 @@ import java.util.Date;
 public class ViewStockDetail extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
-
+    @Excel(name = "仓库名称")
+    private String warehouseName;    // 仓库名称
     @Excel(name = "库存编码")
     private String stockId;          // 库存编码
-
-    @Excel(name = "账套",dictType = "account_type")
-    private String spare3;           // 账套
-
     @Excel(name = "库位编码")
     private String cargoSpaceId;     // 库位编码
-
     @Excel(name = "托盘")
     private String trayCode;         // 托盘
-
-    @Excel(name = "产品编码")
+    @Excel(name = "库存状态")
+    private String stockStatus;      // 库存状态
+    @Excel(name = "合同号")
+    private String orderId;          // 合同号
+    @Excel(name = "产品号")
+    private String power;            // 产品号
+    @Excel(name = "代号")
+    private String distribution;
+    @Excel(name = "台次")
+    private String spare5;           // 台次
+    @Excel(name = "物料编码")
     private String productId;        // 产品编码
 
-    @Excel(name = "产品名称")
+    @Excel(name = "物料名称")
     private String productName;      // 产品名称
 
+
+//    @Excel(name = "账套",dictType = "account_type")
+    private String spare3;           // 账套
+
+
+
+
+
+
+
     @Excel(name = "规格")
     private String spec;             // 规格
 
     @Excel(name = "数量")
     private BigDecimal quantity;     // 数量
 
-    @Excel(name = "金额")
+//    @Excel(name = "金额")
     private String spare6;           // 金额
 
-    @Excel(name = "单价")
+//    @Excel(name = "单价")
     private BigDecimal price;        // 单价
 
-    @Excel(name = "产品状态",dictType = "turnover_type")
+//    @Excel(name = "产品状态",dictType = "turnover_type")
     private String spare1;           // 产品状态
 
-    @Excel(name = "单位")
+//    @Excel(name = "单位")
     private String unit;             // 单位
 
-    @Excel(name = "图号")
+//    @Excel(name = "图号")
     private String cargoNo;          // 图号
 
-    @Excel(name = "合同号")
-    private String orderId;          // 合同号
 
-    @Excel(name = "台次")
-    private String spare5;           // 台次
 
-    @Excel(name = "件次")
-    private String power;            // 件次
 
-    @Excel(name = "质量",dictType = "quality_type")
+
+
+
+//    @Excel(name = "质量",dictType = "quality_type")
     private String spare8;           // 质量
 
-    @Excel(name = "常用编码")
+//    @Excel(name = "常用编码")
     private String parentId;         // 常用编码
 
-    @Excel(name = "入库单号")
+//    @Excel(name = "入库单号")
     private String stockinId;        // 入库单号
 
-    @Excel(name = "供应商名称")
+//    @Excel(name = "供应商名称")
     private String supplierName;     // 供应商名称
 
-    @Excel(name = "供应商编号")
+//    @Excel(name = "供应商编号")
     private String supplierNo;       // 供应商编号
 
-    @Excel(name = "仓库编码")
+//    @Excel(name = "仓库编码")
     private String warehouseId;      // 仓库编码
 
-    @Excel(name = "仓库名称")
-    private String warehouseName;    // 仓库名称
+
 
     @Excel(name = "首次入库时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -105,21 +116,22 @@ public class ViewStockDetail extends BaseEntity
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date backDate;           // 出库时间
 
-    @Excel(name = "盘点标识",dictType = "check_flag")
-    private String spare7;           // 盘点标识
+
 
     @Excel(name = "出库时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date stackingId;       // 盘点时间
 
-    @Excel(name = "备注")
+    @Excel(name = "盘点标识",dictType = "check_flag")
+    private String spare7;           // 盘点标识
+
+//    @Excel(name = "备注")
     private String remark;           // 备注
 
-    @Excel(name = "库存状态")
-    private String stockStatus;      // 库存状态
 
-    @Excel(name = "批次号")
+
+//    @Excel(name = "批次号")
     private String lotNo;            // 批次号
 
     private BigDecimal outQuantity;  // 出库数量
@@ -135,7 +147,6 @@ public class ViewStockDetail extends BaseEntity
     private String productType;
     private String outside;
     private String spare4;
-    private String distribution;
 
 
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java
index a375705..8b3ff3b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java
@@ -40,7 +40,7 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService
      * @return 库存明细查询
      */
     @Override
-    //@DataScope(warehouseAlias = "vsd")
+    //@DataScope(warehouseAlias = "bw")
     public List<ViewStockDetail> selectViewStockDetailList(ViewStockDetail viewStockDetail)
     {
         return viewStockDetailMapper.selectViewStockDetailList(viewStockDetail);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/impl/BasStockFreezeRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/impl/BasStockFreezeRecordServiceImpl.java
index aa622d9..ba8d519 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/impl/BasStockFreezeRecordServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/impl/BasStockFreezeRecordServiceImpl.java
@@ -42,7 +42,7 @@ public class BasStockFreezeRecordServiceImpl implements IBasStockFreezeRecordSer
      * @return 库存冻结记录
      */
     @Override
-    @DataScope(warehouseAlias = "bw")
+    //@DataScope(warehouseAlias = "bw")
     public List<BasStockFreezeRecord> selectBasStockFreezeRecordList(BasStockFreezeRecord basStockFreezeRecord)
     {
         return basStockFreezeRecordMapper.selectBasStockFreezeRecordList(basStockFreezeRecord);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/service/impl/BasStockMaintainRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/service/impl/BasStockMaintainRecordServiceImpl.java
index 4a82be5..73bf72c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/service/impl/BasStockMaintainRecordServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/service/impl/BasStockMaintainRecordServiceImpl.java
@@ -41,7 +41,7 @@ public class BasStockMaintainRecordServiceImpl implements IBasStockMaintainRecor
      * @return 库存操作记录
      */
     @Override
-    @DataScope(warehouseAlias = "bw")
+    //@DataScope(warehouseAlias = "bw")
     public List<BasStockMaintainRecord> selectBasStockMaintainRecordList(BasStockMaintainRecord basStockMaintainRecord)
     {
         return basStockMaintainRecordMapper.selectBasStockMaintainRecordList(basStockMaintainRecord);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
index 3effe05..f4f362d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java
@@ -177,7 +177,7 @@ public class BasStockServiceImpl implements IBasStockService
     public void insertBasStockList(List<BasStock> list) {
         basStockMapper.insertBasStockList(list);
     }
-    @DataScope(warehouseAlias = "s")
+    //@DataScope(warehouseAlias = "s")
     @Override
     public  List<BasStock> selectKtpStock(BasStock basStock) {
         return basStockMapper.selectKtpStock(basStock);
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
index 96d5bfd..defdbd9 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
@@ -185,6 +185,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and warehouse_id = #{warehouseId}
             and roadway_id = #{roadwayId}
             and cargo_hight = #{cargoHight}
+        <if test="thePlatoon != null">and the_platoon = #{thePlatoon}</if>
+        <if test="rule1 != null and theFloor != null">and the_floor &lt; #{theFloor}</if>
+        <if test="rule2 != null and theFloor != null">and the_floor &gt;= #{theFloor}</if>
+
         ORDER BY  the_floor,the_column,the_platoon
     </select>
     <select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
index a18cc5d..d7320ee 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
@@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskNo != null  and taskNo != ''"> and mj.task_no = #{taskNo}</if>
             <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id = #{supplierId}</if>
             <if test="customerId != null  and customerId != ''"> and mj.customer_id = #{customerId}</if>
-            <if test="departmentId != null  and departmentId != ''"> and mj.department_id = #{departmentId}</if>
+            <if test="departmentId != null  and departmentId != ''"> and (mj.department_id = #{departmentId} or mj.department_id is null)</if>
             <if test="trayCode != null  and trayCode != ''"> and mj.tray_code = #{trayCode}</if>
             <if test="roadwayId != null  and roadwayId != ''"> and mj.roadway_id = #{roadwayId}</if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id = #{cargoSpaceId}</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
index 2a1a76a..7254dc9 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskNo != null  and taskNo != ''"> and mj.task_no = #{taskNo}</if>
             <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id = #{supplierId}</if>
             <if test="customerId != null  and customerId != ''"> and mj.customer_id = #{customerId}</if>
-            <if test="departmentId != null  and departmentId != ''"> and mj.department_id = #{departmentId}</if>
+            <if test="departmentId != null  and departmentId != ''"> and (mj.department_id = #{departmentId} or mj.department_id is null)</if>
             <if test="trayCode != null  and trayCode != ''"> and mj.tray_code = #{trayCode}</if>
             <if test="roadwayId != null  and roadwayId != ''"> and mj.roadway_id = #{roadwayId}</if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id = #{cargoSpaceId}</if>
@@ -84,8 +84,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classId != null  and classId != ''"> and mj.class_id = #{classId}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and mj.warehouse_id = #{warehouseId}</if>
             <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag = #{faultFlag}</if>
-            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20 and mj.in_or_out not in(25,26)</if>
-            <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 and mj.in_or_out not in(5,6)</if>
+            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20 </if>
+            <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 </if>
             <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (25,26)</if>
             <if test = "inOutIds !=null and inOutIds.size() > 0">
diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
index b41a950..823b1bb 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.out.handAllotStock.mapper.ViewHandAllotStockMapper">
-    
+
     <resultMap type="ViewHandAllotStock" id="ViewHandAllotStockResult">
         <result property="stockId"    column="stock_id"    />
         <result property="cargoSpaceId"    column="cargo_space_id"    />
@@ -45,12 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewHandAllotStockVo">
-        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name from view_hand_allot_stock
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name from view_hand_allot_stock vhat
     </sql>
 
     <select id="selectViewHandAllotStockList" parameterType="ViewHandAllotStock" resultMap="ViewHandAllotStockResult">
         <include refid="selectViewHandAllotStockVo"/>
-        <where>  
+        <where>
             <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
             <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
             <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
             <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
             <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
             <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
@@ -84,14 +84,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="netWeight != null "> and net_weight = #{netWeight}</if>
             <if test="grossWeight != null "> and gross_weight = #{grossWeight}</if>
             <if test="distribution != null  and distribution != ''"> and distribution = #{distribution}</if>
-            <if test="model != null  and model != ''"> and model = #{model}</if>
+            <if test="model != null  and model != ''"> and (model = #{model} or model is null)</if>
             <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
             <if test="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
             <if test="spare8 != null  and spare8 != ''"> and spare8 = #{spare8}</if>
             <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
+
     </select>
-    
+
     <select id="selectViewHandAllotStockByStockId" parameterType="String" resultMap="ViewHandAllotStockResult">
         <include refid="selectViewHandAllotStockVo"/>
         where stock_id = #{stockId}
@@ -227,9 +231,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewHandAllotStockByStockIds" parameterType="String">
-        delete from view_hand_allot_stock where stock_id in 
+        delete from view_hand_allot_stock where stock_id in
         <foreach item="stockId" collection="array" open="(" separator="," close=")">
             #{stockId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
index 3f45e85..951e8b8 100644
--- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
@@ -133,6 +133,7 @@
         {call proc_tp_in(
                 #{v_tray_code,mode=IN,jdbcType=VARCHAR},
                 #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
+                #{v_dept_id,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=INTEGER},
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
               )}
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
index ce8f54d..8178f98 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.search.ViewInJobFlow.mapper.ViewInJobFlowMapper">
-    
+
     <resultMap type="ViewInJobFlow" id="ViewInJobFlowResult">
         <result property="jobDetailId"    column="job_detail_id"    />
         <result property="jobId"    column="job_id"    />
@@ -48,12 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewInJobFlowVo">
-        select job_detail_id, job_id, task_no, status, in_or_out, tray_code, create_time, start_time, finish_time, entrance_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, in_quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo from view_in_job_flow
+        select job_detail_id, job_id, task_no, status, in_or_out, tray_code, create_time, start_time, finish_time, entrance_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, in_quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo from view_in_job_flow vijf
     </sql>
 
     <select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
         <include refid="selectViewInJobFlowVo"/>
-        <where>  
+        <where>
             <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
             <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
             <if test="taskNo != null  and taskNo != ''"> and task_no = #{taskNo}</if>
@@ -92,9 +92,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cases != null  and cases != ''"> and cases = #{cases}</if>
             <if test="quality != null  and quality != ''"> and quality = #{quality}</if>
             <if test="managementNo != null  and managementNo != ''"> and managementNo = #{managementNo}</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
-    
+
     <select id="selectViewInJobFlowByJobDetailId" parameterType="String" resultMap="ViewInJobFlowResult">
         <include refid="selectViewInJobFlowVo"/>
         where job_detail_id = #{jobDetailId}
@@ -239,9 +242,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewInJobFlowByJobDetailIds" parameterType="String">
-        delete from view_in_job_flow where job_detail_id in 
+        delete from view_in_job_flow where job_detail_id in
         <foreach item="jobDetailId" collection="array" open="(" separator="," close=")">
             #{jobDetailId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
index 711ba77..37f5666 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.search.ViewOutJobFlow.mapper.ViewOutJobFlowMapper">
-    
+
     <resultMap type="ViewOutJobFlow" id="ViewOutJobFlowResult">
         <result property="jobDetailId"    column="job_detail_id"    />
         <result property="jobId"    column="job_id"    />
@@ -48,12 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectViewOutJobFlowVo">
-        select job_detail_id, job_id, task_no, status, in_or_out, tray_code, create_time, start_time, finish_time, exit_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, out_quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo from view_out_job_flow
+        select job_detail_id, job_id, task_no, status, in_or_out, tray_code, create_time, start_time, finish_time, exit_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, out_quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo from view_out_job_flow vojf
     </sql>
 
     <select id="selectViewOutJobFlowList" parameterType="ViewOutJobFlow" resultMap="ViewOutJobFlowResult">
         <include refid="selectViewOutJobFlowVo"/>
-        <where>  
+        <where>
             <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
             <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
             <if test="taskNo != null  and taskNo != ''"> and task_no = #{taskNo}</if>
@@ -92,9 +92,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cases != null  and cases != ''"> and cases = #{cases}</if>
             <if test="quality != null  and quality != ''"> and quality = #{quality}</if>
             <if test="managementNo != null  and managementNo != ''"> and managementNo = #{managementNo}</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
-    
+
     <select id="selectViewOutJobFlowByJobDetailId" parameterType="String" resultMap="ViewOutJobFlowResult">
         <include refid="selectViewOutJobFlowVo"/>
         where job_detail_id = #{jobDetailId}
@@ -239,9 +242,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewOutJobFlowByJobDetailIds" parameterType="String">
-        delete from view_out_job_flow where job_detail_id in 
+        delete from view_out_job_flow where job_detail_id in
         <foreach item="jobDetailId" collection="array" open="(" separator="," close=")">
             #{jobDetailId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
index 8a9780a..4b96999 100644
--- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
@@ -121,6 +121,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inDateStart != null  and inDateStart != ''"> and bs.in_date &gt;= #{inDateStart}</if>
             <if test="inDateEnd != null  and inDateEnd != ''"> and bs.in_date &lt;= #{inDateEnd}</if>
             <if test="productType != null  and productType != ''"> and bp.spare1 = #{productType}</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
 
     </select>
diff --git a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
index d77afe3..ca57ddf 100644
--- a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
@@ -25,6 +25,47 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
+      <el-form-item label="合同号" prop="contract">
+        <el-input
+          v-model="queryParams.contract"
+          placeholder="请输入合同号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品号" prop="cases">
+        <el-input
+          v-model="queryParams.cases"
+          placeholder="请输入产品号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="代号" prop="managementNo">
+        <el-input
+          v-model="queryParams.managementNo"
+          placeholder="请输入代号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="台次" prop="units">
+        <el-input
+          v-model="queryParams.units"
+          placeholder="请输入台次"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="托盘条码" prop="trayCode">
+        <el-input
+          v-model="queryParams.trayCode"
+          placeholder="请输入托盘条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--
 
       <el-form-item label="状态" prop="status">
@@ -45,14 +86,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="托盘条码" prop="trayCode">
-        <el-input
-          v-model="queryParams.trayCode"
-          placeholder="请输入托盘条码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label="开始时间" prop="startTime">
         <el-input
           v-model="queryParams.startTime"
diff --git a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
index 55c57b0..c89eb3e 100644
--- a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
+++ b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
@@ -25,246 +25,30 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_job_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="任务类型" prop="inOrOut">
-        <el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
-          <el-option
-            v-for="dict in dict.type.out_job_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="托盘码" prop="trayCode">
+      <el-form-item label="合同号" prop="contract">
         <el-input
-          v-model="queryParams.trayCode"
-          placeholder="请输入托盘码"
+          v-model="queryParams.contract"
+          placeholder="请输入合同号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
+      <el-form-item label="产品号" prop="cases">
         <el-input
-          v-model="queryParams.startTime"
-          placeholder="请输入开始时间"
+          v-model="queryParams.cases"
+          placeholder="请输入产品号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="结束时间" prop="finishTime">
+      <el-form-item label="代号" prop="managementNo">
         <el-input
-          v-model="queryParams.finishTime"
-          placeholder="请输入结束时间"
+          v-model="queryParams.managementNo"
+          placeholder="请输入代号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出口" prop="exitId">
-        <el-input
-          v-model="queryParams.exitId"
-          placeholder="请输入出口"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库编码" prop="warehouseId">
-        <el-input
-          v-model="queryParams.warehouseId"
-          placeholder="请输入仓库编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料编码" prop="productId">
-        <el-input
-          v-model="queryParams.productId"
-          placeholder="请输入物料编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料名称" prop="productName">
-        <el-input
-          v-model="queryParams.productName"
-          placeholder="请输入物料名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="常用编码" prop="parentId">
-        <el-input
-          v-model="queryParams.parentId"
-          placeholder="请输入常用编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单价" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入单价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="图号" prop="cargoNo">
-        <el-input
-          v-model="queryParams.cargoNo"
-          placeholder="请输入图号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="规格" prop="spec">
-        <el-input
-          v-model="queryParams.spec"
-          placeholder="请输入规格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料类型" prop="productType">
-        <el-select v-model="queryParams.productType" placeholder="请选择物料类型" clearable>
-          <el-option
-            v-for="dict in dict.type.product_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否系统项" prop="systemItem">
-        <el-select v-model="queryParams.systemItem" placeholder="请选择是否系统项" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_yes_no"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="物料创建时间" prop="productCtm">
-        <el-input
-          v-model="queryParams.productCtm"
-          placeholder="请输入物料创建时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料创建人" prop="productCtu">
-        <el-input
-          v-model="queryParams.productCtu"
-          placeholder="请输入物料创建人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库存上限" prop="upperNum">
-        <el-input
-          v-model="queryParams.upperNum"
-          placeholder="请输入库存上限"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库存下限" prop="limitNum">
-        <el-input
-          v-model="queryParams.limitNum"
-          placeholder="请输入库存下限"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否可用" prop="enableFlag">
-        <el-select v-model="queryParams.enableFlag" placeholder="请选择是否可用" clearable>
-          <el-option
-            v-for="dict in dict.type.product_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="批次号" prop="lotNo">
-        <el-input
-          v-model="queryParams.lotNo"
-          placeholder="请输入批次号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单据编码" prop="inOrOutId">
-        <el-input
-          v-model="queryParams.inOrOutId"
-          placeholder="请输入单据编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="子单据编码" prop="inOrOutDId">
-        <el-input
-          v-model="queryParams.inOrOutDId"
-          placeholder="请输入子单据编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="金额" prop="priceTotal">
-        <el-input
-          v-model="queryParams.priceTotal"
-          placeholder="请输入金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="周转类型" prop="turnovertype">
-        <el-select v-model="queryParams.turnovertype" placeholder="请选择周转类型" clearable>
-          <el-option
-            v-for="dict in dict.type.turnover_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="套账" prop="account">
-        <el-select v-model="queryParams.account" placeholder="请选择套账" clearable>
-          <el-option
-            v-for="dict in dict.type.account_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="用途" prop="purpose">
-        <el-select v-model="queryParams.purpose" placeholder="请选择用途" clearable>
-          <el-option
-            v-for="dict in dict.type.purpose_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="台次" prop="units">
         <el-input
           v-model="queryParams.units"
@@ -273,40 +57,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="合同" prop="contract">
+      <el-form-item label="托盘条码" prop="trayCode">
         <el-input
-          v-model="queryParams.contract"
-          placeholder="请输入合同"
+          v-model="queryParams.trayCode"
+          placeholder="请输入托盘条码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="件次" prop="cases">
-        <el-input
-          v-model="queryParams.cases"
-          placeholder="请输入件次"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="质量" prop="quality">
-        <el-select v-model="queryParams.quality" placeholder="请选择质量" clearable>
-          <el-option
-            v-for="dict in dict.type.quality_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="管理号" prop="managementNo">
-        <el-input
-          v-model="queryParams.managementNo"
-          placeholder="请输入管理号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>