From a4bdf3b6a499cc3b7bbdcce0f947f077b2ff6d25 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 7 Jan 2025 08:37:52 +0800 Subject: [PATCH] 01-07 --- .../WarehouseInventoryRecordRest.java | 8 +++++++- .../PurchaseInventoryBillService.java | 5 ++++- .../PurchaseInventoryBillDetailService.java | 6 +++--- .../WarehouseInventory.java | 3 +++ .../WarehouseInventoryDto.java | 2 ++ .../WarehouseInventoryService.java | 2 ++ .../WarehouseInventoryRecordMapper.java | 2 ++ .../WarehouseInventoryRecordMapper.xml | 14 ++++++++++++- .../WarehouseInventoryRecordService.java | 20 +++++++++++++++++++ .../WarehouseInventoryCountReportQuery.java | 6 +++++- .../report/WarehouseOutReportVo.java | 17 ++++++++++++++++ .../warehouseoutbill/WarehouseOutBill.java | 2 ++ .../warehouseoutbill/WarehouseOutBillDto.java | 2 ++ .../WarehouseOutBillService.java | 18 +++++++++++------ 14 files changed, 94 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/report/WarehouseOutReportVo.java diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java index 320e930..e227e5b 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java @@ -96,7 +96,13 @@ public class WarehouseInventoryRecordRest { PagerVo pv = warehouseInventoryRecordService.inventoryOutboundStats(pq); return rb.success().setData(pv); } - + @ApiOperation("客户销售统计报表") + @PostMapping("/customerSales") + public ResultBean> customerSales(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = warehouseInventoryRecordService.customerSales(pq); + return rb.success().setData(pv); + } @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq){ diff --git a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java index 6eadcd9..c7dfef8 100644 --- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java @@ -323,7 +323,9 @@ public class PurchaseInventoryBillService extends MybatisBaseService saveOrUpdate(PurchaseInventoryBillDetailDto2 dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; - if (StringUtils.isNotBlank(dto.getSid())) { + PurchaseInventoryBillDetail purchaseInventoryBillDetail = fetchBySid(dto.getSid()); + if (purchaseInventoryBillDetail!=null) { sid = dto.getSid(); - PurchaseInventoryBillDetail purchaseInventoryBillDetail = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, purchaseInventoryBillDetail, "id", "sid"); purchaseInventoryBillDetail.setSpecValue(dto.getOwnSpec()); purchaseInventoryBillDetail.setUnit(dto.getGoodsUnitName()); @@ -249,7 +249,7 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService selInboundAndOutboundCount(@Param(Constants.WRAPPER) QueryWrapper qw); IPage inventoryInboundAndOutboundStats(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage customerSales(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage inventoryDetailsRecord(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml index f94b32e..004946d 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml @@ -42,11 +42,23 @@ resultType="com.yxt.warehouse.biz.warehouseinventoryrecord.report.WarehouseInventoryCountDetailsVo"> SELECT IFNULL(SUM(r.count), 0) AS `count`, r.busTypeValue - FROM wms_inventory_record AS r + FROM warehouse_inventory_record AS r ${ew.sqlSegment} + +