feat(smartfactory): 优化查询功能和数据准确性
- 在处理组列表查询中添加删除标记过滤,确保只返回未删除的数据- 修复处理组汇总数据查询中的规格名称获取问题 - 新增根据 ID 获取处理组信息的查询方法
This commit is contained in:
parent
4a295a4ec0
commit
1144d4692a
@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
|
|||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
|
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
@ -18,7 +17,8 @@ import java.util.List;
|
|||||||
* @author 艾楷
|
* @author 艾楷
|
||||||
*/
|
*/
|
||||||
@TableName("sf_handling_group_amount_specifications")
|
@TableName("sf_handling_group_amount_specifications")
|
||||||
@KeySequence("sf_handling_group_amount_specifications_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
|
@KeySequence("sf_handling_group_amount_specifications_seq")
|
||||||
|
// 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@ToString(callSuper = true)
|
@ToString(callSuper = true)
|
||||||
@ -40,6 +40,11 @@ public class HandlingGroupAmountSpecificationsDO extends BaseDO {
|
|||||||
* 搬运规格id
|
* 搬运规格id
|
||||||
*/
|
*/
|
||||||
private Long handlingSpecificationsId;
|
private Long handlingSpecificationsId;
|
||||||
|
/**
|
||||||
|
* 搬运规格名称
|
||||||
|
*/
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String handlingSpecificationsName;
|
||||||
/**
|
/**
|
||||||
* 搬运组id
|
* 搬运组id
|
||||||
*/
|
*/
|
||||||
|
@ -50,4 +50,11 @@ public interface HandlingGroupMapper extends BaseMapperX<HandlingGroupDO> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
IPage<HandlingGroupAmountSpecificationsVO> selectPageListByDateStr(@Param("page") Page<Object> page, @Param("vo") HandlingGroupAmountSpecificationsPageReqDTO vo);
|
IPage<HandlingGroupAmountSpecificationsVO> selectPageListByDateStr(@Param("page") Page<Object> page, @Param("vo") HandlingGroupAmountSpecificationsPageReqDTO vo);
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
HandlingGroupDO getHandlingGroup(@Param("id") Long id);
|
||||||
}
|
}
|
||||||
|
@ -44,4 +44,11 @@ public interface HandlingSpecificationsMapper extends BaseMapperX<HandlingSpecif
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
List<HandlingSpecificationsDO> getHandlingSpecificationsList(@Param("vo") HandlingSpecificationsPageReqVO vo);
|
List<HandlingSpecificationsDO> getHandlingSpecificationsList(@Param("vo") HandlingSpecificationsPageReqVO vo);
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
HandlingSpecificationsDO getHandlingSpecifications(@Param("id") Long id);
|
||||||
}
|
}
|
||||||
|
@ -51,7 +51,7 @@ public class HandlingGroupServiceImpl extends ServiceImpl<HandlingGroupMapper, H
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HandlingGroupDO getHandlingGroup(Long id) {
|
public HandlingGroupDO getHandlingGroup(Long id) {
|
||||||
return handlingGroupMapper.selectById(id);
|
return handlingGroupMapper.getHandlingGroup(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -64,7 +64,7 @@ public class HandlingSpecificationsServiceImpl extends ServiceImpl<HandlingSpeci
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HandlingSpecificationsDO getHandlingSpecifications(Long id) {
|
public HandlingSpecificationsDO getHandlingSpecifications(Long id) {
|
||||||
return handlingSpecificationsMapper.selectById(id);
|
return handlingSpecificationsMapper.getHandlingSpecifications(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user