diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java index b445e92c5..3307881b1 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -297,7 +297,8 @@ public class InvProductController extends BaseController { if (null == filterInvProductRequest || StrUtil.isBlank(filterInvProductRequest.getInvCode())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - List list = invProductService.filterList(filterInvProductRequest); + filterInvProductRequest.setFilterNoInv(1); + List list = invProductService.filterListProduct(filterInvProductRequest); PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } diff --git a/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java index f33c0cd6d..d6049ef52 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java @@ -94,6 +94,9 @@ public class InvCountOrderDetailEntity implements Serializable { @ApiModelProperty(value = "账面数量") private Integer invNum; + @TableField(exist = false) + private Integer reCount; + /** * 盘盈数量 */ diff --git a/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java index 47efbb9a3..db117991a 100644 --- a/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java @@ -86,7 +86,8 @@ public class InvCountOrderDetailService extends ServiceImpl