diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/service/IPortService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/service/IPortService.java
index 8318839..2f71963 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/service/IPortService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/service/IPortService.java
@@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 出入口
- * @Author: jeecg-boot
- * @Date: 2022-10-27
- * @Version: V1.0
+ * @Author: jeecg-boot
+ * @Date: 2022-10-27
+ * @Version: V1.0
*/
public interface IPortService extends IService<Port> {
@@ -22,7 +22,7 @@ public interface IPortService extends IService<Port> {
Port getPortByCode(String code, Integer type, String zoneCode, String warehouseCode);
- Port getPortByCode(String code, String zoneCode, String warehouseCode);
+ //Port getPortByCode(String code, String zoneCode, String warehouseCode);
Port getPortByCode(String code, String warehouseCode);
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/service/impl/PortServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/service/impl/PortServiceImpl.java
index dfde49f..73b0ebe 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/service/impl/PortServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/service/impl/PortServiceImpl.java
@@ -14,9 +14,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 出入口
- * @Author: jeecg-boot
- * @Date: 2022-10-27
- * @Version: V1.0
+ * @Author: jeecg-boot
+ * @Date: 2022-10-27
+ * @Version: V1.0
*/
@Service
public class PortServiceImpl extends ServiceImpl<PortMapper, Port> implements IPortService {
@@ -33,7 +33,7 @@ public class PortServiceImpl extends ServiceImpl<PortMapper, Port> implements IP
public List<Port> getPortListByType(int type, Integer roadWay, String zoneCode, String warehouseCode) {
LambdaQueryWrapper<Port> portLambdaQueryWrapper = Wrappers.lambdaQuery();
portLambdaQueryWrapper.eq(Port::getType, type).eq(Port::getZoneCode, zoneCode).eq(Port::getWarehouseCode, warehouseCode).in(roadWay != null,
- Port::getRoadWay, roadWay);
+ Port::getRoadWay, roadWay);
List<Port> portList = list(portLambdaQueryWrapper);
if (CollectionUtils.isEmpty(portList)) {
portList = getPortListByType(type, zoneCode, warehouseCode);
@@ -44,19 +44,17 @@ public class PortServiceImpl extends ServiceImpl<PortMapper, Port> implements IP
@Override
public Port getPortByCode(String code, Integer type, String zoneCode, String warehouseCode) {
LambdaQueryWrapper<Port> portLambdaQueryWrapper = Wrappers.lambdaQuery();
- portLambdaQueryWrapper.eq(Port::getCode, code).eq(Port::getZoneCode, zoneCode).eq(Port::getWarehouseCode, warehouseCode).in(type != null, Port::getType,
- type);
- Port port = getOne(portLambdaQueryWrapper);
- return port;
+ portLambdaQueryWrapper.eq(Port::getCode, code).eq(Port::getZoneCode, zoneCode).eq(Port::getWarehouseCode, warehouseCode).in(type != null, Port::getType, type);
+ return getOne(portLambdaQueryWrapper);
}
- @Override
- public Port getPortByCode(String code, String zoneCode, String warehouseCode) {
- LambdaQueryWrapper<Port> portLambdaQueryWrapper = Wrappers.lambdaQuery();
- portLambdaQueryWrapper.eq(Port::getCode, code).eq(Port::getZoneCode, zoneCode).eq(Port::getWarehouseCode, warehouseCode);
- Port port = getOne(portLambdaQueryWrapper);
- return port;
- }
+ //@Override
+ //public Port getPortByCode(String code, String zoneCode, String warehouseCode) {
+ // LambdaQueryWrapper<Port> portLambdaQueryWrapper = Wrappers.lambdaQuery();
+ // portLambdaQueryWrapper.eq(Port::getCode, code).eq(Port::getZoneCode, zoneCode).eq(Port::getWarehouseCode, warehouseCode);
+ // Port port = getOne(portLambdaQueryWrapper);
+ // return port;
+ //}
@Override
public Port getPortByCode(String code, String warehouseCode) {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
index 19f7a7c..895dc96 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -91,9 +91,9 @@ import lombok.extern.slf4j.Slf4j;
/**
* @Description: 任务表
- * @Author: jeecg-boot
- * @Date: 2022-11-10
- * @Version: V1.0
+ * @Author: jeecg-boot
+ * @Date: 2022-11-10
+ * @Version: V1.0
*/
@Slf4j
@Service
@@ -222,7 +222,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 如果库位是锁定的，那么这个库位一定是被某个任务占用。
- * @param location
+ *
+ * @param location
* @return
*/
@Override
@@ -332,11 +333,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_TRANSFER, containerCode, fromLocationCode, toLocationCode,
- warehouseCode);
+ warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
- TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult();
+ TaskLockEntity taskLockEntity = (TaskLockEntity) result.getResult();
String zoneCode = taskLockEntity.getZoneCode();
// 4. 判断源库位旁边有托盘但是没有任务,那么不允许移库
TaskHeader taskHeader = new TaskHeader();
@@ -403,13 +404,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
toLocationCode = fromLocationCode;
}
Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_CHECK_OUT, containerCode, fromLocationCode, toLocationCode,
- warehouseCode);
+ warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
- TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult();
+ TaskLockEntity taskLockEntity = (TaskLockEntity) result.getResult();
String zoneCode = taskLockEntity.getZoneCode();
- Port port = portService.getPortByCode(toPortCode, zoneCode, warehouseCode);
+ Port port = portService.getPortByCode(toPortCode, QuantityConstant.PORT_TYPE_PICK, zoneCode, warehouseCode);
if (port == null) {
throw new JeecgBootException("创建出库查看任务时，没有找到出库口:" + toPortCode);
}
@@ -465,11 +466,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
toLocationCode = fromLocationCode;
}
Result result =
- taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_QUALITY, containerCode, fromLocationCode, toLocationCode, warehouseCode);
+ taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_QUALITY, containerCode, fromLocationCode, toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
- TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult();
+ TaskLockEntity taskLockEntity = (TaskLockEntity) result.getResult();
String zoneCode = taskLockEntity.getZoneCode();
Port port = portService.getPortByCode(toPortCode, QuantityConstant.PORT_TYPE_PICK, zoneCode, warehouseCode);
if (port == null) {
@@ -493,7 +494,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getContainerCode, containerCode).eq(InventoryDetail::getWarehouseCode, warehouseCode)
- .eq(InventoryDetail::getLocationCode, fromLocationCode);
+ .eq(InventoryDetail::getLocationCode, fromLocationCode);
List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
List<TaskDetail> taskDetailList = new ArrayList<>();
if (inventoryDetailList.size() != 0) {
@@ -552,7 +553,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
return Result.error("创建跨站任务时，起始站台和目标站台不能相同");
}
Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_OVER_STATION, containerCode, QuantityConstant.EMPTY_STRING,
- QuantityConstant.EMPTY_STRING, warehouseCode);
+ QuantityConstant.EMPTY_STRING, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -628,7 +629,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
int high = locationHigh.getHigh();
boolean bypass = false;
String toLocationCode =
- allocationService.allocation(allocationRule, locationTypeCodeList, high, zoneCode, roadWays, warehouseCode, containerCode, null, null, bypass);
+ allocationService.allocation(allocationRule, locationTypeCodeList, high, zoneCode, roadWays, warehouseCode, containerCode, null, null, bypass);
if (StringUtils.isEmpty(toLocationCode)) {
throw new JeecgBootException("创建空托盘组入库任务时，目标库位为空");
}
@@ -650,11 +651,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
log.info("开始创建空托盘组入库任务，容器编码" + containerCode + ",库位编码" + toLocationCode);
Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_MANY_EMPTYRECEIPT, containerCode,
- QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode);
+ QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
- TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult();
+ TaskLockEntity taskLockEntity = (TaskLockEntity) result.getResult();
String zoneCode = taskLockEntity.getZoneCode();
TaskHeader taskHeader = new TaskHeader();
taskHeader.setWarehouseCode(warehouseCode);
@@ -687,11 +688,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
return Result.error("创建空托盘组出库任务时，仓库编码为空");
}
Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_MANY_EMPTYSHIPMENT, containerCode,
- QuantityConstant.EMPTY_STRING, QuantityConstant.EMPTY_STRING, warehouseCode);
+ QuantityConstant.EMPTY_STRING, QuantityConstant.EMPTY_STRING, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
- TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult();
+ TaskLockEntity taskLockEntity = (TaskLockEntity) result.getResult();
String zoneCode = taskLockEntity.getZoneCode();
Container container = containerService.getContainerByCode(containerCode, warehouseCode);
String fromLocationCode = container.getLocationCode();
@@ -764,13 +765,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
// 5、删除容器上的库位编码，并设置状态为空闲，填充度状态为空盘
boolean success = containerService.updateLocationCodeAndStatus(containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_CONTAINER_EMPTY,
- QuantityConstant.STATUS_CONTAINER_FILL_EMPTY, warehouseCode);
+ QuantityConstant.STATUS_CONTAINER_FILL_EMPTY, warehouseCode);
if (!success) {
throw new JeecgBootException("处理空出失败, 更新容器状态失败");
}
// 6、删除库位上的容器编码，并设置状态为空闲
success =
- locationService.updateContainerCodeAndStatus(fromLocationCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+ locationService.updateContainerCodeAndStatus(fromLocationCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
if (!success) {
throw new JeecgBootException("处理空出失败, 更新库位状态失败");
}
@@ -785,7 +786,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
// 8、删除库存详情失败
List<InventoryDetail> inventoryDetailList = inventoryDetailService.getInventoryDetailListByContainerCode(containerCode, warehouseCode);
if (inventoryDetailList.size() != 0) {
- List<Integer> idList = inventoryDetailList.stream().map(InventoryDetail::getId).collect(Collectors.toList());;
+ List<Integer> idList = inventoryDetailList.stream().map(InventoryDetail::getId).collect(Collectors.toList());
+ ;
success = inventoryDetailService.removeByIds(idList);
if (!success) {
throw new JeecgBootException("处理空出失败, 删除库存详情失败");
@@ -843,7 +845,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
}
}
- ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(taskHeader.getReceiptContainerHeaderId());;
+ ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(taskHeader.getReceiptContainerHeaderId());
+ ;
if (receiptContainerHeader != null) {
success = receiptContainerHeaderService.updateStatusById(QuantityConstant.RECEIPT_CONTAINER_FINISHED, receiptContainerHeader.getId());
if (!success) {
@@ -989,7 +992,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
public TaskHeader getUnCompleteTaskByFromLocationCode(String fromLocationCode, String warehouseCode) {
LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
taskHeaderLambdaQueryWrapper.eq(TaskHeader::getFromLocationCode, fromLocationCode).eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus,
- QuantityConstant.TASK_STATUS_COMPLETED);
+ QuantityConstant.TASK_STATUS_COMPLETED);
TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper);
return taskHeader;
}
@@ -998,7 +1001,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
public TaskHeader getUnCompleteTaskByToLocationCode(String toLocationCode, String warehouseCode) {
LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
taskHeaderLambdaQueryWrapper.eq(TaskHeader::getToLocationCode, toLocationCode).eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus,
- QuantityConstant.TASK_STATUS_COMPLETED);
+ QuantityConstant.TASK_STATUS_COMPLETED);
TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper);
return taskHeader;
}
@@ -1016,7 +1019,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
public TaskHeader getUnCompleteTaskByContainerCode(String containerCode, String warehouseCode) {
LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
taskHeaderLambdaQueryWrapper.eq(TaskHeader::getContainerCode, containerCode).eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus,
- QuantityConstant.TASK_STATUS_COMPLETED);
+ QuantityConstant.TASK_STATUS_COMPLETED);
TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper);
return taskHeader;
}
@@ -1025,7 +1028,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
public TaskHeader getUnCompleteTaskByPreTaskNo(int preTaskNo, String warehouseCode) {
LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
taskHeaderLambdaQueryWrapper.eq(TaskHeader::getPreTaskNo, preTaskNo).eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus,
- QuantityConstant.TASK_STATUS_COMPLETED);
+ QuantityConstant.TASK_STATUS_COMPLETED);
TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper);
return taskHeader;
}
@@ -1223,9 +1226,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
* 创建空托盘入库
* 1. 判断托盘号、库位编码是否满足要求
* 2. 创建任务，锁定容器、库位
- * @param containerCode
- * @param toLocationCode
- * @param warehouseCode
+ *
+ * @param containerCode
+ * @param toLocationCode
+ * @param warehouseCode
* @return
*/
@Override
@@ -1251,7 +1255,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_EMPTYRECEIPT, containerCode, QuantityConstant.EMPTY_STRING,
- toLocationCode, warehouseCode);
+ toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -1282,9 +1286,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 创建空托盘出库
- * @param containerCode
- * @param toPortCode
- * @param warehouseCode
+ *
+ * @param containerCode
+ * @param toPortCode
+ * @param warehouseCode
* @return
*/
@Override
@@ -1303,13 +1308,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
Container container = containerService.getContainerByCode(containerCode, warehouseCode);
String fromLocationCode = container.getLocationCode();
Result result = taskHeaderService.createTaskLockContainerAndLocation(QuantityConstant.TASK_TYPE_EMPTYSHIPMENT, containerCode, QuantityConstant.EMPTY_STRING,
- QuantityConstant.EMPTY_STRING, warehouseCode);
+ QuantityConstant.EMPTY_STRING, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
- TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult();
+ TaskLockEntity taskLockEntity = (TaskLockEntity) result.getResult();
String zoneCode = taskLockEntity.getZoneCode();
- Port port = portService.getPortByCode(toPortCode, zoneCode, warehouseCode);
+ Port port = portService.getPortByCode(toPortCode, QuantityConstant.PORT_TYPE_OUT, zoneCode, warehouseCode);
if (port == null) {
return Result.error("创建空托盘出库时， 没有找到出库口" + toPortCode);
}
@@ -1347,8 +1352,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
containerLambdaQueryWrapper.eq(Container::getStatus, QuantityConstant.STATUS_CONTAINER_EMPTY).ne(Container::getLocationCode, QuantityConstant.EMPTY_STRING)
- .eq(Container::getFillStatus, QuantityConstant.STATUS_CONTAINER_FILL_EMPTY).eq(Container::getWarehouseCode, warehouseCode)
- .orderByAsc(Container::getUpdateTime);
+ .eq(Container::getFillStatus, QuantityConstant.STATUS_CONTAINER_FILL_EMPTY).eq(Container::getWarehouseCode, warehouseCode)
+ .orderByAsc(Container::getUpdateTime);
List<Container> containerList = containerService.list(containerLambdaQueryWrapper);
List<Container> removeContainerList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(containerList)) {
@@ -1380,16 +1385,17 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 完成入库任务
- * @param taskHeader 任务
- * @return AjaxResult 完成入库任务结果
+ *
+ * @param taskHeader 任务
+ * @return AjaxResult 完成入库任务结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
@OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'入库任务完成'", extra = "#extraJsonString1",
- msg = "#taskHeader == null ? '' : '任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()",
- recordReturnValue = true)
+ msg = "#taskHeader == null ? '' : '任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()",
+ recordReturnValue = true)
@OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库任务完成'", extra = "#extraJsonString1",
- msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()", recordReturnValue = true)
+ msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()", recordReturnValue = true)
@OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'详情入库完成'", extra = "#extraJsonString2", msg = "''", recordReturnValue = true)
public Result completeReceiptTask(TaskHeader taskHeader) {
if (taskHeader == null) {
@@ -1411,7 +1417,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
int allow = parameterConfigurationService.getIntValueByCode(QuantityConstant.RULE_CALL_BOX_ALLOW_EMPTY);
if (allow == QuantityConstant.RULE_ALLOW_EMPTY) {
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode,
- fromLocationCode, toLocationCode, warehouseCode);
+ fromLocationCode, toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -1565,7 +1571,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
}
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, fromLocationCode,
- toLocationCode, warehouseCode);
+ toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -1583,17 +1589,18 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 完成出库任务
- * @param taskHeader 任务
- * @return result 完成出库任务
+ *
+ * @param taskHeader 任务
+ * @return result 完成出库任务
*/
@Override
@Transactional(rollbackFor = Exception.class)
@OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1",
- msg = "#taskHeader == null ? '' : '任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()",
- recordReturnValue = true)
+ msg = "#taskHeader == null ? '' : '任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()",
+ recordReturnValue = true)
@OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1",
- msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getFromLocationCode() + '，容器编码：' + #taskHeader.getContainerCode() + '，目标出入口：' + #taskHeader.getToPortCode()",
- recordReturnValue = true)
+ msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getFromLocationCode() + '，容器编码：' + #taskHeader.getContainerCode() + '，目标出入口：' + #taskHeader.getToPortCode()",
+ recordReturnValue = true)
@OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情出库完成'", extra = "#extraJsonString2", msg = "''", recordReturnValue = true)
public Result completeShipmentTask(TaskHeader taskHeader) {
if (taskHeader == null) {
@@ -1633,7 +1640,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
}
List<ShipmentContainerAdvice> shipmentContainerAdviceList =
- shipmentContainerAdviceService.getShipmentContainerAdviceListByShipmentContainerId(shipmentContainerHeader.getId());
+ shipmentContainerAdviceService.getShipmentContainerAdviceListByShipmentContainerId(shipmentContainerHeader.getId());
for (ShipmentContainerAdvice shipmentContainerAdvice : shipmentContainerAdviceList) {
if (!shipmentContainerAdviceService.updateStatusById(QuantityConstant.SHIPMENT_CONTAINER_FINISHED, shipmentContainerAdvice.getId())) {
throw new JeecgBootException("完成出库任务，更新出库预配盘失败");
@@ -1657,7 +1664,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
}
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode,
- fromLocationCode, toLocationCode, warehouseCode);
+ fromLocationCode, toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -1828,7 +1835,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
}
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, fromLocationCode,
- toLocationCode, warehouseCode);
+ toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -1904,8 +1911,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
InventoryDetail inventoryDetail1 = inventoryDetailList.get(i);
InventoryDetail inventoryDetail2 = inventoryDetailList.get(j);
if (inventoryDetail1.getMaterialCode().equals(inventoryDetail2.getMaterialCode()) && inventoryDetail1.getBatch().equals(inventoryDetail2.getBatch())
- && inventoryDetail1.getLot().equals(inventoryDetail2.getLot()) && inventoryDetail1.getProject().equals(inventoryDetail2.getProject())
- && inventoryDetail1.getInventoryStatus().equals(inventoryDetail2.getInventoryStatus())) {
+ && inventoryDetail1.getLot().equals(inventoryDetail2.getLot()) && inventoryDetail1.getProject().equals(inventoryDetail2.getProject())
+ && inventoryDetail1.getInventoryStatus().equals(inventoryDetail2.getInventoryStatus())) {
// 属性一样的库存，相加合并。
if (StringUtils.isNotEmpty(inventoryDetail1.getSn())) {
if (!inventoryDetail1.getSn().equals(inventoryDetail2.getSn())) {
@@ -1950,6 +1957,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 锁定容器和库位分4种情况，入库任务、出库任务、分拣任务、换站任务
+ *
* @param
*/
@Override
@@ -2166,7 +2174,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
@Override
@Transactional(rollbackFor = Exception.class)
public Result completeTaskUnLockContainerAndLocation(String containerFillStatus, int taskType, String containerCode, String fromLocationCode,
- String toLocationCode, String warehouseCode) {
+ String toLocationCode, String warehouseCode) {
boolean success = false;
if (StringUtils.isEmpty(containerCode)) {
return Result.error("任务类型" + taskType + "完成任务时, 容器编码为空");
@@ -2212,7 +2220,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
break;
case QuantityConstant.TASK_TYPE_OVER_STATION:
success = containerService.updateLocationCodeAndStatus(containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_CONTAINER_EMPTY,
- warehouseCode);
+ warehouseCode);
break;
}
if (!success) {
@@ -2224,7 +2232,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
return Result.error("任务类型" + taskType + "完成任务时，" + toLocationCode + "目标库位不存在");
}
success =
- locationService.updateContainerCodeAndStatus(fromLocationCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+ locationService.updateContainerCodeAndStatus(fromLocationCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
if (!success) {
throw new JeecgBootException("任务类型" + taskType + "完成任务时,更新源库位失败");
}
@@ -2378,7 +2386,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
- TaskHeader taskHeader = (TaskHeader)result.getResult();
+ TaskHeader taskHeader = (TaskHeader) result.getResult();
if (taskHeader.getTaskType() == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
if (port == null) {
throw new JeecgBootException("快速入库, 生成补充任务时必须有入库口");
@@ -2448,7 +2456,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
shipmentDetailList.add(shipmentDetail);
shipmentQtyList.add(qty);
List<InventoryDetail> inventoryDetailList =
- inventoryDetailService.getInventoryDetailListByMaterialCodeToShipment(materialCode, zoneCode, qty, warehouseCode);
+ inventoryDetailService.getInventoryDetailListByMaterialCodeToShipment(materialCode, zoneCode, qty, warehouseCode);
List<InventoryDetail> removeInventoryDetailList = new ArrayList<>();
for (InventoryDetail inventoryDetail : inventoryDetailList) {
if (roadWay.intValue() == inventoryDetail.getRoadWay().intValue()) {
@@ -2484,7 +2492,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
ShipmentDetail shipmentDetail = shipmentDetailService.getById(shipmentDetailId);
BigDecimal shipQty = shipmentQtyList.get(i);
InventoryDetail inventoryDetail =
- inventoryDetailService.getInventoryDetailByMaterialCodeToShipment(switchContainerCode, shipmentDetail.getMaterialCode(), shipQty, warehouseCode);
+ inventoryDetailService.getInventoryDetailByMaterialCodeToShipment(switchContainerCode, shipmentDetail.getMaterialCode(), shipQty, warehouseCode);
CombinationModel combinationModel = new CombinationModel();
combinationModel.setShipmentDetail(shipmentDetail);
combinationModel.setInventoryDetail(inventoryDetail);
@@ -2577,8 +2585,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 完成空托盘入库任务
- * @param taskHeader 任务
- * @return Result 完成入库任务结果
+ *
+ * @param taskHeader 任务
+ * @return Result 完成入库任务结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -2597,7 +2606,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
return Result.error("完成空托盘入库任务时, 目标库位编码为空");
}
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_EMPTYRECEIPT,
- containerCode, QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode);
+ containerCode, QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -2612,7 +2621,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 盘点完成
* 盘点有差异完成时状态为105
- * @param taskHeader
+ *
+ * @param taskHeader
* @return
*/
@Override
@@ -2901,7 +2911,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
cycleCountHeaderService.updataHeaderStatus(cycleCountDetail.getCycleCountHeadCode());
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_CHECK_OUT,
- containerCode, fromLocationCode, toLocationCode, warehouseCode);
+ containerCode, fromLocationCode, toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -2915,8 +2925,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 完成空托盘出库任务
- * @param taskHeader 任务
- * @return Result 完成出库任务结果
+ *
+ * @param taskHeader 任务
+ * @return Result 完成出库任务结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -2947,12 +2958,12 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (fromLocation == null) {
return Result.error("完成空托盘出库任务时，" + fromLocationCode + "目标库位不存在");
}
- Port port = portService.getPortByCode(toPortCode, zoneCode, warehouseCode);
+ Port port = portService.getPortByCode(toPortCode, QuantityConstant.PORT_TYPE_OUT, zoneCode, warehouseCode);
if (port == null) {
return Result.error("完成空托盘出库任务时，" + toPortCode + "目标出库口不存在");
}
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_EMPTYSHIPMENT,
- containerCode, fromLocationCode, QuantityConstant.EMPTY_STRING, warehouseCode);
+ containerCode, fromLocationCode, QuantityConstant.EMPTY_STRING, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -2966,8 +2977,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 完成移库任务
- * @param taskHeader 任务
- * @return Result 完成移库任务结果
+ *
+ * @param taskHeader 任务
+ * @return Result 完成移库任务结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -2994,7 +3006,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
List<InventoryTransaction> inventoryTransactionList = new ArrayList<>();
LambdaUpdateWrapper<InventoryDetail> inventoryDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
inventoryDetailLambdaUpdateWrapper.eq(InventoryDetail::getWarehouseCode, warehouseCode).eq(InventoryDetail::getContainerCode, containerCode)
- .eq(InventoryDetail::getLocationCode, fromLocationCode);
+ .eq(InventoryDetail::getLocationCode, fromLocationCode);
List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaUpdateWrapper);
for (InventoryDetail inventoryDetail : inventoryDetailList) {
inventoryDetail.setLocationCode(toLocationCode);
@@ -3025,7 +3037,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
}
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_TRANSFER,
- containerCode, fromLocationCode, toLocationCode, warehouseCode);
+ containerCode, fromLocationCode, toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -3039,8 +3051,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 完成出库查看任务
- * @param taskHeader 任务
- * @return Result 完成出库查看任务结果
+ *
+ * @param taskHeader 任务
+ * @return Result 完成出库查看任务结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -3071,7 +3084,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
boolean success = false;
LambdaUpdateWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaUpdate();
inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getWarehouseCode, warehouseCode).eq(InventoryDetail::getContainerCode, containerCode)
- .eq(InventoryDetail::getLocationCode, fromLocationCode);
+ .eq(InventoryDetail::getLocationCode, fromLocationCode);
List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
if (inventoryDetailList.size() != 0) {
List<InventoryDetail> inventoryDetailList1 = new ArrayList<>();
@@ -3098,7 +3111,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_CHECK_OUT,
- containerCode, fromLocationCode, toLocationCode, warehouseCode);
+ containerCode, fromLocationCode, toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -3113,8 +3126,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 完成跨站任务
- * @param taskHeader 任务
- * @return Result 完成跨站任务结果
+ *
+ * @param taskHeader 任务
+ * @return Result 完成跨站任务结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -3149,7 +3163,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
return Result.error("创建跨站任务时，目标站台为空");
}
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_OVER_STATION,
- containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.EMPTY_STRING, warehouseCode);
+ containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.EMPTY_STRING, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -3164,8 +3178,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 完成空托盘组入库任务
- * @param taskHeader 任务
- * @return Result 完成空托盘组入库任务结果
+ *
+ * @param taskHeader 任务
+ * @return Result 完成空托盘组入库任务结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -3192,7 +3207,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
return Result.error("完成空托盘组入库任务时，没有找到库位" + toLocationCode);
}
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_MANY_EMPTYRECEIPT,
- containerCode, QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode);
+ containerCode, QuantityConstant.EMPTY_STRING, toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -3207,8 +3222,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 完成空托盘组出库任务
- * @param taskHeader 任务
- * @return Result 完成空托盘组出库任务结果
+ *
+ * @param taskHeader 任务
+ * @return Result 完成空托盘组出库任务结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -3243,7 +3259,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
return Result.error("完成空托盘组出库任务时，" + fromLocationCode + "起始库位不存在");
}
String zoneCode = fromLocation.getZoneCode();
- Port port = portService.getPortByCode(toPortCode, zoneCode, warehouseCode);
+ Port port = portService.getPortByCode(toPortCode, QuantityConstant.PORT_TYPE_OUT, zoneCode, warehouseCode);
if (port == null) {
return Result.error("完成空托盘组出库任务时，没有找到出入口" + toPortCode);
}
@@ -3253,7 +3269,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
throw new JeecgBootException("完成空托盘组出库任务时, 更新任务失败");
}
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_MANY_EMPTYSHIPMENT,
- containerCode, fromLocationCode, QuantityConstant.EMPTY_STRING, warehouseCode);
+ containerCode, fromLocationCode, QuantityConstant.EMPTY_STRING, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -3392,7 +3408,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
}
Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), QuantityConstant.TASK_TYPE_QUALITY,
- containerCode, fromLocationCode, toLocationCode, warehouseCode);
+ containerCode, fromLocationCode, toLocationCode, warehouseCode);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
@@ -3406,8 +3422,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 取消入库任务
- * @param taskHeader 任务
- * @return Result 取消入库任务结果
+ *
+ * @param taskHeader 任务
+ * @return Result 取消入库任务结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -3426,8 +3443,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 取消出库任务
- * @param taskHeader 任务
- * @return Result 取消出库任务结果
+ *
+ * @param taskHeader 任务
+ * @return Result 取消出库任务结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -3449,7 +3467,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
log.info("开始取消盘点任务");
LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
cycleCountDetailLambdaQueryWrapper.eq(CycleCountDetail::getContainerCode, taskHeader.getContainerCode()).ne(CycleCountDetail::getEnableStatus,
- QuantityConstant.SHIPMENT_RECEIVE_SUCCESS);
+ QuantityConstant.SHIPMENT_RECEIVE_SUCCESS);
CycleCountDetail cycleCountDetail = cycleCountDetailService.getOne(cycleCountDetailLambdaQueryWrapper);
if (cycleCountDetail == null) {
throw new JeecgBootException("取消盘点任务，没有找到盘点明细");
@@ -3505,7 +3523,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
/**
* 取消任务，恢复容器和库位状态
- * @param taskHeader
+ *
+ * @param taskHeader
* @return
*/
@Override
@@ -3557,7 +3576,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
public boolean updateById(TaskHeader taskHeader) {
LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
taskHeaderLambdaQueryWrapper.eq(TaskHeader::getId, taskHeader.getId()).lt(taskHeader.getStatus() != null, TaskHeader::getStatus,
- QuantityConstant.TASK_STATUS_COMPLETED);
+ QuantityConstant.TASK_STATUS_COMPLETED);
return super.update(taskHeader, taskHeaderLambdaQueryWrapper);
}