常熟吴彦祖 4 months ago
parent
commit
a98f565d41
  1. 86
      src/main/java/com/gaotao/modules/automatedWarehouse/controller/OrderTaskController.java
  2. 65
      src/main/java/com/gaotao/modules/automatedWarehouse/entity/WmsOrderTaskData.java
  3. 65
      src/main/java/com/gaotao/modules/automatedWarehouse/entity/WmsTransportTaskData.java
  4. 77
      src/main/java/com/gaotao/modules/automatedWarehouse/mapper/OrderTaskMapper.java
  5. 60
      src/main/java/com/gaotao/modules/automatedWarehouse/service/OrderTaskService.java
  6. 2
      src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/KitTransportProcessServiceImpl.java
  7. 124
      src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/OrderTaskServiceImpl.java
  8. 2
      src/main/resources/mapper/automatedWarehouse/KitTransportMapper.xml
  9. 158
      src/main/resources/mapper/automatedWarehouse/OrderTaskMapper.xml

86
src/main/java/com/gaotao/modules/automatedWarehouse/controller/OrderTaskController.java

@ -0,0 +1,86 @@
package com.gaotao.modules.automatedWarehouse.controller;
import com.gaotao.common.utils.PageUtils;
import com.gaotao.common.utils.R;
import com.gaotao.modules.automatedWarehouse.entity.WmsOrderTaskData;
import com.gaotao.modules.automatedWarehouse.entity.WmsOrderTaskDetail;
import com.gaotao.modules.automatedWarehouse.entity.WmsTransportTask;
import com.gaotao.modules.automatedWarehouse.entity.WmsTransportTaskDetail;
import com.gaotao.modules.automatedWarehouse.service.OrderTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @Description 订单任务查询Controller - rqrq
* @Author rqrq
* @Date 2025/10/22
*/
@RestController
@RequestMapping("automatedWarehouse/orderTask")
public class OrderTaskController {
@Autowired
private OrderTaskService orderTaskService;
/**
* @Description 查询订单任务列表分页- rqrq
* @Title searchOrderTaskList
* @param data 查询条件
* @return R
* @author rqrq
* @date 2025/10/22
*/
@PostMapping(value = "/searchOrderTaskList")
public R searchOrderTaskList(@RequestBody WmsOrderTaskData data) throws Exception {
PageUtils page = orderTaskService.searchOrderTaskList(data);
return R.ok().put("page", page);
}
/**
* @Description 查询订单任务明细列表 - rqrq
* @Title searchOrderTaskDetailList
* @param data 查询条件
* @return R
* @author rqrq
* @date 2025/10/22
*/
@PostMapping(value = "/searchOrderTaskDetailList")
public R searchOrderTaskDetailList(@RequestBody WmsOrderTaskData data) throws Exception {
List<WmsOrderTaskDetail> rows = orderTaskService.searchOrderTaskDetailList(data);
return R.ok().put("rows", rows);
}
/**
* @Description 查询订单关联的运输任务列表 - rqrq
* @Title searchTransportTaskList
* @param data 查询条件
* @return R
* @author rqrq
* @date 2025/10/22
*/
@PostMapping(value = "/searchTransportTaskList")
public R searchTransportTaskList(@RequestBody WmsOrderTaskData data) throws Exception {
List<WmsTransportTask> rows = orderTaskService.searchTransportTaskList(data);
return R.ok().put("rows", rows);
}
/**
* @Description 查询运输任务明细列表 - rqrq
* @Title searchTransportTaskDetailList
* @param data 查询条件
* @return R
* @author rqrq
* @date 2025/10/22
*/
@PostMapping(value = "/searchTransportTaskDetailList")
public R searchTransportTaskDetailList(@RequestBody WmsTransportTask data) throws Exception {
List<WmsTransportTaskDetail> rows = orderTaskService.searchTransportTaskDetailList(data);
return R.ok().put("rows", rows);
}
}

65
src/main/java/com/gaotao/modules/automatedWarehouse/entity/WmsOrderTaskData.java

