From a98f565d41358612389c145fd341850ac092608e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Wed, 22 Oct 2025 16:57:05 +0800 Subject: [PATCH] 1 --- .../controller/OrderTaskController.java | 86 ++++++++++ .../entity/WmsOrderTaskData.java | 65 +++++++ .../entity/WmsTransportTaskData.java | 65 +++++++ .../mapper/OrderTaskMapper.java | 77 +++++++++ .../service/OrderTaskService.java | 60 +++++++ .../impl/KitTransportProcessServiceImpl.java | 2 +- .../service/impl/OrderTaskServiceImpl.java | 124 ++++++++++++++ .../automatedWarehouse/KitTransportMapper.xml | 2 +- .../automatedWarehouse/OrderTaskMapper.xml | 158 ++++++++++++++++++ 9 files changed, 637 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/gaotao/modules/automatedWarehouse/controller/OrderTaskController.java create mode 100644 src/main/java/com/gaotao/modules/automatedWarehouse/entity/WmsOrderTaskData.java create mode 100644 src/main/java/com/gaotao/modules/automatedWarehouse/entity/WmsTransportTaskData.java create mode 100644 src/main/java/com/gaotao/modules/automatedWarehouse/mapper/OrderTaskMapper.java create mode 100644 src/main/java/com/gaotao/modules/automatedWarehouse/service/OrderTaskService.java create mode 100644 src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/OrderTaskServiceImpl.java create mode 100644 src/main/resources/mapper/automatedWarehouse/OrderTaskMapper.xml diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/controller/OrderTaskController.java b/src/main/java/com/gaotao/modules/automatedWarehouse/controller/OrderTaskController.java new file mode 100644 index 0000000..1d88d21 --- /dev/null +++ b/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 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 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 rows = orderTaskService.searchTransportTaskDetailList(data); + return R.ok().put("rows", rows); + } +} + diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/entity/WmsOrderTaskData.java b/src/main/java/com/gaotao/modules/automatedWarehouse/entity/WmsOrderTaskData.java new file mode 100644 index 0000000..43d148a --- /dev/null +++ b/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; + } +} + diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/entity/WmsTransportTaskData.java b/src/main/java/com/gaotao/modules/automatedWarehouse/entity/WmsTransportTaskData.java new file mode 100644 index 0000000..bc57657 --- /dev/null +++ b/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; + } +} + diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/mapper/OrderTaskMapper.java b/src/main/java/com/gaotao/modules/automatedWarehouse/mapper/OrderTaskMapper.java new file mode 100644 index 0000000..d6b544a --- /dev/null +++ b/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 { + + /** + * @Description 查询订单任务列表（分页）- rqrq + * @Title searchOrderTaskList + * @param page 分页对象 + * @param data 查询条件 + * @return IPage + * @author rqrq + * @date 2025/10/22 + */ + IPage searchOrderTaskList(Page page, @Param("query") WmsOrderTaskData data); + + /** + * @Description 查询订单任务明细列表 - rqrq + * @Title searchOrderTaskDetailList + * @param site 工厂编码 + * @param taskNo 任务编号 + * @param itemNo 行号 + * @return List + * @author rqrq + * @date 2025/10/22 + */ + List 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 + * @author rqrq + * @date 2025/10/22 + */ + List 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 + * @author rqrq + * @date 2025/10/22 + */ + List searchTransportTaskDetailList(@Param("site") String site, + @Param("taskNo") String taskNo, + @Param("itemNo") Integer itemNo); +} + diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/OrderTaskService.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/OrderTaskService.java new file mode 100644 index 0000000..c2fe83b --- /dev/null +++ b/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 { + + /** + * @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 + * @author rqrq + * @date 2025/10/22 + */ + List searchOrderTaskDetailList(WmsOrderTaskData data); + + /** + * @Description 查询订单关联的运输任务列表 - rqrq + * @Title searchTransportTaskList + * @param data 查询条件 + * @return List + * @author rqrq + * @date 2025/10/22 + */ + List searchTransportTaskList(WmsOrderTaskData data); + + /** + * @Description 查询运输任务明细列表 - rqrq + * @Title searchTransportTaskDetailList + * @param data 查询条件 + * @return List + * @author rqrq + * @date 2025/10/22 + */ + List searchTransportTaskDetailList(WmsTransportTask data); +} + diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/KitTransportProcessServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/KitTransportProcessServiceImpl.java index 4a9faeb..7259502 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/KitTransportProcessServiceImpl.java +++ b/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 availablePallets = kitTransportMapper.getBufferZoneAvailablePallets(query); log.info("缓存区可用栈板数量 - rqrq：notifyNo={}, itemNo={}, count={}", diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/OrderTaskServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/OrderTaskServiceImpl.java new file mode 100644 index 0000000..5f67539 --- /dev/null +++ b/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 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 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 + * @author rqrq + * @date 2025/10/22 + */ + @Override + public List searchOrderTaskDetailList(WmsOrderTaskData data) { + System.out.println("开始查询订单任务明细列表 - rqrq"); + System.out.println("查询条件：site=" + data.getSite() + ", taskNo=" + data.getTaskNo() + + ", itemNo=" + data.getItemNo() + " - rqrq"); + + // 查询数据 - rqrq + List 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 + * @author rqrq + * @date 2025/10/22 + */ + @Override + public List 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 list = orderTaskMapper.searchTransportTaskList( + data.getSite(), data.getTaskNo(), sourceLineId); + + System.out.println("查询订单关联的运输任务列表完成，共" + list.size() + "条记录 - rqrq"); + return list; + } + + /** + * @Description 查询运输任务明细列表 - rqrq + * @Title searchTransportTaskDetailList + * @param data 查询条件 + * @return List + * @author rqrq + * @date 2025/10/22 + */ + @Override + public List searchTransportTaskDetailList(WmsTransportTask data) { + System.out.println("开始查询运输任务明细列表 - rqrq"); + System.out.println("查询条件：site=" + data.getSite() + ", taskNo=" + data.getTaskNo() + + ", itemNo=" + data.getItemNo() + " - rqrq"); + + // 查询数据 - rqrq + List list = orderTaskMapper.searchTransportTaskDetailList( + data.getSite(), data.getTaskNo(), data.getItemNo()); + + System.out.println("查询运输任务明细列表完成，共" + list.size() + "条记录 - rqrq"); + return list; + } +} + diff --git a/src/main/resources/mapper/automatedWarehouse/KitTransportMapper.xml b/src/main/resources/mapper/automatedWarehouse/KitTransportMapper.xml index a52681a..5673d5d 100644 --- a/src/main/resources/mapper/automatedWarehouse/KitTransportMapper.xml +++ b/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 diff --git a/src/main/resources/mapper/automatedWarehouse/OrderTaskMapper.xml b/src/main/resources/mapper/automatedWarehouse/OrderTaskMapper.xml new file mode 100644 index 0000000..b30b86c --- /dev/null +++ b/src/main/resources/mapper/automatedWarehouse/OrderTaskMapper.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + +