diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 301dcc0d5..d4d3b3676 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -8,7 +8,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH =""; + public static final String DEVAUTH ="-zhy"; /** * 工厂对接服务名称 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 48fcc9918..f188a1d6c 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 @@ -20,10 +20,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; import org.springblade.core.tenant.mp.TenantEntity; import java.util.Date; @@ -39,8 +37,6 @@ import java.util.List; @TableName("logpm_distribution_stock_list") @ApiModel(value = "DistributionStockList对象", description = "库存品管理") @EqualsAndHashCode(callSuper = true) -@AllArgsConstructor -@NoArgsConstructor public class DistributionStockListEntity extends TenantEntity { /** diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java index 54c23ae1d..25dd69d74 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java @@ -24,4 +24,6 @@ public class DistributionStockupStockListVO implements Serializable { private String trayName;//托盘信息 + private Integer unpack;//是否拆包 0 没有 1 拆了 + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingOrderVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingOrderVO.java index 902c29199..f2d046e7b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingOrderVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingOrderVO.java @@ -34,6 +34,7 @@ public class DistrilbutionAppBillLadingOrderVO implements Serializable { private String orderSelfNumbering; private Integer orderStatus;//状态 + private String orderStatusStr;//状态 private Integer planNum;//自提件数 private Integer signedNum;//签收总数 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 4a744bf00..cf5778935 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -68,6 +68,22 @@ public class DistributionStockupAppController extends BladeController { @ApiOperationSupport(order = 1) @ApiOperation(value = "分页列表", notes = "传入stockupDTO") public R> pageList(@RequestBody StockupDTO stockupDTO) { + Integer current = stockupDTO.getCurrent(); + Integer size = stockupDTO.getSize(); + Integer status = stockupDTO.getStatus(); + if(Objects.isNull(current)){ + log.info("#################pageList: 当前页码不能为空"); + return R.fail(401,"当前页码不能为空"); + } + if(Objects.isNull(size)){ + log.info("#################pageList: 每页条数不能为空"); + return R.fail(401,"每页条数不能为空"); + } + if(Objects.isNull(status)){ + log.info("#################pageList: 查询状态不能为空"); + return R.fail(401,"查询状态不能为空"); + } + IPage pages = distributionStockupService.selectStockupPage(stockupDTO); return R.data(pages); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 13aa02e02..052be4296 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -183,7 +183,7 @@ ldpl.shelf_title, ldpl.goods_allocation, ldrs.stock_article_code, - ldrs.ldrs.stock_article_id, + ldrs.stock_article_id, ldpl.pallet @@ -196,36 +196,39 @@ ldrs.reservation_num planNum, ldst.cargo_unit cargoUnit, ldst.tray_name trayName, + ldst.unpack unpack, count(ldss.id) realNum from logpm_distribution_reservation_stocklist ldrs - left join logpm_distribution_stock_list ldst on ldst.id = ldrs.stocklist_id and ldst.is_deleted = 0 - left join logpm_distribution_stock s on s.stock_list_id = ldst.id and s.is_deleted = 0 + left join logpm_distribution_stock_list ldst on ldst.id = ldrs.stocklist_id and ldst.is_deleted = 0 + left join logpm_distribution_stock ldss on ldss.stock_list_id = ldst.id and ldss.is_deleted = 0 where ldrs.reservation_id = #{reservationId} and ldrs.is_deleted = 0 - group by ldst.id,ldst.storage_location, - ldst.description_goods, - ldst.sku, - ldst.cargo_norms, - ldrs.reservation_num, - ldst.tray_name, - ldst.cargo_unit + group by ldst.id, + ldst.storage_location, + ldst.description_goods, + ldst.sku, + ldst.cargo_norms, + ldrs.reservation_num, + ldst.cargo_unit, + ldst.tray_name, + ldst.unpack select sl.storage_location from logpm_distribution_reservation ldr - left join logpm_distribution_reservation_stocklist rs on rs.reservation_id = ldr.id and rs.is_deleted = 0 - left join logpm_distribution_stock_list sl on sl.id = rs.stocklist_id and sl.is_deleted = 0 + left join logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id = ldr.id and ldrs.is_deleted = 0 + left join logpm_distribution_stock_list sl on sl.id = ldrs.stocklist_id and sl.is_deleted = 0 where ldr.id = #{reservationId} and ldr.is_deleted = 0 group by sl.storage_location diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.java index 0e6d71f97..c4c0714bf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.java @@ -16,13 +16,14 @@ */ package com.logpm.distribution.mapper; -import com.logpm.distribution.entity.DistributionStockEntity; -import com.logpm.distribution.vo.DistributionStockVO; -import com.logpm.distribution.excel.DistributionStockExcel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.entity.DistributionStockEntity; +import com.logpm.distribution.excel.DistributionStockExcel; +import com.logpm.distribution.vo.DistributionStockVO; import org.apache.ibatis.annotations.Param; + import java.util.List; /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.xml index 2b7124db8..d5e52f5a1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockMapper.xml @@ -39,11 +39,11 @@ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 5c7fb9160..a55019e46 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -70,20 +70,14 @@ select ldr.id reservationId, ldr.delivery_type typeService, ldr.consignee customer, - lds.stockup_area stockupArea, + lds.stockup_area stockupArea from logpm_distribution_reservation ldr left join logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id left join logpm_distribution_stockup lds on ldsi.stockup_id = lds.id --- left join logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldr.id --- left join logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id --- left join logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id = ldr.id --- left join logpm_distribution_reservation_stockarticle ldrst on ldrst.reservation_id = ldr.id --- left join logpm_distribution_stockup_scan ldss on ldss.reservation_id = ldr.id and ldss.stock_list_id = ldrs.id and ldss.package_type = 2 --- left join logpm_distribution_stockup_scan ldss1 on ldss1.reservation_id = ldr.id and ldss1.parcel_list_id = ldrs.id and ldss.package_type = 2 and DATE_FORMAT(lds.stockup_date,'%Y-%m-%d') = #{param.stockupDate} - and lds.stockup_status in (2.3) - and lds.stockup_status = 4 + and lds.stockup_status in (1,2,3) + and lds.stockup_status = 4 and lds.is_deleted = 0 and lds.forklift_id = #{param.userId} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index f1f156806..9e4c3ae68 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -94,8 +94,8 @@ pl.order_self_numbering orderSelfNumbering, pl.packet_bar_code packetBarCode, case - when bls.id is null then 0 - else 1 + when bls.id is null then 1 + else 2 end scanStatus, 0 errorStatus from logpm_distribution_parcel_list pl @@ -106,10 +106,10 @@ and pl.order_self_numbering like ${orderSelfNumbering} - + and bls.id is null - + and bls.id is not null diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 9f4a3d290..393f193f0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -133,7 +133,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl packagePallet = distributionParcelListService.selectPalletByReservationId(reservationId); //2.查询库存品托盘信息 List stockListPallet = distributionStockListService.selectPalletByReservationId(reservationId); @@ -190,6 +190,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl packageAllocation, List stockListAllocation) { + Set set = new HashSet<>(); set.addAll(packageAllocation); for (String allocation:stockListAllocation){ + if(StringUtil.isBlank(allocation)){ + continue; + } //因为库存品的数据可能会有拼接 String[] split = allocation.split(","); set.addAll(Arrays.asList(split)); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 5aa73ab2b..e0b5c7eca 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -331,6 +331,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl 0){ + vo.setOrderStatusStr("部分扫"); + }else if(sn == 0){ + vo.setOrderStatusStr("未扫"); + } + //0 全部 1 齐套 2部分扫 3未扫 if(orderStatus == 0){ l.add(vo); @@ -339,7 +347,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl 0){ l.add(vo); } }else if(orderStatus == 3){