weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PDA任务修改 B2字段添加

Browse Source
This commit is contained in:
秦鸿展
2026-06-04 16:59:16 +08:00
parent 299a9fb91e
commit 1c72ce2ba5
11 changed files with 255 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/deliveTask/DeliveTaskApplicationService.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class DeliveTaskApplicationService {
// 指派给我的：已接收（operators_by = 当前用户）
deliveTaskDO.setOperatorsBy(loginUser.getUserid());
} else if (!handoverList && (tabType == null || tabType == 2L)) {
// 任务大厅：未领取任务池（含入库审核收货、出库生成拣货单等自动下发的任务），不按下发人过滤
// 任务大厅：未领取且 PC 未处理的任务池（含入库审核收货、出库生成拣货单等自动下发的任务），不按下发人过滤
if (tabType == null) {
deliveTaskDO.setTabType(2L);
}
mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class DeliveTaskImpl extends ServiceImpl<DeliveTaskMapper, DeliveTask> im
@Override
public List<DeliveTaskPO> queryListApp(DeliveTaskDO deliveTaskDO)
{
// App 列表条件见 DeliveTaskMapper.queryListApp / selectDeliveTaskPoApp1（tabType=2 任务大厅 / tabType=1 指派给我）
// App 列表条件见 DeliveTaskMapper.queryListApp / selectDeliveTaskPoApp1（tabType=2 任务大厅且排除 PC 已处理 / tabType=1 指派给我）
List<DeliveTaskPO> deliveTaskPOS = deliveTaskMapper.queryListApp(deliveTaskDO);
if (deliveTaskDO.getTaskType() == 7){
statistics(deliveTaskPOS);
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/deliveTask/DeliveTaskAppApi.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class DeliveTaskAppApi extends BaseController {
/**
* 分页查询下发任务列表。条件：del_flag=1、当前用户 organization_id、绑定仓库（未传 warehouseId 时取用户仓库绑定）、
* {@code tabType=2} 任务大厅（operators_name 为空，含收货/上架/拣货等自动下发任务）、
* {@code tabType=2} 任务大厅（operators_name 为空，且关联业务单未在 PC 端处理/指派，含收货/上架/拣货等自动下发任务）、
* {@code tabType=1} 指派给我的（operators_by=当前用户）；
* {@code taskType=7} 出库交接列表（按 handoverQueryType 过滤，不限制 operators_name 为空）；不按 task_status 默认过滤。
*/
mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml
+46 -1
View File
@@ -69,6 +69,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and (operators_name IS NULL OR operators_name = '')
</sql>
<!-- 任务大厅 tabType=2：排除 PC 端已处理/已指派的关联业务单（delive_task 作业人仍为空时，业务单可能已在 PC 作业） -->
<sql id="deliveTaskHallExcludePcProcessedFilter">
and NOT (
(task_type = 1 AND EXISTS (
SELECT 1 FROM stock_receipt_order biz
WHERE biz.receipt_order_number = delive_task.tracking_number AND biz.del_flag = 1
AND (biz.status >= 2 OR (biz.operators_by IS NOT NULL AND biz.operators_by != 0))
))
OR (task_type = 2 AND EXISTS (
SELECT 1 FROM stock_shelf_order biz
WHERE biz.shelf_order_number = delive_task.tracking_number AND biz.del_flag = 1
AND (biz.status >= 2 OR (biz.operators_by IS NOT NULL AND biz.operators_by != 0))
))
OR (task_type = 3 AND EXISTS (
SELECT 1 FROM stock_out_task_order biz
WHERE biz.task_number = delive_task.tracking_number AND biz.del_flag = 1
AND (biz.status >= 2 OR (biz.operators_by IS NOT NULL AND biz.operators_by != 0))
))
OR (task_type = 4 AND (
EXISTS (
SELECT 1 FROM review_order biz
WHERE biz.review_order_number = delive_task.tracking_number AND biz.del_flag = 1
AND biz.review_status >= 2
)
OR EXISTS (
SELECT 1 FROM stock_out_order biz
WHERE biz.out_order_number = delive_task.tracking_number AND biz.del_flag = 1
AND (biz.check_status >= 2 OR (biz.check_operators_by IS NOT NULL AND biz.check_operators_by != 0))
)
))
OR (task_type = 5 AND EXISTS (
SELECT 1 FROM shift_manage biz
WHERE biz.shift_number = delive_task.tracking_number AND biz.del_flag = 1
AND (biz.shift_status >= 3 OR (biz.operators_by IS NOT NULL AND biz.operators_by != 0))
))
OR (task_type = 6 AND EXISTS (
SELECT 1 FROM investigation_manage biz
WHERE biz.investigation_number = delive_task.tracking_number AND biz.del_flag = 1
AND (biz.investigation_status >= 3 OR (biz.operators_by IS NOT NULL AND biz.operators_by != 0))
))
)
</sql>
<sql id="selectDeliveTaskPo1">
<where>
del_flag = 1
@@ -210,10 +253,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="tabType != null and tabType==1">
and operators_by = #{operatorsBy}
</if>
<!-- 任务大厅 tabType=2：未领取；出库交接 taskType=7 不按 operators_name 过滤 -->
<!-- 任务大厅 tabType=2：未领取；出库交接 taskType=7 不按 operators_name / PC已处理 过滤 -->
<if test="tabType != null and tabType==2">
<if test="taskType == null or taskType != 7">
<include refid="deliveTaskHallUnassignedFilter"/>
<include refid="deliveTaskHallExcludePcProcessedFilter"/>
</if>
</if>
<if test="operatorsName != null and operatorsName != ''">
@@ -399,6 +443,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE
del_flag = 1
<include refid="deliveTaskHallUnassignedFilter"/>
<include refid="deliveTaskHallExcludePcProcessedFilter"/>
<include refid="selectDeliveTaskPo2"/>
) taskSum