@ -0,0 +1,65 @@
package com.gaotao.modules.automatedWarehouse.entity;
import org.apache.ibatis.type.Alias;
/**
* @Description WMS订单任务业务实体类 - 用于查询 - rqrq
* @Author rqrq
* @Date 2025/10/22
*/
@Alias("WmsOrderTaskData")
public class WmsOrderTaskData extends WmsOrderTask {
/**
* 分页参数 - 当前页 - rqrq
*/
private Integer page;
/**
* 分页参数 - 每页大小 - rqrq
*/
private Integer limit;
/**
* 查询条件 - 开始日期 - rqrq
*/
private String startDate;
/**
* 查询条件 - 结束日期 - rqrq
*/
private String endDate;
public Integer getPage() {
return page;
}
public void setPage(Integer page) {
this.page = page;
}
public Integer getLimit() {
return limit;
}
public void setLimit(Integer limit) {
this.limit = limit;
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
}

65
src/main/java/com/gaotao/modules/automatedWarehouse/entity/WmsTransportTaskData.java

@ -0,0 +1,65 @@
package com.gaotao.modules.automatedWarehouse.entity;
import org.apache.ibatis.type.Alias;
/**
* @Description WMS运输任务业务实体类 - 用于查询 - rqrq
* @Author rqrq
* @Date 2025/10/22
*/
@Alias("WmsTransportTaskData")
public class WmsTransportTaskData extends WmsTransportTask {
/**
* 分页参数 - 当前页 - rqrq
*/
private Integer page;
/**
* 分页参数 - 每页大小 - rqrq
*/
private Integer limit;
/**
* 查询条件 - 开始日期 - rqrq
*/
private String startDate;
/**
* 查询条件 - 结束日期 - rqrq
*/
private String endDate;
public int getPage() {
return page;
}
public void setPage(Integer page) {
this.page = page;
}
public Integer getLimit() {
return limit;
}
public void setLimit(Integer limit) {
this.limit = limit;
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
}

77
src/main/java/com/gaotao/modules/automatedWarehouse/mapper/OrderTaskMapper.java

@ -0,0 +1,77 @@
package com.gaotao.modules.automatedWarehouse.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gaotao.modules.automatedWarehouse.entity.WmsOrderTask;
import com.gaotao.modules.automatedWarehouse.entity.WmsOrderTaskData;
import com.gaotao.modules.automatedWarehouse.entity.WmsOrderTaskDetail;
import com.gaotao.modules.automatedWarehouse.entity.WmsTransportTask;
import com.gaotao.modules.automatedWarehouse.entity.WmsTransportTaskDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description 订单任务查询Mapper接口 - rqrq
* @Author rqrq
* @Date 2025/10/22
*/
@Mapper
public interface OrderTaskMapper extends BaseMapper<WmsOrderTask> {
/**
* @Description 查询订单任务列表分页- rqrq
* @Title searchOrderTaskList
* @param page 分页对象
* @param data 查询条件
* @return IPage<WmsOrderTaskData>
* @author rqrq
* @date 2025/10/22
*/
IPage<WmsOrderTaskData> searchOrderTaskList(Page<WmsOrderTaskData> page, @Param("query") WmsOrderTaskData data);
/**
* @Description 查询订单任务明细列表 - rqrq
* @Title searchOrderTaskDetailList
* @param site 工厂编码
* @param taskNo 任务编号
* @param itemNo 行号
* @return List<WmsOrderTaskDetail>
* @author rqrq
* @date 2025/10/22
*/
List<WmsOrderTaskDetail> searchOrderTaskDetailList(@Param("site") String site,
@Param("taskNo") String taskNo,
@Param("itemNo") Integer itemNo);
/**
* @Description 查询订单关联的运输任务列表 - rqrq
* @Title searchTransportTaskList
* @param site 工厂编码
* @param sourceBillNo 来源单号对应order_task的task_no
* @param sourceLineId 来源行号对应order_task的item_no
* @return List<WmsTransportTask>
* @author rqrq
* @date 2025/10/22
*/
List<WmsTransportTask> searchTransportTaskList(@Param("site") String site,
@Param("sourceBillNo") String sourceBillNo,
@Param("sourceLineId") Long sourceLineId);
/**
* @Description 查询运输任务明细列表 - rqrq
* @Title searchTransportTaskDetailList
* @param site 工厂编码
* @param taskNo 任务编号
* @param itemNo 行号
* @return List<WmsTransportTaskDetail>
* @author rqrq
* @date 2025/10/22
*/
List<WmsTransportTaskDetail> searchTransportTaskDetailList(@Param("site") String site,
@Param("taskNo") String taskNo,
@Param("itemNo") Integer itemNo);
}

60
src/main/java/com/gaotao/modules/automatedWarehouse/service/OrderTaskService.java

@ -0,0 +1,60 @@
package com.gaotao.modules.automatedWarehouse.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gaotao.common.utils.PageUtils;
import com.gaotao.modules.automatedWarehouse.entity.WmsOrderTask;
import com.gaotao.modules.automatedWarehouse.entity.WmsOrderTaskData;
import com.gaotao.modules.automatedWarehouse.entity.WmsOrderTaskDetail;
import com.gaotao.modules.automatedWarehouse.entity.WmsTransportTask;
import com.gaotao.modules.automatedWarehouse.entity.WmsTransportTaskDetail;
import java.util.List;
/**
* @Description 订单任务查询Service接口 - rqrq
* @Author rqrq
* @Date 2025/10/22
*/
public interface OrderTaskService extends IService<WmsOrderTask> {
/**
* @Description 查询订单任务列表分页- rqrq
* @Title searchOrderTaskList
* @param data 查询条件
* @return PageUtils
* @author rqrq
* @date 2025/10/22
*/
PageUtils searchOrderTaskList(WmsOrderTaskData data);
/**
* @Description 查询订单任务明细列表 - rqrq
* @Title searchOrderTaskDetailList
* @param data 查询条件
* @return List<WmsOrderTaskDetail>
* @author rqrq
* @date 2025/10/22
*/
List<WmsOrderTaskDetail> searchOrderTaskDetailList(WmsOrderTaskData data);
/**
* @Description 查询订单关联的运输任务列表 - rqrq
* @Title searchTransportTaskList
* @param data 查询条件
* @return List<WmsTransportTask>
* @author rqrq
* @date 2025/10/22
*/
List<WmsTransportTask> searchTransportTaskList(WmsOrderTaskData data);
/**
* @Description 查询运输任务明细列表 - rqrq
* @Title searchTransportTaskDetailList
* @param data 查询条件
* @return List<WmsTransportTaskDetail>
* @author rqrq
* @date 2025/10/22
*/
List<WmsTransportTaskDetail> searchTransportTaskDetailList(WmsTransportTask data);
}

2
src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/KitTransportProcessServiceImpl.java

@ -118,7 +118,7 @@ public class KitTransportProcessServiceImpl implements KitTransportProcessServic
log.info("所有栈板都不在分拣位,判断为已齐套 - rqrq:notifyNo={}, itemNo={}", notifyNo, itemNo);
// 第三步查找缓存区Z104中calling_flag='Y'且站点status_db=1的栈板 - rqrq
// 第三步查找缓存区Z104中calling_flag='N'且站点status_db=1的栈板 - rqrq
List<BufferZonePalletResult> availablePallets = kitTransportMapper.getBufferZoneAvailablePallets(query);
log.info("缓存区可用栈板数量 - rqrq:notifyNo={}, itemNo={}, count={}",

124
src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/OrderTaskServiceImpl.java

@ -0,0 +1,124 @@
package com.gaotao.modules.automatedWarehouse.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gaotao.common.utils.PageUtils;
import com.gaotao.modules.automatedWarehouse.entity.WmsOrderTask;
import com.gaotao.modules.automatedWarehouse.entity.WmsOrderTaskData;
import com.gaotao.modules.automatedWarehouse.entity.WmsOrderTaskDetail;
import com.gaotao.modules.automatedWarehouse.entity.WmsTransportTask;
import com.gaotao.modules.automatedWarehouse.entity.WmsTransportTaskDetail;
import com.gaotao.modules.automatedWarehouse.mapper.OrderTaskMapper;
import com.gaotao.modules.automatedWarehouse.service.OrderTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description 订单任务查询Service实现类 - rqrq
* @Author rqrq
* @Date 2025/10/22
*/
@Service
public class OrderTaskServiceImpl extends ServiceImpl<OrderTaskMapper, WmsOrderTask> implements OrderTaskService {
@Autowired
private OrderTaskMapper orderTaskMapper;
/**
* @Description 查询订单任务列表分页- rqrq
* @Title searchOrderTaskList
* @param data 查询条件
* @return PageUtils
* @author rqrq
* @date 2025/10/22
*/
@Override
public PageUtils searchOrderTaskList(WmsOrderTaskData data) {
System.out.println("开始查询订单任务列表 - rqrq");
System.out.println("查询条件:site=" + data.getSite() + ", taskNo=" + data.getTaskNo()
+ ", sourceBillNo=" + data.getSourceBillNo() + ", status=" + data.getStatus()
+ ", page=" + data.getPage() + ", limit=" + data.getLimit() + " - rqrq");
// 使用MyBatis-Plus分页方式 - rqrq
IPage<WmsOrderTaskData> resultList = orderTaskMapper.searchOrderTaskList(
new Page<>(data.getPage(), data.getLimit()), data);
PageUtils pageResult = new PageUtils(resultList);
System.out.println("查询订单任务列表完成,共" + resultList.getTotal() + "条记录 - rqrq");
return pageResult;
}
/**
* @Description 查询订单任务明细列表 - rqrq
* @Title searchOrderTaskDetailList
* @param data 查询条件
* @return List<WmsOrderTaskDetail>
* @author rqrq
* @date 2025/10/22
*/
@Override
public List<WmsOrderTaskDetail> searchOrderTaskDetailList(WmsOrderTaskData data) {
System.out.println("开始查询订单任务明细列表 - rqrq");
System.out.println("查询条件:site=" + data.getSite() + ", taskNo=" + data.getTaskNo()
+ ", itemNo=" + data.getItemNo() + " - rqrq");
// 查询数据 - rqrq
List<WmsOrderTaskDetail> list = orderTaskMapper.searchOrderTaskDetailList(
data.getSite(), data.getTaskNo(), data.getItemNo());
System.out.println("查询订单任务明细列表完成,共" + list.size() + "条记录 - rqrq");
return list;
}
/**
* @Description 查询订单关联的运输任务列表 - rqrq
* @Title searchTransportTaskList
* @param data 查询条件
* @return List<WmsTransportTask>
* @author rqrq
* @date 2025/10/22
*/
@Override
public List<WmsTransportTask> searchTransportTaskList(WmsOrderTaskData data) {
System.out.println("开始查询订单关联的运输任务列表 - rqrq");
System.out.println("查询条件:site=" + data.getSite() + ", taskNo=" + data.getTaskNo()
+ ", itemNo=" + data.getItemNo() + " - rqrq");
// 将order_task的task_no和item_no作为transport_task的source_bill_no和source_line_id - rqrq
Long sourceLineId = data.getItemNo() != null ? data.getItemNo().longValue() : null;
// 查询数据 - rqrq
List<WmsTransportTask> list = orderTaskMapper.searchTransportTaskList(
data.getSite(), data.getTaskNo(), sourceLineId);
System.out.println("查询订单关联的运输任务列表完成,共" + list.size() + "条记录 - rqrq");
return list;
}
/**
* @Description 查询运输任务明细列表 - rqrq
* @Title searchTransportTaskDetailList
* @param data 查询条件
* @return List<WmsTransportTaskDetail>
* @author rqrq
* @date 2025/10/22
*/
@Override
public List<WmsTransportTaskDetail> searchTransportTaskDetailList(WmsTransportTask data) {
System.out.println("开始查询运输任务明细列表 - rqrq");
System.out.println("查询条件:site=" + data.getSite() + ", taskNo=" + data.getTaskNo()
+ ", itemNo=" + data.getItemNo() + " - rqrq");
// 查询数据 - rqrq
List<WmsTransportTaskDetail> list = orderTaskMapper.searchTransportTaskDetailList(
data.getSite(), data.getTaskNo(), data.getItemNo());
System.out.println("查询运输任务明细列表完成,共" + list.size() + "条记录 - rqrq");
return list;
}
}

2
src/main/resources/mapper/automatedWarehouse/KitTransportMapper.xml

@ -64,7 +64,7 @@
WHERE md.site = #{site}
AND md.notify_no = #{notifyNo}
AND md.item_no = #{itemNo}
AND p.calling_flag = 'Y'
AND p.calling_flag = 'N'
AND a.area_type = 'Z104'
AND a.status_db = 1
</select>

158
src/main/resources/mapper/automatedWarehouse/OrderTaskMapper.xml

@ -0,0 +1,158 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gaotao.modules.automatedWarehouse.mapper.OrderTaskMapper">
<!-- rqrq - 查询订单任务列表 -->
<select id="searchOrderTaskList" parameterType="WmsOrderTaskData" resultType="WmsOrderTaskData">
SELECT
t.id,
t.site,
t.task_no AS taskNo,
t.item_no AS itemNo,
t.source_type AS sourceType,
t.source_bill_no AS sourceBillNo,
t.source_line_id AS sourceLineId,
t.part_no AS partNo,
t.qty,
t.batch_no AS batchNo,
t.serial_no AS serialNo,
t.from_location AS fromLocation,
t.to_location AS toLocation,
t.pallet_id AS palletId,
t.agv_code AS agvCode,
t.priority,
t.status,
t.wms_send_time AS wmsSendTime,
t.wcs_receive_time AS wcsReceiveTime,
t.start_time AS startTime,
t.complete_time AS completeTime,
t.error_code AS errorCode,
t.error_msg AS errorMsg,
t.created_by AS createdBy,
t.created_time AS createdTime,
t.updated_time AS updatedTime,
t.wcs_task_id AS wcsTaskId,
t.finish_qty AS finishQty,
t.wms_status AS wmsStatus
FROM wms_order_task t
WHERE t.site = #{query.site}
<if test="query.taskNo != null and query.taskNo != ''">
AND t.task_no LIKE '%' + #{query.taskNo} + '%'
</if>
<if test="query.sourceBillNo != null and query.sourceBillNo != ''">
AND t.source_bill_no LIKE '%' + #{query.sourceBillNo} + '%'
</if>
<if test="query.sourceType != null and query.sourceType != ''">
AND t.source_type = #{query.sourceType}
</if>
<if test="query.status != null and query.status != ''">
AND t.status = #{query.status}
</if>
<if test="query.palletId != null and query.palletId != ''">
AND t.pallet_id LIKE '%' + #{query.palletId} + '%'
</if>
<if test="query.startDate != null and query.startDate != ''">
AND CONVERT(DATE, t.created_time) &gt;= #{query.startDate}
</if>
<if test="query.endDate != null and query.endDate != ''">
AND CONVERT(DATE, t.created_time) &lt;= #{query.endDate}
</if>
ORDER BY t.created_time DESC, t.task_no, t.item_no
</select>
<!-- rqrq - 查询订单任务明细列表 -->
<select id="searchOrderTaskDetailList" resultType="WmsOrderTaskDetail">
SELECT
d.id,
d.site,
d.task_no AS taskNo,
d.item_no AS itemNo,
d.seq_no AS seqNo,
d.action_type AS actionType,
d.comment,
d.from_location AS fromLocation,
d.to_location AS toLocation,
d.agv_code AS agvCode,
d.status,
d.start_time AS startTime,
d.complete_time AS completeTime,
d.error_code AS errorCode,
d.error_msg AS errorMsg,
d.pallet_id AS palletId,
d.wms_status AS wmsStatus
FROM wms_order_task_detail d
WHERE d.site = #{site}
AND d.task_no = #{taskNo}
AND d.item_no = #{itemNo}
ORDER BY d.seq_no
</select>
<!-- rqrq - 查询订单关联的运输任务列表 -->
<select id="searchTransportTaskList" resultType="WmsTransportTask">
SELECT
t.id,
t.site,
t.task_no AS taskNo,
t.item_no AS itemNo,
t.source_type AS sourceType,
t.source_bill_no AS sourceBillNo,
t.source_line_id AS sourceLineId,
t.part_no AS partNo,
t.qty,
t.batch_no AS batchNo,
t.serial_no AS serialNo,
t.from_location AS fromLocation,
t.to_location AS toLocation,
t.pallet_id AS palletId,
t.agv_code AS agvCode,
t.priority,
t.status,
t.wms_send_time AS wmsSendTime,
t.wcs_receive_time AS wcsReceiveTime,
t.start_time AS startTime,
t.complete_time AS completeTime,
t.error_code AS errorCode,
t.error_msg AS errorMsg,
t.created_by AS createdBy,
t.created_time AS createdTime,
t.updated_time AS updatedTime,
t.wcs_task_id AS wcsTaskId,
t.finish_qty AS finishQty,
t.wms_status AS wmsStatus,
t.pallet_type AS palletType,
t.to_area AS toArea
FROM wms_transport_task t
WHERE t.site = #{site}
AND t.source_bill_no = #{sourceBillNo}
AND t.source_line_id = #{sourceLineId}
ORDER BY t.created_time DESC, t.task_no, t.item_no
</select>
<!-- rqrq - 查询运输任务明细列表 -->
<select id="searchTransportTaskDetailList" resultType="WmsTransportTaskDetail">
SELECT
d.id,
d.site,
d.task_no AS taskNo,
d.item_no AS itemNo,
d.seq_no AS seqNo,
d.action_type AS actionType,
d.comment,
d.from_location AS fromLocation,
d.to_location AS toLocation,
d.agv_code AS agvCode,
d.status,
d.start_time AS startTime,
d.complete_time AS completeTime,
d.error_code AS errorCode,
d.error_msg AS errorMsg
FROM wms_transport_task_detail d
WHERE d.site = #{site}
AND d.task_no = #{taskNo}
AND d.item_no = #{itemNo}
ORDER BY d.seq_no
</select>
</mapper>
Loading…
Cancel
Save