diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java index 1c593eeb..9a57395d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java @@ -624,8 +624,9 @@ public class VoucherServiceImpl extends ServiceImpl queryNotificationVoucherPopupInfo(VoucherPagination voucherPagination) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("b.product_id",voucherPagination.getProductId()); + queryWrapper.eq("a.voucher_status","4"); queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList()); -// queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"b.product_id",voucherPagination.getProductIdList()); + queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"b.product_id",voucherPagination.getProductIdList()); queryWrapper.isNull("a.f_delete_mark"); Page page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize()); IPage voucherEntityIPage = voucherMapper.queryVoucherNotification(page,queryWrapper); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java index 88f822e3..45baef02 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java @@ -145,12 +145,6 @@ public class WarehousingNotificationController { for (WarehousingProductEntity warehousingProductEntity:warehousingProductList){ warehousingProductEntity.setStorageNumber(warehousingProductEntity.getPurchaseNum()); warehousingProductEntity.setStorageUnit(warehousingProductEntity.getPurchaseUnitId()); -// QueryWrapper businessCargoEntityQueryWrapper =new QueryWrapper<>(); -// businessCargoEntityQueryWrapper.lambda().eq(BusinessCargoEntity::getId,warehousingProductEntity.getStorageAreaId()); -// List businessCargoEntityList =businessCargoService.list(businessCargoEntityQueryWrapper); -// if (businessCargoEntityList.size()>0 && businessCargoEntityList!=null){ -// warehousingProductEntity.setStorageAreaId(businessCargoEntityList.get(0).getCargoName()); -// } } warehousingNotificationMap.put("tableField121",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(warehousingProductList))); realList.add(warehousingNotificationMap); @@ -664,8 +658,6 @@ public class WarehousingNotificationController { @Operation(summary = "获取Notification选择的凭证和商品列表") @PostMapping("/getNotificationVoucherProductList") public ActionResult queryNotificationVoucherProductList(@RequestBody VoucherPagination voucherPagination) throws IOException{ -// WarehousingNotificationEntity warehousingNotificationEntity= warehousingNotificationService.getInfo(voucherPagination.getId()); - String id = voucherPagination.getNotid(); QueryWrapper warehousingProductEntityQueryWrapper=new QueryWrapper<>(); warehousingProductEntityQueryWrapper.lambda().eq(WarehousingProductEntity::getWarehousingId,id); @@ -673,16 +665,11 @@ public class WarehousingNotificationController { List list=new ArrayList<>(); for (WarehousingProductEntity warehousingProductEntity:warehousingProductEntityList){ -// QueryWrapper voucherEntityQueryWrapper=new QueryWrapper<>(); -// VoucherPagination voucherPagination =new VoucherPagination(); voucherPagination.setProductId(warehousingProductEntity.getProductId()); List voucherList= voucherService.queryNotificationVoucherPopupInfo(voucherPagination); list.addAll(voucherList); } -// List productWarehouseEntityList=workOrderService.getWorkBomProduct(voucherEntity.getId()); -// voucherEntity.setProductWarehouseEntityList(productWarehouseEntityList); - //返回对象 PageListVO vo = new PageListVO(); vo.setList(list); diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue index 4ffa2eb8..0ff3e460 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue @@ -36,10 +36,10 @@ - + @@ -83,7 +83,7 @@ export default { if (excludeIdList && excludeIdList instanceof Array) { this.excludeIdList = excludeIdList; } - if (val && typeof(val) == 'string') { + if (val && typeof (val) == 'string') { this.val = val; } let query = {