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

PDA任务大厅查询修改

Browse Source
This commit is contained in:
秦鸿展
2026-03-14 15:44:49 +08:00
parent 360ffdc0d3
commit 977cbd683b
4 changed files with 26 additions and 11 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
@@ -46,8 +46,8 @@ public class DeliveTaskApplicationService {
Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
if (topOrganizationId != null && topOrganizationId != 1){
deliveTaskDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
deliveTaskDO.setOperatorsBy(loginUser.getUserid());
}
// operatorsBy 仅由 DeliveTaskImpl 根据 tabType 设置，此处不覆盖，保证条件查询生效
}
return deliveTaskDomainService.queryListApp(deliveTaskDO);
}
mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java
+6 -4
View File
@@ -94,10 +94,12 @@ public class DeliveTaskImpl extends ServiceImpl<DeliveTaskMapper, DeliveTask> im
public List<DeliveTaskPO> queryListApp(DeliveTaskDO deliveTaskDO)
{
LoginUser loginUser = SecurityUtils.getLoginUser();
if(null!=deliveTaskDO.getTabType()&&deliveTaskDO.getTabType()==1){
deliveTaskDO.setOperatorsBy(loginUser.getUserid());
}else{
if (null != deliveTaskDO.getTabType()) {
if (deliveTaskDO.getTabType() == 1) {
deliveTaskDO.setOperatorsBy(loginUser.getUserid());
} else if (deliveTaskDO.getTabType() == 2) {
deliveTaskDO.setOperatorsBy(null);
}
}
List<DeliveTaskPO> deliveTaskPOS = deliveTaskMapper.queryListApp(deliveTaskDO);
if (deliveTaskDO.getTaskType() == 7){
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveTask/DeliveTaskDTO.java
+2 -2
View File
@@ -55,8 +55,8 @@ public class DeliveTaskDTO extends BaseVOEntity {
@Excel(name = "仓库名称")
private String warehouseName;
@ApiModelProperty("任务类型 0-无 1-收货 2-上架 3-拣货 4-复核 5-移位 6-盘点")
@Excel(name = "任务类型 0-无 1-收货 2-上架 3-拣货 4-复核 5-移位 6-盘点")
@ApiModelProperty("任务类型 0-无 1-收货 2-上架 3-拣货 4-复核 5-移位 6-盘点 7-交接")
@Excel(name = "任务类型 0-无 1-收货 2-上架 3-拣货 4-复核 5-移位 6-盘点 7-交接")
private Integer taskType;
@ApiModelProperty("任务状态 0-未接收 1-已接收 2-已拒绝 3-已完成 4-已关闭")
mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml
+17 -4
View File
@@ -66,6 +66,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="organizationId != null ">
and organization_id = #{organizationId}
</if>
<if test="organizationIdList != null and organizationIdList.size() > 0">
and organization_id in
<foreach collection="organizationIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="organizationName != null and organizationName != ''">
and organization_name like concat('%', #{organizationName}, '%')
</if>
@@ -81,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseName != null and warehouseName != ''">
and warehouse_name like concat('%', #{warehouseName}, '%')
</if>
<!-- taskType: 0-无 1-收货 2-上架 3-拣货 4-复核 5-移位 6-盘点 7-交接 -->
<if test="taskType != null and taskType != 0 ">
and task_type = #{taskType}
</if>
@@ -103,8 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and operators_by = #{operatorsBy}
</if>
<if test="tabType != null and tabType==2">
and (operators_by = ''
OR operators_by IS NULL)
and operators_by IS NULL
</if>
<if test="operatorsName != null and operatorsName != ''">
@@ -122,8 +128,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</sql>
<sql id="selectDeliveTaskPo2">
<if test="organizationId != null ">
and organization_id = #{organizationId}
</if>
<if test="organizationIdList != null and organizationIdList.size() > 0">
and organization_id in
<foreach collection="organizationIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="taskNumber != null and taskNumber != ''">
and task_number = #{taskNumber}
</if>