【托盘类型】数据类型调整

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java

@@ -124,7 +124,7 @@ public class ApiWcsService implements IApiWcsService {
                             .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)
                             .executionPhase("0")
                             .trayCode(cargoSpaceInSide.getTrayCode())
-                            .trayType(cargoSpaceInSide.getTheType())
+                            .trayType(cargoSpaceInSide.getTheType().toString())
                             .roadwayId(cargoSpaceInSide.getRoadwayId())
                             .cargoSpaceId(cargoSpaceInSide.getCargoSpaceId())
                             .targetCargoSpaceId(targetCargo.getCargoSpaceId())
@@ -202,7 +202,7 @@ public class ApiWcsService implements IApiWcsService {
                         .trayCode(cargoSpaceCurrent.getTrayCode())
                         .status(TaskStatusEnum.READY.getCode())
                         .cargoSpaceId(cargoSpaceCurrent.getCargoSpaceId())
-                        .trayType(type)
+                        .trayType(String.valueOf(type))
                         .executionPhase("0")
                         .warehouseId("01")
                         .build();
@@ -346,7 +346,7 @@ public class ApiWcsService implements IApiWcsService {
                     .roadwayId(wcsStockinReiceive.getRoadwayId())
                     .cargoSpaceId(cargoStockin.getCargoSpaceId())
                     .cargoSpaceName(cargoStockin.getCargoSpaceName())
-                    .trayType(type)
+                    .trayType(String.valueOf(type))
                     .build();
 
             mydoJobService.insertMydoJob(mydoJobNew);
@@ -407,7 +407,7 @@ public class ApiWcsService implements IApiWcsService {
                             .stockinId(instockinId)
                             .stockinDetailId(instockinDetailId)
                             .status(0)
-                            .trayType(type)
+                            .trayType(String.valueOf(type))
                             .build();
                     mydoJobDetailService.insertMydoJobDetail(detail);
                 }
@@ -490,7 +490,7 @@ public class ApiWcsService implements IApiWcsService {
                         .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)
                         .executionPhase("0")
                         .trayCode(cargoSpaceSingle.getTrayCode())
-                        .trayType(cargoSpaceSingle.getTheType())
+                        .trayType(cargoSpaceSingle.getTheType().toString())
                         .roadwayId(cargoSpaceSingle.getRoadwayId())
                         .cargoSpaceId(cargoSpaceSingle.getCargoSpaceId())
                         .targetCargoSpaceId(targetCargo.getCargoSpaceId())
@@ -571,7 +571,7 @@ public class ApiWcsService implements IApiWcsService {
                     .roadwayId(cargoSpaceCurrent.getRoadwayId())
                     .cargoSpaceId(cargoSpaceId)
                     .cargoSpaceName(cargoSpaceCurrent.getCargoSpaceName())
-                    .trayType(cargoSpaceCurrent.getTheType())
+                    .trayType(cargoSpaceCurrent.getTheType().toString())
                     .build();
 
             mydoJobService.insertMydoJob(mydoJob);
@@ -689,7 +689,7 @@ public class ApiWcsService implements IApiWcsService {
                 .roadwayId(wcsStockinReiceive.getRoadwayId())
                 .cargoSpaceId(cargoSpace.getCargoSpaceId())
                 .cargoSpaceName(cargoSpace.getCargoSpaceName())
-                .trayType(type)
+                .trayType(String.valueOf(type))
                 .build();
 
         //循环生成子作业
@@ -791,7 +791,11 @@ public class ApiWcsService implements IApiWcsService {
 
         //重新查找可用货位
         BasCargoSpace cargoSpaceNew = basCargoSpaceService.selectBasCargoSpaceForStockin(
-                new BasCargoSpace().builder().roadwayId(mydoJob.getRoadwayId()).cargoAreaId(basCargoSpaceParam.getCargoAreaId()).theType(mydoJob.getTrayType()).build()
+                new BasCargoSpace().builder()
+                        .roadwayId(mydoJob.getRoadwayId())
+                        .cargoAreaId(basCargoSpaceParam.getCargoAreaId())
+                        .theType(Convert.toInt(mydoJob.getTrayType()))
+                        .build()
         );
         if (ObjUtil.isNull(cargoSpaceNew)) {
             log.info("【入库重分】重分失败，该区域没有可用的空货位，货区:{}，托盘类型:{}", basCargoSpaceParam.getCargoAreaId(), mydoJob.getTrayType());

ruoyi-admin/src/main/java/com/ruoyi/bas/stock/domain/BasStock.java

@@ -108,6 +108,10 @@ public class BasStock extends BaseEntity
     @Excel(name = "入库类型")
     private String inType;
 
+    /** 托盘类型 */
+    @Excel(name = "托盘类型")
+    private String trayType;
+
     /** 仓库id */
     private String warehouseId;
 

ruoyi-admin/src/main/java/com/ruoyi/bas/stock/domain/BasStockInfo.java

@@ -62,7 +62,7 @@ public class BasStockInfo extends BaseEntity
 
     /** 托盘类型 */
     @Excel(name = "托盘类型")
-    private int trayType;
+    private String trayType;
 
     /** 托盘状态 */
     @Excel(name = "托盘状态")

ruoyi-admin/src/main/java/com/ruoyi/in/bind/domain/InTrayMsg.java

@@ -68,7 +68,7 @@ public class InTrayMsg
 
     /** 托盘类型 */
     @Excel(name = "托盘类型")
-    private Integer trayType;
+    private String trayType;
 
     /** 生成时间 */
     @Excel(name = "生成时间")

ruoyi-admin/src/main/java/com/ruoyi/in/job/domain/MydoJob.java

@@ -122,7 +122,7 @@ public class MydoJob
      * 托盘类型（托盘尺寸）
      */
     @Excel(name = "托盘类型")
-    Integer trayType;
+    String trayType;
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/in/job/service/IMydoJobService.java

@@ -160,5 +160,12 @@ public interface IMydoJobService
      */
     int getTrayTypeByTrayCode(String TrayCode);
 
+    /**
+     * 根据托盘号获取托盘类型
+     * @param TrayCode
+     * @return
+     */
+    String getTrayTypeByTrayCodeString(String TrayCode);
+
 
 }

ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java

@@ -739,7 +739,7 @@ public class MydoJobServiceImpl implements IMydoJobService
             //获取托盘剩余库存
             String trayCode = mydoJob.getTrayCode();
             List<BasStock> stocks = basStockService.selectBasStockListByTrayCode(trayCode);
-            int trayType = getTrayTypeByTrayCode(trayCode);
+            String trayType = getTrayTypeByTrayCodeString(trayCode);
             //空托盘回流
             if (stocks.isEmpty()){
                 inTrayMsgService.insertInTrayMsg(
@@ -873,5 +873,23 @@ public class MydoJobServiceImpl implements IMydoJobService
         }
     }
 
+    @Override
+    public String getTrayTypeByTrayCodeString(String TrayCode){
+
+        if (TrayCode.startsWith("A")){
+            //长1200 高380 6槽
+            return "1";
+        }else if (TrayCode.startsWith("B")){
+            //长1200 高510 4槽
+            return "2";
+        }else if (TrayCode.startsWith("C")){
+            //长1350 高380 6槽
+            return "3";
+        }else{
+            //类型异常
+            return "0";
+        }
+    }
+
 
 }

ruoyi-admin/src/main/java/com/ruoyi/in/jobdetail/domain/MydoJobDetail.java

@@ -100,7 +100,7 @@ public class MydoJobDetail extends BaseEntity
     @Excel(name = "供应商名称")
     private String supplierName;
 
-    private int trayType;
+    private String trayType;
 
     private Integer status;
 

ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java

@@ -274,7 +274,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
                             .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)
                             .executionPhase("0")
                             .trayCode(cargoSingle.getTrayCode())
-                            .trayType(cargoSingle.getTheType())
+                            .trayType(cargoSingle.getTheType().toString())
                             .roadwayId(cargoSingle.getRoadwayId())
                             .cargoSpaceId(cargoSingle.getCargoSpaceId())
                             .targetCargoSpaceId(targetCargo.getCargoSpaceId())
@@ -354,7 +354,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
                         .inOrOut(taskType)
                         .executionPhase("0")
                         .trayCode(cargoCurrent.getTrayCode())
-                        .trayType(cargoCurrent.getTheType())
+                        .trayType(cargoCurrent.getTheType().toString())
                         .roadwayId(cargoCurrent.getRoadwayId())
                         .cargoSpaceId(cargoCurrent.getCargoSpaceId())
                         .cargoSpaceName(cargoCurrent.getThePlatoon() + "排" + cargoCurrent.getTheColumn() + "列" + cargoCurrent.getTheFloor() + "层")
@@ -412,7 +412,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
                             .lotNo(detail.getLotNo())
                             .stockQuantity(stock.getQuantity())
                             .outQuantity(BigDecimal.ZERO)
-                            .trayType(cargoCurrent.getTheType())
+                            .trayType(cargoCurrent.getTheType().toString())
                             .status(0)
                             .inDate(stock.getInDate())
                             .rollerNumber(stock.getRollerNumber())
@@ -494,7 +494,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
                             .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)
                             .executionPhase("0")
                             .trayCode(cargoSingle.getTrayCode())
-                            .trayType(cargoSingle.getTheType())
+                            .trayType(cargoSingle.getTheType().toString())
                             .roadwayId(cargoSingle.getRoadwayId())
                             .cargoSpaceId(cargoSingle.getCargoSpaceId())
                             .targetCargoSpaceId(targetCargo.getCargoSpaceId())
@@ -572,7 +572,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
                         .inOrOut(taskType)
                         .executionPhase("0")
                         .trayCode(cargoCurrent.getTrayCode())
-                        .trayType(cargoCurrent.getTheType())
+                        .trayType(cargoCurrent.getTheType().toString())
                         .roadwayId(cargoCurrent.getRoadwayId())
                         .cargoSpaceId(cargoCurrent.getCargoSpaceId())
                         .cargoSpaceName(cargoCurrent.getThePlatoon() + "排" + cargoCurrent.getTheColumn() + "列" + cargoCurrent.getTheFloor() + "层")
@@ -630,7 +630,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService
                             .lotNo(detail.getLotNo())
                             .stockQuantity(stock.getQuantity())
                             .outQuantity(BigDecimal.ZERO)
-                            .trayType(cargoCurrent.getTheType())
+                            .trayType(cargoCurrent.getTheType().toString())
                             .trayCode(mydoJob.getTrayCode())
                             .status(0)
                             .inDate(stock.getInDate())

ruoyi-admin/src/main/java/com/ruoyi/pd/stockpd/service/impl/PdStockpdServiceImpl.java

@@ -282,7 +282,7 @@ public class PdStockpdServiceImpl implements IPdStockpdService
                         .roadwayId(cargoSpace.getRoadwayId())
                         .cargoSpaceId(cargoSpace.getCargoSpaceId())
                         .cargoSpaceName(cargoSpace.getCargoSpaceName())
-                        .trayType(cargoSpace.getTheType())
+                        .trayType(cargoSpace.getTheType().toString())
                         .priority(10)
                         .build();
 

ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java

@@ -160,7 +160,7 @@ public class PdaServiceImpl implements IPdaService {
 
         //======================生成绑定信息======================
         String trayCode = bindTrayMsg.getTrayCode();
-        int trayType = mydoJobService.getTrayTypeByTrayCode(trayCode);
+        String trayType = mydoJobService.getTrayTypeByTrayCodeString(trayCode);
         int trayMsgStatus =
                 ObjUtil.isNull(basStockInfoService.selectBasStockInfoByTrayCode(trayCode)) ? InTrayMsgCode.STATUS_NEW :InTrayMsgCode.STATUS_EXIST;
 
@@ -260,8 +260,8 @@ public class PdaServiceImpl implements IPdaService {
                 ObjUtil.isNull(basStockInfoService.selectBasStockInfoByTrayCode(trayCode)) ? InTrayMsgCode.STATUS_NEW :InTrayMsgCode.STATUS_EXIST;
 
         //校验托盘类型
-        int trayType = mydoJobService.getTrayTypeByTrayCode(trayCode);
+        String trayType = mydoJobService.getTrayTypeByTrayCodeString(trayCode);
-        if (trayType == 0){
+        if (trayType == "0"){
             log.warn("【入库绑定失败】托盘类型异常，无法执行绑定操作，请检查当前托盘的条码格式，当前条码:{}", trayCode);
             return AjaxResult.error("【入库绑定失败】托盘类型异常，无法执行绑定操作，请检查当前托盘的条码格式，当前条码:" + trayCode);
         }
@@ -336,7 +336,7 @@ public class PdaServiceImpl implements IPdaService {
 
                 //todo 特殊需求：FT577现场不确定托盘上的版辊数量，所以取消托盘槽位和版辊的数量校验
 
-                int type = mydoJobService.getTrayTypeByTrayCode(trayCode);
+                String type = mydoJobService.getTrayTypeByTrayCodeString(trayCode);
 //>>>生成绑定信息
                 inTrayMsgService.insertInTrayMsg(
                         new InTrayMsg().builder()
@@ -582,7 +582,7 @@ public class PdaServiceImpl implements IPdaService {
             return AjaxResult.error("【入库绑定失败】存在当前条码的货位信息，无法执行绑定操作，请检查该托盘的任务状态，当前条码:" + trayCode);
         }
 
-        int trayType = mydoJobService.getTrayTypeByTrayCode(request.getTrayCode());
+        String trayType = mydoJobService.getTrayTypeByTrayCodeString(request.getTrayCode());
 
         inTrayMsgService.insertInTrayMsg(
                 new InTrayMsg().builder()
@@ -804,17 +804,18 @@ public class PdaServiceImpl implements IPdaService {
             //--------------------------- 入库货位分配 ---------------------------
             //区分高矮货，只能在堆垛机上获取货物高度，高货位可放全部高度的托盘
             BasCargoSpace cargoParam;
-            int type = mydoJobService.getTrayTypeByTrayCode(trayCode);
+            String type = mydoJobService.getTrayTypeByTrayCodeString(trayCode);
+            int theType = Convert.toInt(type);
             String cargoAreaId = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId()).getCargoAreaId();
-            if (type == 1){
+            if (theType == 1){
                 //1500*1200 低货位380H - 不限制高度
-                cargoParam = new BasCargoSpace().builder().theType(type).cargoAreaId(cargoAreaId).build();
+                cargoParam = new BasCargoSpace().builder().theType(theType).cargoAreaId(cargoAreaId).build();
-            }else if (type == 2){
+            }else if (theType == 2){
                 //1500*1200 高货位510H - 只能放指定层高的货位
-                cargoParam = new BasCargoSpace().builder().theType(type).cargoAreaId(cargoAreaId).theHeight(510).build();
+                cargoParam = new BasCargoSpace().builder().theType(theType).cargoAreaId(cargoAreaId).theHeight(510).build();
             }else{
                 //1500*1350 通用货位510H - 货区3任意层数
-                cargoParam = new BasCargoSpace().builder().theType(type).cargoAreaId(cargoAreaId).build();
+                cargoParam = new BasCargoSpace().builder().theType(theType).cargoAreaId(cargoAreaId).build();
             }
 
             if (cargoParam == null) {
@@ -1037,7 +1038,7 @@ public class PdaServiceImpl implements IPdaService {
         //>>>>>>>>>>>>>>>>>>>>>>> 生成回流 <<<<<<<<<<<<<<<<<<<<<<<<
         //获取托盘剩余库存
         List<BasStock> stocks = basStockService.selectBasStockListByTrayCode(trayCode);
-        int trayType = mydoJobService.getTrayTypeByTrayCode(trayCode);
+        String trayType = mydoJobService.getTrayTypeByTrayCodeString(trayCode);
         //空托盘回流
         if (stocks.isEmpty()){
 //            inTrayMsgService.insertInTrayMsg(

ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stockinDetailId"    column="stockin_detail_id"    />
         <result property="stockinId"    column="stockin_id"    />
         <result property="inType"    column="in_type"    />
+        <result property="trayType"    column="tray_type"    />
         <result property="warehouseId"    column="warehouse_id"    />
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="userId"    column="user_id"    />
@@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectBasStockVo">
         select stock_id, stock_detail_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_id, product_name, roller_number,
-               length, perimeter, quantity, job_id, job_detail_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, warehouse_id, warehouse_name,
+               length, perimeter, quantity, job_id, job_detail_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, tray_type, warehouse_id, warehouse_name,
                user_id, user_name, dept_id, dept_name, supplier_id, supplier_name
         from bas_stock_detail
     </sql>
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select bs.stock_id, bs.stock_detail_id, bs.cargo_space_id, bs.stock_status, bs.product_status,
         bs.lot_no, bs.in_date, bs.back_date, bs.product_id, bs.product_name,bs.roller_number,
         bs.length, bs.perimeter, bs.quantity, bs.job_id, bs.job_detail_id, bs.tray_code, bs.out_quantity,
-        bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.warehouse_id, bs.warehouse_name,
+        bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.tray_type, bs.warehouse_id, bs.warehouse_name,
         bs.user_id, bs.user_name, bs.dept_id, bs.dept_name, bs.supplier_id, bs.supplier_name
         from bas_stock_detail bs
         left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
@@ -73,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockinDetailId != null  and stockinDetailId != ''"> and bs.stockin_detail_id = #{stockinDetailId}</if>
             <if test="stockinId != null  and stockinId != ''"> and bs.stockin_id = #{stockinId}</if>
             <if test="inType != null  and inType != ''"> and bs.in_type = #{inType}</if>
+            <if test="trayType != null  and trayType != ''"> and bs.tray_type = #{trayType}</if>
             <if test="warehouseName != null  and warehouseName != ''"> and bs.warehouse_name like concat('%', #{warehouseName}, '%')</if>
             <if test="userName != null  and userName != ''"> and bs.user_name like concat('%', #{userName}, '%')</if>
             <if test="deptName != null  and deptName != ''"> and bs.dept_name like concat('%', #{deptName}, '%')</if>
@@ -84,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select bs.stock_id, bs.stock_detail_id, bs.cargo_space_id, bs.stock_status, bs.product_status,
         bs.lot_no, bs.in_date, bs.back_date, bs.product_id, bs.product_name,bs.roller_number,
         bs.length, bs.perimeter, bs.quantity, bs.job_id, bs.job_detail_id, bs.tray_code, bs.out_quantity,
-        bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.warehouse_id, bs.warehouse_name,
+        bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.tray_type, bs.warehouse_id, bs.warehouse_name,
         bs.user_id, bs.user_name, bs.dept_id, bs.dept_name, bs.supplier_id, bs.supplier_name, bcs.iss_double, bcs.cargo_area_id, bcs.the_type
         from bas_stock_detail bs
         left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
@@ -109,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockinDetailId != null  and stockinDetailId != ''"> and bs.stockin_detail_id = #{stockinDetailId}</if>
             <if test="stockinId != null  and stockinId != ''"> and bs.stockin_id = #{stockinId}</if>
             <if test="inType != null  and inType != ''"> and bs.in_type = #{inType}</if>
+            <if test="trayType != null  and trayType != ''"> and bs.tray_type = #{trayType}</if>
             <if test="warehouseName != null  and warehouseName != ''"> and bs.warehouse_name like concat('%', #{warehouseName}, '%')</if>
             <if test="userName != null  and userName != ''"> and bs.user_name like concat('%', #{userName}, '%')</if>
             <if test="deptName != null  and deptName != ''"> and bs.dept_name like concat('%', #{deptName}, '%')</if>
@@ -160,6 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockinDetailId != null">stockin_detail_id,</if>
             <if test="stockinId != null">stockin_id,</if>
             <if test="inType != null">in_type,</if>
+            <if test="trayType != null">tray_type,</if>
             <if test="warehouseId != null">warehouse_id,</if>
             <if test="warehouseName != null">warehouse_name,</if>
             <if test="userId != null">user_id,</if>
@@ -191,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockinDetailId != null">#{stockinDetailId},</if>
             <if test="stockinId != null">#{stockinId},</if>
             <if test="inType != null">#{inType},</if>
+            <if test="trayType != null">#{trayType},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
             <if test="warehouseName != null">#{warehouseName},</if>
             <if test="userId != null">#{userId},</if>
@@ -224,6 +229,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
             <if test="stockinId != null">stockin_id = #{stockinId},</if>
             <if test="inType != null">in_type = #{inType},</if>
+            <if test="trayType != null">tray_type = #{trayType},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
             <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
             <if test="userId != null">user_id = #{userId},</if>

ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml

@@ -291,14 +291,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="priority != null "> and priority = #{priority}</if>
         <if test="height != null "> and height = #{height}</if>
         <if test="weight != null "> and weight = #{weight}</if>
-<!--        <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>-->
         <if test="entranceId != null  and entranceId != ''"> and entrance_id = #{entranceId}</if>
         <if test="exitId != null  and exitId != ''"> and exit_id = #{exitId}</if>
+        <if test="trayType != null  and trayType != ''"> and tray_type = #{trayType}</if>
+<!--        <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>-->
 <!--        <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>-->
 <!--        <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>-->
 <!--        <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>-->
 <!--        <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>-->
-        <if test="trayType != null  and trayType != ''"> and tray_type = #{trayType}</if>
+
 <!--         ${params.warehouseScope} -->
     </select>
     <select id="selectOutMydoJobFinishList" resultType="com.ruoyi.in.job.domain.MydoJob" resultMap="MydoJobResult">