From 7a467d3daa336c69ec609ac873f840c31ad0a781 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Thu, 20 Jul 2023 14:33:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BB=9F=E8=AE=A1=E8=A3=85=E8=BD=A6=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...DistributionReservationStockarticleVO.java | 181 +++++++++++++++++- .../DistributionDeliveryListController.java | 2 +- .../dto/DistrilbutionloadingscanDTO.java | 2 +- .../mapper/DistributionDeliveryInfoMapper.xml | 37 +++- .../DistributionDeliveryListMapper.java | 6 + .../mapper/DistributionDeliveryListMapper.xml | 7 +- ...tributionReservationStockarticleMapper.xml | 85 ++++++-- .../mapper/DistributionSignforMapper.xml | 3 + .../DistributionDeliveryListServiceImpl.java | 69 +++---- 9 files changed, 334 insertions(+), 58 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java index 6a77fbae5..8347c3447 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStockarticleVO.java @@ -16,12 +16,17 @@ */ package com.logpm.distribution.vo; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.logpm.distribution.entity.DistributionReservationStockarticleEntity; import io.swagger.annotations.ApiModelProperty; import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; +import java.util.Date; + /** * 预约订单中间表 视图实体类 * @@ -32,20 +37,186 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class DistributionReservationStockarticleVO extends DistributionReservationStockarticleEntity { private static final long serialVersionUID = 1L; + /** + * 物料名称 + */ + @ApiModelProperty(value = "物料名称") + private String materialName; + /** + * 已备货数量 + */ + @ApiModelProperty(value = "已备货数量") + private String readyStock; + /** + * 备货数量 + */ + @ApiModelProperty(value = "备货数量") + private String deliveryNumber; + /** + * 托盘 + */ + @ApiModelProperty(value = "托盘") + private String pallet; + /** + * 或为信息 + */ + @ApiModelProperty(value = "或为信息") + private String goodsAllocation; + /** + * 订单状态 + */ + @ApiModelProperty(value = "订单状态") + private String stockArticleState; + /** * 订单自编号 */ @ApiModelProperty(value = "订单自编号") private String orderSelfNumbering; + + /** + * 门店id + */ + @ApiModelProperty(value = "门店id") + private Long storeId; + + + /** + * 商场id + */ + @ApiModelProperty(value = "商场id") + private Long mallId; + + /** + * 商场名称 + */ + @ApiModelProperty(value = "商场名称") + private String mallName; + /** + * 商场编号 + */ + @ApiModelProperty(value = "商场编码") + private String mallCode; + + + /** + * 门店编号 + */ + @ApiModelProperty(value = "门店编码") + private String storeCode; + + + /** + * 门店名称 + */ + @ApiModelProperty(value = "门店名称") + private String storeName; + /** + * 货物名称 + */ + @ApiModelProperty(value = "货物名称") + private String descriptionGoods; + /** + * 仓库 + */ + @ApiModelProperty(value = "仓库") + private String warehouse; + /** + * 车次号 + */ + @ApiModelProperty(value = "车次号") + private String trainNumber; + + + /** + * 入库时间 + */ + @ApiModelProperty(value = "入库时间") + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") + private Date warehouseEntryTime; + /** + * 在库时间 + */ + @ApiModelProperty(value = "在库时间") + private String storeTime; + /** + * 订单总件数 + */ + @ApiModelProperty(value = "订单总件数") + private Integer totalNumber; + /** + * 在库件数 + */ + @ApiModelProperty(value = "在库件数") + private Integer handQuantity; + /** + * 是否齐套 + */ + @ApiModelProperty(value = "是否齐套") + private Integer completeSet; + /** + * 是否齐套名称 + */ + @ApiModelProperty(value = "是否齐套名称") + @TableField(exist = false) + private String completeSetName; + /** + * 品牌 + */ + @ApiModelProperty(value = "品牌") + private String brand; + /** + * 服务类型 + */ + @ApiModelProperty(value = "服务类型") + private String typeService; + /** + * 顾客名字 + */ + @ApiModelProperty(value = "顾客名字") + private String customerName; + /** + * 顾客电话 + */ + @ApiModelProperty(value = "顾客电话") + private String customerTelephone; + /** + * 顾客地址 + */ + @ApiModelProperty(value = "顾客地址") + private String customerAddress; + /** + * 类型;1 预约单 2库存单 + */ + @ApiModelProperty(value = "类型;1 预约单 2库存单") + private Integer genre; + + + /** + * 状态;1 已通知 2 未通知 + */ + @ApiModelProperty(value = "状态;1 已通知 2 未通知") + private Integer notification; + + /** + * 增值服务总费用 + */ + @ApiModelProperty(value = "增值服务总费用") + private BigDecimal fee; + + /** + * 协商费用 + */ + @ApiModelProperty(value = "协商费用") + private BigDecimal rate; + + + /** * 运单号 */ @ApiModelProperty(value = "运单号") private String waybillNumber; - /** - * 数量 - */ - @ApiModelProperty(value = "数量") - private Integer signinQuantity; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index 7f3a543d3..d40cb1fa0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -121,7 +121,7 @@ public class DistributionDeliveryListController extends BladeController { */ @GetMapping("/order") @ApiOperationSupport(order = 1) - @ApiOperation(value = "查看包件详情", notes = "传入distributionDeliveryList") + @ApiOperation(value = "查看订单", notes = "传入distributionDeliveryList") public R> order(DistributionDeliveryInfoDTO distributionDeliveryInfoDTO, Query query) { IPage pages = distributionDeliveryInfoService.selectDistributionDeliveryorder(Condition.getPage(query), distributionDeliveryInfoDTO); return R.data(pages); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java index 06a172924..5353d81c7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java @@ -85,7 +85,7 @@ public class DistrilbutionloadingscanDTO { /** * 库存品扫描物品 */ - @ApiModelProperty(value = "扫描物品(1-手动输入,2-托盘)") + @ApiModelProperty(value = "扫描物品(1-手动输入,2-托盘,3-扫描)") // @NotEmpty(message = "扫描物品不能为空") private Integer inventorytype; /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index ab5e2745f..1624e53b2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -108,7 +108,14 @@ JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id - lds.is_deleted =0 and lds.reservation_id = #{param.reservationId} + lds.is_deleted =0 + + and lds.reservation_id = #{param.reservationId} + + + and ldrs.stock_article_id = #{param.orderId} + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.xml index 3b65ec579..78be76beb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.xml @@ -38,28 +38,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index d98f696db..23b8ed522 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -462,6 +462,9 @@ ldr.delivery_address deliveryAddress, ldr.delivery_phone deliveryPhone, lds.reservation_id reservationId, + lds.signing_type signingType, + lds.clerk_sign_pictures clerkSignPictures, + lds.delivery_sign_pictures deliverySignPictures, ldr.reservation_date reservationDate, CASE diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index c1894b3d9..36a7253bf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -624,7 +624,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionLoadscanEntities = baseMapper.selectdeliverOne(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId()); //无数据的 // List distributionLoadscanEntitiesno = baseMapper.selectdeliverOneNo(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId()); - //查询库存品 + //查询所有的库存品 List distributionLoadscanvnEntities = baseMapper.selectdeliverOnevn(distrilbutionloadingscanDTO.getReservationId(), distrilbutionloadingscanDTO.getDeliveryId()); //将该客户所有的物品上该车辆 if (distributionLoadscanEntities.size() > 0) { @@ -815,42 +815,47 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionLoadscanvnEntities = baseMapper.selectdeliveryworkVnId(distrilbutionloadingscanDTO.getInventoryId(), distrilbutionloadingscanDTO.getDeliveryId()); - if (distributionLoadscanvnEntities.size() <= 0) { - return R.fail(3001, "窜货"); - } - for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntities) { - //查询是否重复扫码 - List distributionLoadscanEntitiesflag = distributionLoadscanMapper.selectList(new QueryWrapper().lambda() - .eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanEntity.getReservationId()) - .eq(DistributionLoadscanEntity::getPacketBarCode, distributionLoadscanEntity.getPacketBarCode()) - .ne(DistributionLoadscanEntity::getScanStatus, 1) - ); + boolean b =false; + if (distrilbutionloadingscanDTO.getInventorytype()==3){ + List distributionLoadscanvnEntities = baseMapper.selectdeliveryworkVnScan(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); + if (distributionLoadscanvnEntities.size() <= 0) { + return R.fail(3001, "窜货"); + } + for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntities) { + //查询是否重复扫码 +// List distributionLoadscanEntitiesflag = distributionLoadscanMapper.selectList(new QueryWrapper().lambda() +// .eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanEntity.getReservationId()) +// .eq(DistributionLoadscanEntity::getPacketBarCode, distributionLoadscanEntity.getPacketBarCode()) +// .ne(DistributionLoadscanEntity::getScanStatus, 1) +// ); // if (distributionLoadscanEntitiesflag.size() > 0) { // return R.fail(3002, "重复货物"); // } - //依次插入该装车记录,设置车辆 - if (null !=distributionDeliverySelfEntity.getDriverId()){ - distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());} - distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); - distributionLoadscanEntity.setScanStatus(2); - distributionLoadscanEntity.setScanType("1"); - distributionLoadscanEntity.setScanTime(new Date()); - distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId()); - distributionLoadscanEntity.setLoadedNub(distrilbutionloadingscanDTO.getInventoryNub()); - distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); - if (null != distributionDeliverySelfEntity.getDriverPhone()) { - distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); - } - if (null != distributionDeliverySelfEntity.getVehicleId()){ - distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());} - //查询本车次是否第一次扫码,没有则更新上车时间 - Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); - //更新签收表的装车数量 - Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(), distrilbutionloadingscanDTO.getInventoryNub()); + //依次插入该装车记录,设置车辆 + if (null !=distributionDeliverySelfEntity.getDriverId()){ + distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());} + distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); + distributionLoadscanEntity.setScanStatus(2); + distributionLoadscanEntity.setScanType("1"); + distributionLoadscanEntity.setScanTime(new Date()); + distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId()); + distributionLoadscanEntity.setLoadedNub(distrilbutionloadingscanDTO.getInventoryNub()); + distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); + if (null != distributionDeliverySelfEntity.getDriverPhone()) { + distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); + } + if (null != distributionDeliverySelfEntity.getVehicleId()){ + distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());} + //查询本车次是否第一次扫码,没有则更新上车时间 + Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); + //更新签收表的装车数量 + Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(), distrilbutionloadingscanDTO.getInventoryNub()); + } + b = distributionLoadscaninvnService.saveBatch(distributionLoadscanvnEntities); } - boolean b = distributionLoadscaninvnService.saveBatch(distributionLoadscanvnEntities); + + return R.status(b); }