diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionOrderZeroPackafeVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionOrderZeroPackafeVO.java new file mode 100644 index 000000000..0ee714634 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionOrderZeroPackafeVO.java @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.vo; + +import com.logpm.distribution.entity.DistributionStockArticleEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 配送在库订单 视图实体类 + * + * @author cyz + * @since 2023-06-13 + */ +@Data +public class DistributionOrderZeroPackafeVO implements Serializable { + private static final long serialVersionUID = 1L; + + private Long Id; + /** + * 总数 + */ + private Integer quantity; + /** + * 品类 + */ + private String firsts; + + private String warehouseName; + /** + * 入库车次 + */ + private String trainNumber; + /** + * 订单自编号 + */ + private String orderCode; + /** + * 品牌 + */ + private String brandName; + /** + * 运单号 + */ + private String waybillNumber; + /** + * 入库时间 + */ + private String warehouseEntryTimeEnd; + /** + * 发站仓 + */ + private String sendWarehouseName; + /** + * 收站仓 + */ + private String acceptWarehouseName; + /** + * 托盘 + */ + private String pallet; + /** + * 库位 + */ + private String goodsAllocation; + /** + * 在库数量 + */ + private Integer handQuantity; + /** + * 冻结数量 + */ + private Integer deliveryQuantity; + /** + * 出库数量 + */ + private Integer outboundQuantity; + /** + * 签收数量 + */ + private Integer signinQuantity; + /** + * 品类 + */ + private String aaa; + /** + * 品类 + */ + private String bbb; + /** + * 品类 + */ + private String ccc; + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataWarehouseDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataWarehouseDTO.java index 6936405f6..aeff62a4c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataWarehouseDTO.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataWarehouseDTO.java @@ -20,6 +20,8 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 品类 数据传输对象实体类 * @@ -33,5 +35,8 @@ public class BasicdataWarehouseDTO extends BasicdataWarehouseEntity { private Integer pageType; + private String warehouseNames; + + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java index 80f974094..02e45edb5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java @@ -42,7 +42,7 @@ public interface BasicdataWarehouseMapper extends BaseMapper selectWarehouseWarehousePage(IPage page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse); + IPage selectWarehouseWarehousePage(IPage page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse,@Param("warehouseNameList") List warehouseNameList); /** @@ -89,7 +89,7 @@ public interface BasicdataWarehouseMapper extends BaseMapper selectExpireWarehouseWarehousePage(IPage page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse); + IPage selectExpireWarehouseWarehousePage(IPage page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse,@Param("warehouseNameList") List warehouseNameList); /** * 查询临期仓库 @@ -97,6 +97,6 @@ public interface BasicdataWarehouseMapper extends BaseMapper selectDeadlineWarehouseWarehousePage(IPage page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse); + IPage selectDeadlineWarehouseWarehousePage(IPage page,@Param("param") BasicdataWarehouseDTO warehouseWarehouse,@Param("warehouseNameList") List warehouseNameList); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml index e4f2fc929..a4c3dceb3 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml @@ -74,6 +74,13 @@ select * from logpm_warehouse_warehouse is_deleted = 0 + + AND name IN + + #{item} + + + @@ -150,6 +157,13 @@ is_deleted = 0 AND DATEDIFF(DATE_FORMAT(end_date,'%y%m%d'),DATE_FORMAT(NOW(),'%y%m%d')) <= 0 + + AND name IN + + #{item} + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java index 486bf922d..86efaa27b 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java @@ -93,16 +93,20 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl warehouseNameList = null; + if (!Objects.isNull(warehouseWarehouse.getWarehouseNames())){ + warehouseNameList = Func.toStrList(warehouseWarehouse.getWarehouseNames()); + } switch (pageType){ case 1: - IPage basicdataWarehouseVOS = baseMapper.selectWarehouseWarehousePage(page, warehouseWarehouse); + IPage basicdataWarehouseVOS = baseMapper.selectWarehouseWarehousePage(page, warehouseWarehouse,warehouseNameList); return basicdataWarehouseVOS; case 2: - IPage basicdataDeadlineWarehouseVOS = baseMapper.selectDeadlineWarehouseWarehousePage(page, warehouseWarehouse); + IPage basicdataDeadlineWarehouseVOS = baseMapper.selectDeadlineWarehouseWarehousePage(page, warehouseWarehouse,warehouseNameList); //临期 return basicdataDeadlineWarehouseVOS; case 3: - IPage basicdataExpireWarehouseVOS = baseMapper.selectExpireWarehouseWarehousePage(page, warehouseWarehouse); + IPage basicdataExpireWarehouseVOS = baseMapper.selectExpireWarehouseWarehousePage(page, warehouseWarehouse,warehouseNameList); return basicdataExpireWarehouseVOS; default: log.error("未知的pageType>>>>>>>>>>>>>>> {}",pageType); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java index 35cde07ed..2c24e5456 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java @@ -26,6 +26,7 @@ import com.logpm.distribution.dto.DistributionParcelListDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.excel.DistributionParcelListExcel; import com.logpm.distribution.service.IDistributionParcelListService; +import com.logpm.distribution.vo.DistributionOrderZeroPackafeVO; import com.logpm.distribution.vo.DistributionParcelListBaseVO; import com.logpm.distribution.vo.DistributionParcelListVO; import com.logpm.distribution.vo.DistributionParcelListZeroVO; @@ -90,6 +91,15 @@ public class DistributionParcelListController extends BladeController { return R.data(DistributionParcelListWrapper.build().pageVO(pages)); } + + @GetMapping("/zeroList") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionParcelList") + public R zeroList(@ApiIgnore @RequestParam Long orderId) { + List pages = distributionParcelListService.pageOweZeroList(orderId); + return R.data(pages); + } + /** * 在库订单包件清单 分页 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index a2268ba0a..a72cd7c08 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -317,4 +317,13 @@ public interface DistributionParcelListMapper extends BaseMapper deleteParcelListIds); List findPackageGoodsListByWaybillNoAndWarehouseId(@Param("waybillNo") String waybillNo, @Param("warehouseId") Long warehouseId); + + /** + * 查询零担包件详情 + * @param page + * @param distributionParcelListDTO + * @return + */ + List pageOweZeroList(Long orderId); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index 52cc7fe76..847747dc2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -1982,5 +1982,65 @@ where lwwd.waybill_no = #{waybillNo} and ldpl.warehouse_id = #{warehouseId} + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 3ce58f7bb..c754181c3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -477,8 +477,9 @@ and ldpl.id = #{o} - + GROUP BY + ldpl.id