From 9bc91e1158f1bc2f770a58746f44a7d2322f6671 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 27 Jul 2023 14:59:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=88=B0=E6=96=B0?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B2=A1=E6=9C=89warehouseId=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/pan/service/impl/PanFactoryDataServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index 5e6c8ac8d..d9dc9d924 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -367,7 +367,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setWarehouse(destinationWarehouse); - distributionStockArticleEntity.setWarehouseId(distributionStockArticleEntity.getId()); + distributionStockArticleEntity.setWarehouseId(basicdataWarehouseEntity.getId()); distributionStockArticleEntity.setWarehouseEntryTime(date); distributionStockArticleEntity.setTotalNumber(total); @@ -438,7 +438,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { BeanUtil.copyProperties(vo,entity); entity.setConditions(1); entity.setWarehouse(distributionStockArticleEntity.getWarehouse()); - entity.setWarehouseId(distributionStockArticleEntity.getId()); + entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId()); entity.setStockArticleId(id); // 绑定部门--仓库 if(!Objects.isNull(basicdataWarehouseEntity)){ From 842c44c79cf3943fdd559db276fc33eb20ca8793 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 27 Jul 2023 16:12:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/entity/DistributionStockListEntity.java | 5 ----- .../distribution/mapper/DistributionStockListMapper.xml | 8 ++++---- .../service/IDistributionStockListService.java | 5 +++++ .../service/impl/DistributionReservationServiceImpl.java | 2 +- .../service/impl/DistributionStockArticleServiceImpl.java | 2 +- .../service/impl/DistributionStockListServiceImpl.java | 7 +++++-- .../controller/WarehouseWarehousingEntryController.java | 4 ++-- .../warehouse/mapper/WarehouseWarehousingEntryMapper.java | 3 ++- .../warehouse/mapper/WarehouseWarehousingEntryMapper.xml | 4 ++-- .../service/IWarehouseWarehousingEntryService.java | 3 +-- .../impl/WarehouseWarehousingEntryServiceImpl.java | 8 ++++---- 11 files changed, 27 insertions(+), 24 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java index f5844f91f..e073e12b8 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java @@ -217,11 +217,6 @@ public class DistributionStockListEntity extends TenantEntity { @ApiModelProperty(value = "预约数量") @TableField(exist = false) private Integer reservationNum; - /** - * 单位 - */ - @ApiModelProperty(value = "单位") - private String unit; /** * 仓库名称 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index bf70a7951..03e025b3a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -52,7 +52,7 @@ where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id and l.pid is null ) ELSE (select sum(l.quantity_stock) from logpm_distribution_stock_list l - where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id and l.pid is not null ) + where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id and l.pid = ldsi.pid and l.pid is not null ) END 'quantityStock', CASE WHEN ldsi.pid is null THEN (select count(ldrs.reservation_num) @@ -64,7 +64,7 @@ FROM logpm_distribution_reservation_stocklist ldrs where ldrs.stocklist_id in (select l.id from logpm_distribution_stock_list l - where l.market_id =ldsi.market_id and l.material_id = ldsi.material_id and l.pid is not null)) + where l.market_id =ldsi.market_id and l.material_id = ldsi.material_id and l.pid = ldsi.pid and l.pid is not null)) END 'quantityOccupied', CASE WHEN ldsi.pid is null THEN (select sum(l.outbound_quantity) @@ -72,7 +72,7 @@ where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id AND l.pid is null) else (select sum(l.outbound_quantity) from logpm_distribution_stock_list l - where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id and l.pid is not null) + where l.market_id = ldsi.market_id and l.material_id = ldsi.material_id and l.pid = ldsi.pid and l.pid is not null) END 'outboundQuantity', ldsi.brand_name brandName,ldsi.market_name marketName,ldsi.store_name storeName,ldsi.warehouse_name warehouseName,ldsi.cargo_unit cargoUnit, CASE WHEN ldsi.pid is null THEN @@ -85,7 +85,7 @@ from logpm_distribution_stock_list lds where lds.pid in (select l.id from logpm_distribution_stock_list l - where l.market_id =ldsi.market_id and l.material_id = ldsi.material_id and l.pid is not null )) + where l.market_id =ldsi.market_id and l.material_id = ldsi.material_id and l.pid = ldsi.pid and l.pid is not null )) END 'unpack', ldsi.market_id marketId,ldsi.store_id storeId,ldsi.material_id materialId,ldsi.id,ldsi.unpacking_quantity unpackingQuantity from logpm_distribution_stock_list ldsi diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java index cfe844a94..f980c6713 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java @@ -72,6 +72,11 @@ public interface IDistributionStockListService extends BaseService data, Boolean isCovered); + /** + * 拆包 + * @param distributionStockListDTO + * @return + */ Boolean parcels(DistributionStockListDTO distributionStockListDTO); DistributionStockListVO getQueryData(Long storeId, Long clientId,Long materialId); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 44d89fdeb..3d7bcd0bf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -286,7 +286,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl list = warehouseWarehousingEntryService.exportWarehouseWarehousingEntry(queryWrapper); - ExcelUtil.export(response, "仓库入库单数据" + DateUtil.time(), "仓库入库单数据表", list, WarehouseWarehousingEntryExcel.class); + List list = warehouseWarehousingEntryService.exportWarehouseWarehousingEntry(queryWrapper); + ExcelUtil.export(response, "仓库入库单数据" + DateUtil.time(), "仓库入库单数据表", list, WarehousingEntryDetailExcel.class); } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWarehousingEntryMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWarehousingEntryMapper.java index 601509183..d07e3fb25 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWarehousingEntryMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWarehousingEntryMapper.java @@ -17,6 +17,7 @@ package com.logpm.warehouse.mapper; import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity; +import com.logpm.warehouse.excel.WarehousingEntryDetailExcel; import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO; import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -49,6 +50,6 @@ public interface WarehouseWarehousingEntryMapper extends BaseMapper exportWarehouseWarehousingEntry(@Param("ew") Wrapper queryWrapper); + List exportWarehouseWarehousingEntry(@Param("ew") Wrapper queryWrapper); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWarehousingEntryMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWarehousingEntryMapper.xml index 2de67f1e3..447e89ece 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWarehousingEntryMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWarehousingEntryMapper.xml @@ -29,7 +29,7 @@ - + @@ -39,7 +39,7 @@ - SELECT * FROM logpm_warehouse_warehousing_entry ${ew.customSqlSegment} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java index f6222af8f..cb0988a0c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java @@ -21,7 +21,6 @@ import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO; import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity; import com.logpm.warehouse.excel.WarehousingEntryDetailExcel; import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO; -import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import java.util.List; @@ -49,7 +48,7 @@ public interface IWarehouseWarehousingEntryService extends BaseService exportWarehouseWarehousingEntry(Wrapper queryWrapper); + List exportWarehouseWarehousingEntry(Wrapper queryWrapper); /** * 自定添加修改 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java index b5549adfc..cbe715f7c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java @@ -38,7 +38,6 @@ import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity; import com.logpm.warehouse.excel.WarehousingEntryDetailExcel; import com.logpm.warehouse.service.IWarehouseWarehousingDetailService; import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO; -import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel; import com.logpm.warehouse.mapper.WarehouseWarehousingEntryMapper; import com.logpm.warehouse.service.IWarehouseWarehousingEntryService; import lombok.AllArgsConstructor; @@ -87,8 +86,8 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl exportWarehouseWarehousingEntry(Wrapper queryWrapper) { - List warehouseWarehousingEntryList = baseMapper.exportWarehouseWarehousingEntry(queryWrapper); + public List exportWarehouseWarehousingEntry(Wrapper queryWrapper) { + List warehouseWarehousingEntryList = baseMapper.exportWarehouseWarehousingEntry(queryWrapper); //warehouseWarehousingEntryList.forEach(warehouseWarehousingEntry -> { // warehouseWarehousingEntry.setTypeName(DictCache.getValue(DictEnum.YES_NO, WarehouseWarehousingEntry.getType())); //}); @@ -197,7 +196,8 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl Date: Thu, 27 Jul 2023 17:39:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=9C=A8=E5=BA=93?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E7=8A=B6=E6=80=81=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/pan/service/impl/PanFactoryDataServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index d9dc9d924..cf6e8801f 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -402,7 +402,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setCustomerName(customerName); distributionStockArticleEntity.setGenre(1); - distributionStockArticleEntity.setState(2); + distributionStockArticleEntity.setState(10); distributionStockArticleEntity.setAdvanceId(advanceId); //--------------2023-07-06 新增字段处理 //查询包条码对应的运单信息