From 353295da1c5cd06508ad51aeb4ac1ec001f7550c Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 14 Dec 2022 14:28:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5bug=E4=BF=AE=E5=A4=8D=202.?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A2=84=E9=AA=8C=E6=94=B6=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=A4=9A=E6=9D=A1=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/sale/admin/controller/inout/OrderController.java | 7 +++++++ .../mybatis/mapper/inventory/InvPreInProductDao.xml | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index a2e0be8..bf6be6b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -788,6 +788,12 @@ public class OrderController { if (StrUtil.isEmpty(code) && StrUtil.isEmpty(billNo)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + + StockOrderEntity stockOrder = stockOrderService.findByBillNo(billNo); + if (null == stockOrder) { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "单号错误，数据不存在！"); + } + Set orderEntities = new HashSet<>(); //查询预验收单据类型 BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); @@ -800,6 +806,7 @@ public class OrderController { actions.add(bussinessTypResponse.getAction()); } WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); + warehouseQueryRequest.setOrderId(stockOrder.getOrderIdFk()); warehouseQueryRequest.setCode(code); warehouseQueryRequest.setActions(actions); List warehouseEntityList = codesService.findAllByOrderId(warehouseQueryRequest); diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml index 0ea328e..0eb4288 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml @@ -124,8 +124,9 @@ inv_prein_product.batchNo ,inv_prein_product.productionDate,inv_prein_product.expireDate, basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, - inv_prein_product.inCount,inv_prein_product.outCount - ,inv_prein_product.reCount,inv_prein_product.customerId, + sum(inv_prein_product.inCount) as inCount, + sum(inv_prein_product.outCount) as outCount, + sum(inv_prein_product.reCount) as reCount,inv_prein_product.customerId, basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price, inv_warehouse_sub.name invSubStorageName,inv_prein_product.invWarehouseCode,inv_prein_product.orderIdFk