diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java index e7fbfde97..366285f21 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java @@ -70,7 +70,7 @@ public class DistributionDeliveryDetailsEntity extends TenantEntity { * 库存品ID */ @ApiModelProperty(value = "库存品ID") - private Long stockId; + private Long stockListId; /** * 数量 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java index 650b7c595..c98a4ec40 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java @@ -72,6 +72,11 @@ public class DistrilbutionBillLadingEntity extends TenantEntity { @ApiModelProperty(value = "提货时间") @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") private Date pickUpTime; + /** + * ids + */ + @TableField(exist = false) + private String ids; /** * 提货人 */ @@ -109,4 +114,79 @@ public class DistrilbutionBillLadingEntity extends TenantEntity { @TableField(exist = false) private Map fei; + /** + * 叉车司机 + */ + @ApiModelProperty(value = "叉车司机") + private Long forkliftId; + /** + * 装卸班组 + */ + @ApiModelProperty(value = "装卸班组") + private Long loaderId; + /** + * 叉车司机 + */ + @ApiModelProperty(value = "叉车司机") + private String forkliftName; + /** + * 装卸班组 + */ + @ApiModelProperty(value = "装卸班组") + private String loaderName; + + /** + * 备货人id + */ + @ApiModelProperty(value = "备货人id") + private Long stockupUserId; + /** + * 确认完成备货时间 + */ + @ApiModelProperty(value = "确认完成备货时间") + private Date fixTime; + /** + * 指派时间 + */ + @ApiModelProperty(value = "指派时间") + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") + private Date assignTime; + /** + * 备货状态 1待指派 2 待备货 3备货中 4已备货 + */ + @ApiModelProperty(value = "备货状态") + private String stockupStatus; + /** + * 备货区 + */ + @ApiModelProperty(value = "备货区") + private String stockupArea; + /** + * 指派状态;1-未指派、2-已指派 + */ + @ApiModelProperty(value = "指派状态;1-未指派、2-已指派") + private String assignStatus; + /** + * 备货库位 + */ + @ApiModelProperty(value = "备货库位") + private String stockipAllocation; + + /** + * 备货时间 + */ + @ApiModelProperty(value = "备货时间") + private Date stockupDate; + /** + * 备货人 + */ + @ApiModelProperty(value = "备货人") + private String stockupUser; + /** + * 备货人 + */ + @ApiModelProperty(value = "备货人") + private String goodsAreaId; + + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java index d66ffb9a2..ed26df3b1 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java @@ -51,6 +51,7 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity { private String typeServiceName; private String transport; //搬运 private String forklift; //叉车 + private Integer reservationStockListNum; //数量 private List list; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java index 5b9ad281a..d9795d965 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java @@ -17,6 +17,8 @@ package com.logpm.distribution.controller; import com.logpm.distribution.dto.DistrilbutionBillLadingDTO; +import com.logpm.distribution.entity.DistributionStockupEntity; +import com.logpm.distribution.vo.DistributionStockupVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -146,6 +148,48 @@ public class DistrilbutionBillLadingController extends BladeController { return R.data(pages); } + /** + * 备货信息表 详情 + */ + @GetMapping("/detailOwn") + @ApiOperation(value = "详情", notes = "传入distributionStockup") + public R detailOwn(DistrilbutionBillLadingEntity distrilbutionBillLading) { + DistrilbutionBillLadingVO detail = distrilbutionBillLadingService.getOneOwn(distrilbutionBillLading.getId()); + return R.data(detail); + } + + /** + * 备货信息表 预约信息 详情 + */ + @GetMapping("/detailReservationOwn") + @ApiOperation(value = "详情", notes = "传入distributionStockup") + public R> detailReservationOwn(@ApiIgnore @RequestParam Map distrilbutionBillLading, Query query) { + Object o = distrilbutionBillLading.get("id"); + IPage detail = distrilbutionBillLadingService.detailReservationOwn(Condition.getPage(query),Long.parseLong((String) o)); + return R.data(detail); + } + + /** + * 备货信息表 库存品信息 详情 + */ + @GetMapping("/inventoryOwn") + @ApiOperation(value = "详情", notes = "传入distributionStockup") + public R> getInventoryOwn(@ApiIgnore @RequestParam Map distrilbutionBillLading, Query query) { + Object o = distrilbutionBillLading.get("id"); + IPage detail = distrilbutionBillLadingService.getInventoryOwn(Condition.getPage(query),Long.parseLong((String) o)); + return R.data(detail); + } + /** + * 备货信息表 订单信息 详情 + */ + @GetMapping("/detailOrderOwn") + @ApiOperation(value = "详情", notes = "传入distributionStockup") + public R> detailOrderOwn(@ApiIgnore @RequestParam Map distrilbutionBillLading, Query query) { + Object o = distrilbutionBillLading.get("id"); + IPage detail = distrilbutionBillLadingService.detailOrderOwn(Condition.getPage(query),Long.parseLong((String) o)); + return R.data(detail); + } + /** * 提货单 新增 */ @@ -155,6 +199,15 @@ public class DistrilbutionBillLadingController extends BladeController { public R save(@Valid @RequestBody DistrilbutionBillLadingEntity distrilbutionBillLading) { return R.status(distrilbutionBillLadingService.save(distrilbutionBillLading)); } + /** + * 提货单 新增 + */ + @PostMapping("/saveAssign") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入distrilbutionBillLading") + public R saveAssign(@Valid @RequestBody DistrilbutionBillLadingEntity distrilbutionBillLading) { + return R.status(distrilbutionBillLadingService.saveAssign(distrilbutionBillLading)); + } /** * 提货单 修改 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.java index 9c0f58b72..58d0ce6bd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.java @@ -62,4 +62,14 @@ public interface DistrilbutionBillLadingMapper extends BaseMapper selectDetailList(@Param("stockArticleId") Long stockArticleId, @Param("scanStatus") Integer scanStatus,@Param("orderSelfNumbering") String orderSelfNumbering); + + DistrilbutionBillLadingVO getOneOwn(@Param("param") Long id); + + IPage detailReservationOwn(IPage page,@Param("param") Long id); + + List getInventoryChe(@Param("param") Long id); + + IPage detailOrderOwn(IPage page,@Param("param") Long id); + + IPage getInventoryOwn(IPage page,@Param("param") Long id); } 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 b6d7a0119..dc928bb58 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 @@ -118,5 +118,21 @@ and pl.stock_article_id = and bls.id is null + + + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java index 66255eb63..209d6265c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java @@ -64,4 +64,26 @@ public interface IDistrilbutionBillLadingService extends BaseService detailReservationOwn(IPage page, long parseLong); + /** + * 备货信息表 库存品信息 详情 + */ + IPage getInventoryOwn(IPage page, long parseLong); + /** + * 备货信息表 订单信息 详情 + */ + IPage detailOrderOwn(IPage page, long parseLong); } 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 b25536dfe..617e8d082 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 @@ -23,11 +23,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.distribution.dto.DistrilbutionBillLadingDTO; import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistrilbutionBillLadingExcel; import com.logpm.distribution.mapper.DistrilbutionBillLadingMapper; import com.logpm.distribution.service.*; +import com.logpm.distribution.vo.DistributionStockupVO; import com.logpm.distribution.vo.DistrilbutionBillLadingAppVO; import com.logpm.distribution.vo.DistrilbutionBillLadingVO; import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO; @@ -35,15 +37,15 @@ import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderMainVO; import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderVO; import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.StringUtil; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; /** * 提货单 服务实现类 @@ -117,11 +119,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl { - boolean b = distrilbutionBillLading.getStockDTOList().stream().anyMatch(a -> i.getStockId().equals(a.getId())); + boolean b = distrilbutionBillLading.getStockDTOList().stream().anyMatch(a -> i.getStockListId().equals(a.getId())); if (b) { //有 distrilbutionBillLading.getStockDTOList().forEach(q -> { - if (i.getStockId().equals(q.getId())) { + if (i.getStockListId().equals(q.getId())) { DistributionDeliveryDetailsEntity deliveryDetails = new DistributionDeliveryDetailsEntity(); deliveryDetails.setQuantity(q.getInventoryQuantity()); deliveryDetails.setId(q.getId()); @@ -141,6 +143,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl 0){ //没有 List detailsEntities = new ArrayList<>(); distrilbutionBillLading.getStockDTOList().forEach(i -> { DistributionDeliveryDetailsEntity details = new DistributionDeliveryDetailsEntity(); details.setBillLadingId(distrilbutionBillLading.getId()); - details.setStockId(i.getId()); + details.setStockListId(i.getId()); details.setQuantity(i.getInventoryQuantity()); detailsEntities.add(details); }); @@ -394,5 +398,59 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl detailReservationOwn(IPage page, long id) { + return baseMapper.detailReservationOwn(page,id); + } + + @Override + public IPage getInventoryOwn(IPage page, long id) { + IPage l = new Page<>(); + List inventoryChe = baseMapper.getInventoryChe(id); + boolean b = inventoryChe.stream().anyMatch(i -> i.getReservationStockListNum() > 0); + if(b){ + //查询库存品 + return baseMapper.getInventoryOwn(page,id); + }else{ + return l; + } + } + + @Override + public IPage detailOrderOwn(IPage page, long id) { + return baseMapper.detailOrderOwn(page,id); + } + }