From 371e8f322448b6fd797be96d512da441e2154b0b Mon Sep 17 00:00:00 2001 From: FT577-Server Date: Wed, 21 Oct 2026 09:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=89=98=E7=9B=98=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=91=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/api/service/impl/ApiWcsService.java | 20 +++++++++------ .../com/ruoyi/bas/stock/domain/BasStock.java | 4 +++ .../ruoyi/bas/stock/domain/BasStockInfo.java | 2 +- .../com/ruoyi/in/bind/domain/InTrayMsg.java | 2 +- .../java/com/ruoyi/in/job/domain/MydoJob.java | 2 +- .../ruoyi/in/job/service/IMydoJobService.java | 7 ++++++ .../job/service/impl/MydoJobServiceImpl.java | 20 ++++++++++++++- .../in/jobdetail/domain/MydoJobDetail.java | 2 +- .../service/impl/OutStockoutServiceImpl.java | 12 ++++----- .../service/impl/PdStockpdServiceImpl.java | 2 +- .../pda/service/impl/PdaServiceImpl.java | 25 ++++++++++--------- .../resources/mapper/bas/BasStockMapper.xml | 12 ++++++--- .../resources/mapper/in/MydoJobMapper.xml | 5 ++-- 13 files changed, 78 insertions(+), 37 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java index a1d0395..8b7f9ba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiWcsService.java +++ b/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()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/domain/BasStock.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/domain/BasStock.java index 9d51f33..41e0480 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/domain/BasStock.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/domain/BasStockInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/domain/BasStockInfo.java index 6cb93a5..b436dad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/stock/domain/BasStockInfo.java +++ b/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 = "托盘状态") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/bind/domain/InTrayMsg.java b/ruoyi-admin/src/main/java/com/ruoyi/in/bind/domain/InTrayMsg.java index c98cf60..695a47a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/bind/domain/InTrayMsg.java +++ b/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 = "生成时间") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/job/domain/MydoJob.java b/ruoyi-admin/src/main/java/com/ruoyi/in/job/domain/MydoJob.java index cd9f6df..08292ee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/job/domain/MydoJob.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/IMydoJobService.java index fc2818d..f35952b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/IMydoJobService.java +++ b/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); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java index a8263f2..a4c7e2e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java +++ b/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 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"; + } + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/jobdetail/domain/MydoJobDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/in/jobdetail/domain/MydoJobDetail.java index f6b4640..79d7e2b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/jobdetail/domain/MydoJobDetail.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java index 3eb9eca..029dfed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/stockout/service/impl/OutStockoutServiceImpl.java +++ b/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()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pd/stockpd/service/impl/PdStockpdServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/pd/stockpd/service/impl/PdStockpdServiceImpl.java index b95d2ea..610ab08 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pd/stockpd/service/impl/PdStockpdServiceImpl.java +++ b/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(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java index cea296c..abe19af 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java +++ b/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); - if (trayType == 0){ + String trayType = mydoJobService.getTrayTypeByTrayCodeString(trayCode); + 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(); - }else if (type == 2){ + cargoParam = new BasCargoSpace().builder().theType(theType).cargoAreaId(cargoAreaId).build(); + }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 stocks = basStockService.selectBasStockListByTrayCode(trayCode); - int trayType = mydoJobService.getTrayTypeByTrayCode(trayCode); + String trayType = mydoJobService.getTrayTypeByTrayCodeString(trayCode); //空托盘回流 if (stocks.isEmpty()){ // inTrayMsgService.insertInTrayMsg( diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml index 43c9cfb..c1af66e 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml @@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 @@ -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" and bs.stockin_detail_id = #{stockinDetailId} and bs.stockin_id = #{stockinId} and bs.in_type = #{inType} + and bs.tray_type = #{trayType} and bs.warehouse_name like concat('%', #{warehouseName}, '%') and bs.user_name like concat('%', #{userName}, '%') and bs.dept_name like concat('%', #{deptName}, '%') @@ -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" and bs.stockin_detail_id = #{stockinDetailId} and bs.stockin_id = #{stockinId} and bs.in_type = #{inType} + and bs.tray_type = #{trayType} and bs.warehouse_name like concat('%', #{warehouseName}, '%') and bs.user_name like concat('%', #{userName}, '%') and bs.dept_name like concat('%', #{deptName}, '%') @@ -160,6 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" stockin_detail_id, stockin_id, in_type, + tray_type, warehouse_id, warehouse_name, user_id, @@ -191,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{stockinDetailId}, #{stockinId}, #{inType}, + #{trayType}, #{warehouseId}, #{warehouseName}, #{userId}, @@ -224,6 +229,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" stockin_detail_id = #{stockinDetailId}, stockin_id = #{stockinId}, in_type = #{inType}, + tray_type = #{trayType}, warehouse_id = #{warehouseId}, warehouse_name = #{warehouseName}, user_id = #{userId}, diff --git a/ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml index 704e4ea..32db443 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/MydoJobMapper.xml @@ -291,14 +291,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and priority = #{priority} and height = #{height} and weight = #{weight} - and entrance_id = #{entranceId} and exit_id = #{exitId} + and tray_type = #{trayType} + - and tray_type = #{trayType} +