diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/CodeNumConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/CodeNumConstant.java index c494a2990..eef45456c 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/CodeNumConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/CodeNumConstant.java @@ -12,5 +12,6 @@ public class CodeNumConstant { public final static int SHELF = 8;//货架号 public final static int PSKH = 9;//配送客户号 public final static int ABNORMAL_ORDER = 10;//异常工单号 + public final static int TRUNKLINEBILLLADING = 11;//干线提货单号 } diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java index 5c8e470de..b9b7067c4 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java @@ -15,6 +15,7 @@ public class DictBizConstant { public static final String BASIC_GROUNDING = "basic_grounding";//上架状态 public static final String STOCKUP_STATUS = "stockup_status";//备货状态 + public static final String ORDER_STOCKUP_STATUS = "order_stockup_status";//订单备货状态 public static final String ORDER_RESERVATION_STATUS = "order_reservation_status";//订单预约状态 public static final String RESERVATION_STATUS = "reservation_status";//预约状态 @@ -103,4 +104,11 @@ public class DictBizConstant { public static final String ORDER_PACKAGE_LOADING_STATUS = "order_package_loading_status";//预约签收状态 // --------------2023-10-12 --------------------- public static final String WAREHOUSE_QUEST_STATUS = "warehouse_quest_status"; //盘点任务 + // --------------2023-11-04 --------------------- + public static final String WAREHOUSE_RETENTION_TYPE = "warehouse_retention_type"; //滞留类型 + + + //---------------2023-11-07--------------------- + public static final String BILLLADING_CHARGE_TYPE = "billlading_charge_type"; //提货单计费方式 + } diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/retention/RetentionTypeConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/retention/RetentionTypeConstant.java new file mode 100644 index 000000000..eca334cad --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/retention/RetentionTypeConstant.java @@ -0,0 +1,47 @@ +package org.springblade.common.constant.retention; + +/** + * 订单冻结状态枚举 + * 对应码表 freeze_status + * @author pref + */ +public enum RetentionTypeConstant { + + zhuangchezhiliu("装车滞留",1), + peisongzhiliu("配送滞留",2), + chukuzhiliu("出库滞留",3), + quxiaozhiliu("取消滞留",4); + + + /** + * 状态 + */ + private String name; + + /** + * 值 + */ + private Integer value; + + + private RetentionTypeConstant(String name, Integer value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getValue() { + return value; + } + + public void setValue(Integer value) { + this.value = value; + } +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java index d1e414941..4bdea19eb 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java @@ -209,4 +209,16 @@ public class BasicdataDriverArteryEntity extends TenantEntity { @ApiModelProperty(value = "预留5") private String reserve5; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String warehouseId; + + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String warehouseName; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueEntity.java index 6a9da4226..1a80c389c 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionAddvalueEntity.java @@ -119,5 +119,17 @@ public class DistributionAddvalueEntity extends TenantEntity { @ApiModelProperty(value = "配送Id") private Long deliveryListId; + /** + * 仓库Id + */ + @ApiModelProperty(value = "仓库Id") + private Long warehouseId; + + /** + * 仓库名称 + */ + @ApiModelProperty(value = "仓库名称") + private String warehouseName; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index 50e716e84..a1c46e492 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -141,6 +141,61 @@ public class DistributionParcelListEntity extends TenantEntity { @ApiModelProperty(value = "客户id") @TableField(exist = false) private Long marketId; + + /** + * 商场名称 + */ + @ApiModelProperty(value = "商场名称") + @TableField(exist = false) + private String mallName; + /** + * 商场名称 + */ + @ApiModelProperty(value = "分类") + @TableField(exist = false) + private String genre; + /** + * 商场名称 + */ + @ApiModelProperty(value = "零担标识") + @TableField(exist = false) + private String isZero; + /** + * 商场名称 + */ + @ApiModelProperty(value = "商场iD") + @TableField(exist = false) + private Long mallId; + /** + * 托盘ID + */ + @ApiModelProperty(value = "托盘ID") + @TableField(exist = false) + private String trayId; + /** + * 托盘编码 + */ + @ApiModelProperty(value = "托盘编码") + @TableField(exist = false) + private String trayCode; + /** + * 货位ID + */ + @ApiModelProperty(value = "货位ID") + @TableField(exist = false) + private String allocationId; + /** + * 完整货位 + */ + @ApiModelProperty(value = "完整货位") + @TableField(exist = false) + private String positionCode; + /** + * 库存品ID + */ + @ApiModelProperty(value = "库存品ID") + @TableField(exist = false) + private Long stockId; /** * 物料Id */ 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 2ff7f4ef8..a64c8eef3 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 @@ -275,11 +275,11 @@ public class DistributionStockListEntity extends TenantEntity { */ @ApiModelProperty(value = "拆包ID") private Long pid; - /** - * 托盘ID - */ - @ApiModelProperty(value = "托盘ID") - private Long trayId; +// /** +// * 托盘ID +// */ +// @ApiModelProperty(value = "托盘ID") +// private Long trayId; /** * 托盘名称 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java index 1a5e61d73..38bed5305 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java @@ -40,12 +40,17 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class DistributionStockupEntity extends TenantEntity { - /** - * 备货时间 - */ + @ApiModelProperty(value = "备货编号") + private String stockupCode; + @ApiModelProperty(value = "备货时间") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date stockupDate; + + @ApiModelProperty(value = "出库时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date outboundDate; + /** * 备货人 */ @@ -78,6 +83,13 @@ public class DistributionStockupEntity extends TenantEntity { */ @ApiModelProperty(value = "备货库位") private String stockipAllocation; + + /** + * 托盘位 + */ + @ApiModelProperty(value = "托盘位") + @TableField(exist = false) + private String pallet; /** * 备货区ID */ @@ -155,12 +167,8 @@ public class DistributionStockupEntity extends TenantEntity { @ApiModelProperty(value = "指派时间") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date assignTime; - /** - * 出库时间 - */ - @ApiModelProperty(value = "出库时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date outboundDate; + + /** * 班组职能 @@ -190,11 +198,6 @@ public class DistributionStockupEntity extends TenantEntity { */ @ApiModelProperty(value = "取消原因") private String annulment; - /** - * 备货编号 - */ - @ApiModelProperty(value = "备货编号") - private String stockupCode; @ApiModelProperty(value = "仓库Id") private Long warehouseId; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java index 58513da3f..84d88d181 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java @@ -16,13 +16,20 @@ */ package com.logpm.distribution.feign; +import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import com.logpm.distribution.vo.DistributionDeliveryListVO; +import com.logpm.distribution.vo.DistributionDeliverySelfVO; +import com.logpm.distribution.vo.DistributionRetentionScanVo; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 配送管理 Feign接口类 * @@ -45,6 +52,24 @@ public interface IDistributionDeliveryListClient { * @return BladePage */ @GetMapping(TOP) - BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + BladePage deliveryListTop(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + + + /** + * 根据配送任务ID查询配送司机信息 + * @param deliveryId + * @return + */ + @GetMapping(TOP+"/getDeliveryDriverInfo") + DistributionDeliveryListVO getDeliveryDriverInfo(@RequestParam("current") Long deliveryId); + + +// /** +// * 根据配送任务ID查询配送司机信息 +// * @param distributionRetentionScanVo +// * @return +// */ +// @GetMapping(TOP+"/retentionCancelDeliveryPack") +// void retentionCancelDeliveryPack(@RequestBody DistributionRetentionScanVo distributionRetentionScanVo); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java index ec567b9fe..6b56d4cd6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java @@ -17,6 +17,8 @@ package com.logpm.distribution.feign; import com.logpm.distribution.entity.DistributionParcelListEntity; +import com.logpm.distribution.entity.DistributionStockArticleEntity; +import com.logpm.distribution.vo.DistributionParcelListVO; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; @@ -41,6 +43,7 @@ public interface IDistributionParcelListClient { String API_PREFIX = "/client"; String TOP = API_PREFIX + "/top1"; String TOPPARCELLIST = API_PREFIX + "/getParcelList"; + String GETPARCELLISTINFO = API_PREFIX + "/getParcelListInfo"; @PostMapping(TOPPARCELLIST) List getParcelList(@RequestBody DistributionParcelListEntity parcelListEntity); @@ -102,4 +105,7 @@ public interface IDistributionParcelListClient { @GetMapping(API_PREFIX+"/updateStockArticleIdByOrderCode") void updateStockArticleIdByOrderCode(@RequestParam Long orderId, @RequestParam String orderCode); + + @PostMapping(GETPARCELLISTINFO) + List getParcelListInfo(@RequestBody DistributionParcelListVO parcelListVO); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java index 0f52814c7..0df84a729 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java @@ -17,10 +17,12 @@ package com.logpm.distribution.feign; import com.logpm.distribution.entity.DistributionReservationEntity; +import com.logpm.distribution.vo.DistributionRetentionScanVo; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; /** @@ -47,4 +49,12 @@ public interface IDistributionReservationClient { @GetMapping(TOP) BladePage reservationTop(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + /** + * 根据配送任务ID查询配送司机信息 + * @param distributionRetentionScanVo + * @return + */ + @GetMapping(TOP+"/retentionCancelReservationPack") + boolean retentionCancelReservationPack(@RequestBody DistributionRetentionScanVo distributionRetentionScanVo); + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java index 0d293de12..ec0864d28 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java @@ -41,6 +41,7 @@ public interface IDistributionStockArticleClient { String API_PREFIX = "/client"; String TOP = API_PREFIX + "/top12"; + String GETSTOCKARTICLEINFO = API_PREFIX + "/getStockArticleInfo"; /** * 获取配送在库订单列表 @@ -104,4 +105,11 @@ public interface IDistributionStockArticleClient { @GetMapping(API_PREFIX + "/submitHandleNumByOrderId") void submitHandleNumByOrderId(@RequestParam Integer subNum, @RequestParam Long articleId); + + /** + * 查询订单信息数据 + * @return + */ + @PostMapping(GETSTOCKARTICLEINFO) + List getStockArticleInfo(@RequestBody DistributionStockArticleEntity distributionStockArticleEntity); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java index c261acfd2..07efc59be 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java @@ -47,6 +47,7 @@ public interface IDistributionStockListClient { String ADDSTOCKLIST = API_PREFIX + "/addStockList"; String UPDATESTOCKLIST = API_PREFIX + "/updateStockList"; String PUTSTOCKLIST = API_PREFIX + "/putStockList"; + String GETSTOCKLISTINFO = API_PREFIX + "/getStockListInfo"; /** * 获取库存品管理列表 @@ -116,12 +117,12 @@ public interface IDistributionStockListClient { List getStockListByWarehouseIdAndMarketAndStockListInfo(@RequestParam("incomingBatch") String incomingBatch,@RequestParam("marketNames") List marketNames,@RequestParam("warehouseId") Long warehouseId); -// /** -// * 修改某个客户信息及物品信息 -// * -// * @return BladePage -// */ -// @PutMapping(PUTSTOCKLIST) -// Boolean putStockList(@RequestBody DistributionStockListEntity distributionStockListEntity); + /** + * 修改某个客户信息及物品信息 + * + * @return BladePage + */ + @PostMapping(GETSTOCKLISTINFO) + List getStockListInfo(@RequestBody DistributionStockListEntity distributionStockListEntity); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvaluePackageVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvaluePackageVO.java index f05b5a9ee..ef7d239ff 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvaluePackageVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvaluePackageVO.java @@ -42,4 +42,45 @@ public class DistributionAddvaluePackageVO extends DistributionAddvaluePackageEn */ private Integer planQuantity; + /** + * 总数量 + */ + private Integer totalQuantity; + + /** + * 总数量 + */ + private String firsts; + + /** + * 总数量 + */ + private String second; + + /** + * 总数量 + */ + private String thirdProduct; + + + /** + * 总数量 + */ + private Long reservationId; + + /** + * 总数量 + */ + private String packageType; + + /** + * 总数量 + */ + private String materialNumber; + + /** + * 总数量 + */ + private String sku; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java index 1523e5f82..961be6fd0 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java @@ -100,6 +100,19 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { */ private List warehouseIdList; + /** + * 商场id + */ + private Long mallId; + /** + * 商场id + */ + private String genre; + /** + * 商场id + */ + private String isZero; + /** * 装车数量 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListZeroVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListZeroVO.java index f379ca68a..dfd0e25a6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListZeroVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListZeroVO.java @@ -38,11 +38,21 @@ public class DistributionParcelListZeroVO implements Serializable { */ @ApiModelProperty(value = "填写数量") private Integer TiQuantity; + /** + * 冻结数量 + */ + @ApiModelProperty(value = "冻结数量") + private Integer deliveryQuantity; /** * 配送数量 */ @ApiModelProperty(value = "配送数量") - private Integer deliveryQuantity; + private Integer reservationQuantity; + /** + * 配送数量 + */ + @ApiModelProperty(value = "出库数量") + private Integer outboundQuantity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionRetentionScanVo.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionRetentionScanVo.java new file mode 100644 index 000000000..1fc248fae --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionRetentionScanVo.java @@ -0,0 +1,84 @@ +package com.logpm.distribution.vo; + + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 滞留扫描对象 + */ +@Data +//@EqualsAndHashCode(callSuper = true) +public class DistributionRetentionScanVo { + + /** + * 预约Id + */ + private Long reservationId; + + /** + * 预约Id + */ + private String reservationCode; + + /** + * 订单Id + */ + private Long orderId; + + /** + * 订单自编码 + */ + private String orderCode; + + /** + * 订单Id + */ + private Long inventoryId; + + + + /** + * 物料编码 + */ + private String materialNumber; + + /** + * 物料名称 + */ + private String materialName; + + /** + * 包件ID + */ + private Long orderPackageId; + + /** + * 包条码 + */ + private String orderPackageCode; + + /** + * 滞留数量 + */ + private Integer retentionQuantity; + + /** + * 类型 + */ + private Integer conditions; + + + /** + * 配送ID + */ + private Long deliveryId; + + + /** + * 配送车次 + */ + private String trainNumber; + + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java index 4e12484f6..42adbdc00 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java @@ -38,6 +38,11 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity { */ @ApiModelProperty(value = "客户名称") private String consignee; + /** + * 配送类型 + */ + @ApiModelProperty(value = "配送类型") + private String serveType; /** * 客户Id */ @@ -58,6 +63,11 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity { */ @ApiModelProperty(value = "服务号") private String serviceNumber; + /** + * 门店名称 + */ + @ApiModelProperty(value = "门店名称") + private String storeName; /** * 配送类型 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java index aaedc946d..c453c7da6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java @@ -16,7 +16,6 @@ */ package com.logpm.distribution.vo; -import com.logpm.distribution.entity.DistributionSignPrintEntity; import com.logpm.distribution.entity.DistributionSignforEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -34,12 +33,26 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class DistributionSignforVO extends DistributionSignforEntity { private static final long serialVersionUID = 1L; + /** * 门店名称 */ @ApiModelProperty(value = "门店名称") private String storeName; + private List ids; + /** + * 仓库名称 + */ + @ApiModelProperty(value = "仓库名称") + private String warehouseName; + + /** + * 门店名称 + */ + @ApiModelProperty(value = "服务类型") + private String serveType; + /** * 配送单号 */ @@ -95,6 +108,11 @@ public class DistributionSignforVO extends DistributionSignforEntity { */ @ApiModelProperty(value = "备注") private String remarks; +/** + * 备注 + */ + @ApiModelProperty(value = "订单自编号") + private String orderCode; /** * 是否加急 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListVO.java index 99c8f0977..b7e23522d 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockListVO.java @@ -102,10 +102,30 @@ public class DistributionStockListVO extends DistributionStockListEntity { */ @ApiModelProperty(value = "托盘id") private String trayCode; + /** + * 托盘id + */ + @ApiModelProperty(value = "托盘id") + private String trayId; + /** + * 库位id + */ + @ApiModelProperty(value = "库位id") + private String allocationId; /** * 货位信息 */ @ApiModelProperty(value = "货位信息") private String positionCode; + /** + * 类型 + */ + @ApiModelProperty(value = "类型") + private Integer conditions; + /** + * 类型 + */ + @ApiModelProperty(value = "shan") + private String mallName; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockVO.java index cf43d9d0e..b9e870e7d 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockVO.java @@ -17,6 +17,7 @@ package com.logpm.distribution.vo; import com.logpm.distribution.entity.DistributionStockEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -43,4 +44,10 @@ public class DistributionStockVO extends DistributionStockEntity { private Integer whole;//全部 + /** + * 出库类型 + */ + @ApiModelProperty(value = "出库类型") + private String outboundTypeName; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java index 80558e1aa..0f7f40d7b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java @@ -33,6 +33,8 @@ public class DistributionStockupOrderListVO implements Serializable { private Long areaId; //货区id private String trayId; //托盘id + private String customerAddress; //客户地址 + private String firstsNumber; //品类数量 private Long shelfId; //货架id private Long parcelListId; //包件id private Long stockId; //备货id diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java index b7f18520b..718cacf3b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java @@ -72,6 +72,7 @@ public class DistributionStockupVO extends DistributionStockupEntity { private Integer number; private String goodsAllocation; //货位 private String stockipAllocation; //货位 + private String pallet; //托盘位 private Integer reservationStockListNum; //数量 private String reservationId; //预约ID private String stockListId; //库存品ID 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 582d01be5..706a4ec39 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 @@ -19,8 +19,10 @@ package com.logpm.distribution.vo; import com.logpm.distribution.entity.DistributionDeliveryChargeEntity; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.List; @@ -33,6 +35,8 @@ import java.util.List; */ @Data @EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity { private static final long serialVersionUID = 1L; diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpPackagePushLogEntity.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpPackagePushLogEntity.java index 320c47182..d78bf327f 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpPackagePushLogEntity.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpPackagePushLogEntity.java @@ -37,4 +37,7 @@ public class OpPackagePushLogEntity extends BaseEntity { @ApiModelProperty(name = "关联ID 根据push_type来决定关联的表",notes = "") private Long refId ; + @ApiModelProperty(name="欧派节点 入库 出库 收货") + private String pushOupaiNode; + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java index affb80396..adfd24771 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java @@ -1,12 +1,21 @@ package com.logpm.trunkline.dto; import com.logpm.trunkline.entity.TrunklineBillladingEntity; +import com.logpm.trunkline.vo.TrunklineBillladingLineVO; +import com.logpm.trunkline.vo.TrunklineBillladingWaybillVO; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + @Data public class BillladingDTO extends TrunklineBillladingEntity { private Integer pageNum; private Integer pageSize; + private List billladingLineList = new ArrayList<>(); + + private List billladingWaybillList = new ArrayList<>(); + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingEntity.java index 59111d0c7..013b3087f 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingEntity.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; +import java.math.BigDecimal; import java.util.Date; @Data @@ -62,28 +63,28 @@ public class TrunklineBillladingEntity extends TenantEntity { private String lineNameTitle ; /** 预计件数 */ @ApiModelProperty(name = "预计件数",notes = "") - private int planNum ; + private Integer planNum ; /** 预计重量 */ @ApiModelProperty(name = "预计重量",notes = "") - private Double planWeight ; + private BigDecimal planWeight ; /** 预计体积 */ @ApiModelProperty(name = "预计体积",notes = "") - private Double planVolume ; + private BigDecimal planVolume ; /** 实际件数 */ @ApiModelProperty(name = "实际件数",notes = "") private int realNum ; /** 实际重量 */ @ApiModelProperty(name = "实际重量",notes = "") - private Double realWeight ; + private BigDecimal realWeight ; /** 实际体积 */ @ApiModelProperty(name = "实际体积",notes = "") - private Double realVolume ; + private BigDecimal realVolume ; /** 计费模式 1按件 2按重量 3按体积 */ @ApiModelProperty(name = "计费模式 1按件 2按重量 3按体积",notes = "") private String chargeType ; /** 提货费用 */ @ApiModelProperty(name = "提货费用",notes = "") - private Double totalFee ; + private BigDecimal totalFee ; /** 提货单状态 1=未开始，2=提货中，3=已完成，4=已取消 */ @ApiModelProperty(name = "提货单状态 1=未开始，2=提货中，3=已完成，4=已取消",notes = "") private String billladingStatus ; @@ -102,11 +103,8 @@ public class TrunklineBillladingEntity extends TenantEntity { /** 结算人名称 */ @ApiModelProperty(name = "结算人名称",notes = "") private String settlementName ; - /** 备注 */ - @ApiModelProperty(name = "备注",notes = "") - private String remark ; - /** 创建用户名称 */ - @ApiModelProperty(name = "创建用户名称",notes = "") + /** 创建人名称 */ + @ApiModelProperty(name = "创建人名称",notes = "") private String createUserName ; } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingLineEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingLineEntity.java new file mode 100644 index 000000000..8c7490194 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingLineEntity.java @@ -0,0 +1,62 @@ +package com.logpm.trunkline.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("logpm_trunkline_billlading_line") +@ApiModel(value = "TrunklineBillladingLine对象", description = "干线提货线路表") +@EqualsAndHashCode(callSuper = true) +public class TrunklineBillladingLineEntity extends TenantEntity { + + /** 预留1 */ + @ApiModelProperty(name = "预留1",notes = "") + private String reserve1 ; + /** 预留2 */ + @ApiModelProperty(name = "预留2",notes = "") + private String reserve2 ; + /** 预留3 */ + @ApiModelProperty(name = "预留3",notes = "") + private String reserve3 ; + /** 预留4 */ + @ApiModelProperty(name = "预留4",notes = "") + private String reserve4 ; + /** 预留5 */ + @ApiModelProperty(name = "预留5",notes = "") + private String reserve5 ; + /** 仓库id */ + @ApiModelProperty(name = "仓库id",notes = "") + private Long warehouseId ; + /** 仓库名称 */ + @ApiModelProperty(name = "仓库名称",notes = "") + private String warehouseName ; + /** 提货单id */ + @ApiModelProperty(name = "提货单id",notes = "") + private Long billladingId ; + /** 提货单id */ + @ApiModelProperty(name = "客户id",notes = "") + private Long clientId ; + /** 客户名称 */ + @ApiModelProperty(name = "客户名称",notes = "") + private String clientName ; + /** 客户类型 1 工厂 2 商场 3装饰 4个人 */ + @ApiModelProperty(name = "客户类型 1 工厂 2 商场 3装饰 4个人",notes = "") + private String clientType ; + /** 联系人 */ + @ApiModelProperty(name = "联系人",notes = "") + private String linkMan ; + /** 联系电话 */ + @ApiModelProperty(name = "联系电话",notes = "") + private String linkPhone ; + /** 联系人地址 */ + @ApiModelProperty(name = "联系人地址",notes = "") + private String linkAddress ; + /** 排序 */ + @ApiModelProperty(name = "排序",notes = "") + private Integer sort ; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingLogEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingLogEntity.java new file mode 100644 index 000000000..4cfdf30ad --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingLogEntity.java @@ -0,0 +1,47 @@ +package com.logpm.trunkline.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("logpm_trunkline_billlading_log") +@ApiModel(value = "TrunklineBillladingLog对象", description = "干线提货单日志表") +@EqualsAndHashCode(callSuper = true) +public class TrunklineBillladingLogEntity extends TenantEntity { + + /** 预留1 */ + @ApiModelProperty(name = "预留1",notes = "") + private String reserve1 ; + /** 预留2 */ + @ApiModelProperty(name = "预留2",notes = "") + private String reserve2 ; + /** 预留3 */ + @ApiModelProperty(name = "预留3",notes = "") + private String reserve3 ; + /** 预留4 */ + @ApiModelProperty(name = "预留4",notes = "") + private String reserve4 ; + /** 预留5 */ + @ApiModelProperty(name = "预留5",notes = "") + private String reserve5 ; + /** 仓库id */ + @ApiModelProperty(name = "仓库id",notes = "") + private Long warehouseId ; + /** 仓库名称 */ + @ApiModelProperty(name = "仓库名称",notes = "") + private String warehouseName ; + /** 创建人名称 */ + @ApiModelProperty(name = "创建人名称",notes = "") + private String createUserName ; + /** 描述内容 */ + @ApiModelProperty(name = "描述内容",notes = "") + private String content ; + /** 提货单id */ + @ApiModelProperty(name = "提货单id",notes = "") + private Long billladingId ; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingPackageEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingPackageEntity.java index 342ffba59..fdb0bfc92 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingPackageEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingPackageEntity.java @@ -37,5 +37,8 @@ public class TrunklineBillladingPackageEntity extends TenantEntity { /** 包件码 */ @ApiModelProperty(name = "包件码",notes = "") private String orderPackageCode ; + /** 提货单id */ + @ApiModelProperty(name = "提货单id",notes = "") + private Long billladingId ; } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingWaybillEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingWaybillEntity.java index 36b631c8e..4e376567d 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingWaybillEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingWaybillEntity.java @@ -15,9 +15,6 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = true) public class TrunklineBillladingWaybillEntity extends TenantEntity { - /** 预留1 */ - @ApiModelProperty(name = "预留1",notes = "") - private String reserve1 ; /** 预留2 */ @ApiModelProperty(name = "预留2",notes = "") private String reserve2 ; @@ -33,6 +30,9 @@ public class TrunklineBillladingWaybillEntity extends TenantEntity { /** 仓库id */ @ApiModelProperty(name = "仓库id",notes = "") private Long warehouseId ; + /** 仓库名称 */ + @ApiModelProperty(name = "仓库名称",notes = "") + private Long warehouseName ; /** 提货单id */ @ApiModelProperty(name = "提货单id",notes = "") private Long billladingId ; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingLineVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingLineVO.java new file mode 100644 index 000000000..12037ef07 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingLineVO.java @@ -0,0 +1,13 @@ +package com.logpm.trunkline.vo; + +import com.logpm.trunkline.entity.TrunklineBillladingLineEntity; +import lombok.Data; + +@Data +public class TrunklineBillladingLineVO extends TrunklineBillladingLineEntity { + + + + + +} diff --git a/blade-service-api/logpm-warehouse-api/pom.xml b/blade-service-api/logpm-warehouse-api/pom.xml index 9b94b0828..aef29d830 100644 --- a/blade-service-api/logpm-warehouse-api/pom.xml +++ b/blade-service-api/logpm-warehouse-api/pom.xml @@ -10,6 +10,10 @@ 3.2.0.RELEASE compile + + org.projectlombok + lombok + diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java index 2669c6ad3..798fcaac4 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java @@ -16,6 +16,7 @@ */ package com.logpm.warehouse.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -23,6 +24,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; +import java.util.List; + /** * 盘点明细 实体类 * @@ -120,6 +123,13 @@ public class QuestDetailEntity extends TenantEntity { */ @ApiModelProperty(value = "在库数量") private Integer stockNum; + + + /** + * 商场名称 + */ + @TableField(exist = false) + private List marketNames; /** * 仓库id */ @@ -146,12 +156,12 @@ public class QuestDetailEntity extends TenantEntity { * 托盘id */ @ApiModelProperty(value = "托盘id") - private Long trayId; + private String trayId; /** * 货位id */ @ApiModelProperty(value = "货位id") - private Long allocationId; + private String allocationId; /** * 是否是新增数据 diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionRecordEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionRecordEntity.java index 75751929e..a065a9403 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionRecordEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionRecordEntity.java @@ -138,4 +138,36 @@ public class WarehouseRetentionRecordEntity extends TenantEntity { @ApiModelProperty(value = "取消滞留备注") private String cancelRemark; + /** + * 任务Id + */ + @ApiModelProperty(value = "任务Id") + private Long taskId; + + /** + * 滞留数量 + */ + @ApiModelProperty(value = "滞留数量") + private Integer retentionQuantity; + + /** + * 滞留任务创建人 + */ + @ApiModelProperty(value = "滞留任务创建人") + private Long retentionCreateUserId; + + /** + * 滞留任务创建人 + */ + @ApiModelProperty(value = "滞留任务创建人") + private String retentionCreateUserName; + + /** + * 滞留备注 + */ + @ApiModelProperty(value = "滞留备注") + private String retentionRemarks; + + + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionScanEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionScanEntity.java index 9482f7773..6fafd5599 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionScanEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseRetentionScanEntity.java @@ -38,7 +38,7 @@ import java.io.Serializable; @Data @TableName("logpm_warehouse_retention_scan") @ApiModel(value = "WarehouseRetentionRecord对象", description = "滞留扫描记录") -public class WarehouseRetentionScanEntity extends TenantEntity implements Serializable { +public class WarehouseRetentionScanEntity extends TenantEntity { private static final long serialVersionUID = 1L; /** @@ -158,7 +158,7 @@ public class WarehouseRetentionScanEntity extends TenantEntity implements Serial * 滞留扫描操作人Id */ @ApiModelProperty(value = "滞留扫描操作人Id") - private String retentionScanUserId; + private Long retentionScanUserId; /** * 滞留操作备注 */ @@ -178,6 +178,12 @@ public class WarehouseRetentionScanEntity extends TenantEntity implements Serial * 配送任务ID */ @ApiModelProperty(value = "配送任务ID") - private Long deliveryListId; + private Long deliveryId; + + /** + * 配送任务ID + */ + @ApiModelProperty(value = "配送任务ID") + private Long refId; } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseRetentionScanClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseRetentionScanClient.java index 17bf7aca0..11fc23016 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseRetentionScanClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseRetentionScanClient.java @@ -19,8 +19,11 @@ package com.logpm.warehouse.feign; import com.logpm.warehouse.entity.WarehouseRetentionScanEntity; import org.springblade.core.mp.support.BladePage; import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity; +import org.springblade.core.tool.api.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; /** @@ -47,4 +50,12 @@ public interface IWarehouseRetentionScanClient { @GetMapping(TOP) BladePage retentionScanTop(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + + /** + * 保存扫描记录 + * @return BladePage + */ + @PostMapping(TOP+"/saveRetentionScan") + R saveRetentionScan(@RequestBody WarehouseRetentionScanEntity warehouseRetentionScanEntity); + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java index cfdacfe7a..4ce6d89a5 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java @@ -52,4 +52,10 @@ public interface IWarehouseUpdownTypeClient { @PostMapping(TOP + "/packageChangeStock") boolean packageChangeStock(@RequestBody List orderPackageCodes); + + @GetMapping(TOP + "/downPackageOrDelTray") + R downPackageOrDelTray(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId); + + + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseRetentionRecordVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseRetentionRecordVO.java index d2da6d1a2..b18f4ac00 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseRetentionRecordVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseRetentionRecordVO.java @@ -20,6 +20,8 @@ import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 滞留记录 视图实体类 * @@ -31,4 +33,9 @@ import lombok.EqualsAndHashCode; public class WarehouseRetentionRecordVO extends WarehouseRetentionRecordEntity { private static final long serialVersionUID = 1L; + + private List retentionScanVOList; + + private String retentionTypeName; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index b4647e291..b8975fa25 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -144,7 +144,6 @@ public class BasicdataDriverArteryController extends BladeController { if(list.size() > 0){ return R.fail("绑定的用户已存在！不要重复绑定！！！"); } - String phone = basicdataDriverArtery.getPhone(); R userR = userClient .userInfoByPhone(AuthUtil.getUser().getTenantId(), phone); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java index dfa8f2ad6..c20d741df 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java @@ -289,15 +289,12 @@ public class BasicdataWarehouseController extends BladeController { @GetMapping("/getMyWarehouseList") @ApiOperationSupport(order = 3) public R> getMyWarehouseList() { - BladeUser user = AuthUtil.getUser(); List basicdataGoodsShelfVOList = CacheUtil.get(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(), user.getUserId(),List.class); - if(ObjectUtils.isNull(basicdataGoodsShelfVOList)){ basicdataGoodsShelfVOList = warehouseService.getMyWarehouseList(); CacheUtil.put(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(),user.getUserId(),basicdataGoodsShelfVOList); } - return R.data(basicdataGoodsShelfVOList); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java index f2397a0df..c5bce739d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java @@ -269,6 +269,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl data, Boolean isCovered) { log.info("客户导入数据"); List storeContactEntities = new ArrayList<>(); // 联系人 @@ -418,6 +419,9 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl getDriverList() { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); if (Func.isEmpty(myCurrentWarehouse)){ - log.error("################无当前登录人仓库信息:{}",myCurrentWarehouse); + log.error("################getDriverList 无当前登录人仓库信息:{}",myCurrentWarehouse); return null; } + log.info("################ getDriverList 仓库信息:{}",myCurrentWarehouse); ArrayList basicdataDriverArteryVOS = new ArrayList<>(); List list = this.list(); - if (Func.isNotEmpty(list)){ - list.forEach(l->{ + log.info("################getDriverList list:{}",list); + //Stream basicdataDriverArteryEntityStream = list.stream().filter(l -> l.getWarehouseId().contains(myCurrentWarehouse.getId().toString())); + Stream basicdataDriverArteryEntityStream = list.stream().filter(l -> Func.isNotEmpty(l.getWarehouseId()) && l.getWarehouseId().contains(myCurrentWarehouse.getId().toString())); + if (Func.isNotEmpty(basicdataDriverArteryEntityStream)){ + basicdataDriverArteryEntityStream.forEach(l->{ BasicdataDriverArteryVO driverArteryVO = Func.copy(l, BasicdataDriverArteryVO.class); List vehicleIds = basicdataDrivermiddleService.list(Wrappers.query().lambda() .eq(BasicdataDrivermiddleEntity::getDriverId, l.getId())).stream().filter(f -> Func.isNotEmpty(f.getBrandId())).map(BasicdataDrivermiddleEntity::getBrandId).collect(Collectors.toList()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java index fbccbe226..86d98ec88 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java @@ -5,9 +5,11 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.bean.Resp; import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; +import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.service.IDistributionDeliveryInfoService; import com.logpm.distribution.service.IDistributionDeliveryListService; import com.logpm.distribution.vo.DisStockListDetailVO; +import com.logpm.distribution.vo.DistributionParcelListVO; import com.logpm.distribution.vo.app.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -267,4 +269,37 @@ public class DistributionDeliveryAppController { } + + /** + * 扫描查询配送任务下的包件信息 + */ + @PostMapping("/retentionScan") + @ApiOperationSupport(order = 11) + public R retentionScan(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { + R r = distributionDeliveryListService.retentionScan(distrilbutionloadingscanDTO); + return r; + } + + + /** + * 扫描查询配送任务下的包件信息 + */ + @PostMapping("/getZeroPackageInfo") + @ApiOperationSupport(order = 11) + public R getZeroPackageInfo(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { + R distributionParcelListVOS = distributionDeliveryListService.getZeroPackageInfo(distrilbutionloadingscanDTO); + return R.data(distributionParcelListVOS); + } + + + /** + * 扫描查询配送任务下的包件信息 + */ + @PostMapping("/getInventoryInfo") + @ApiOperationSupport(order = 11) + public R getInventoryInfo(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { + R r = distributionDeliveryListService.getInventoryInfo(distrilbutionloadingscanDTO); + return R.data(r); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index 78ac5f949..19982e1cf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -162,7 +162,7 @@ public class DistributionSignforAppController { @PostMapping("/positioning") @ApiOperationSupport(order = 2) public Resp positioning(@Valid @RequestBody DistributionSignforEntity distributionSignfor) { - Resp msg = distributionSignforService.positioning(distributionSignfor); + Resp msg = distributionSignforService.positioning(distributionSignfor); return msg; } 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 f48758d45..ee943a5ee 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 @@ -609,7 +609,10 @@ public class DistributionStockupAppController extends BladeController { } entity.setConditions("0"); entity.setType(2); + entity.setOutboundType(distributionStockupEntity.getTypeService()); distributionStockService.save(entity); + //修改订单备货状态 + distributionAsyncService.updateStockArticleStock(one.getStockArticleId()); // dataSourceTransactionManager.commit(transactionStatus);//提交 Map map = new HashMap<>(); 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 5a7b18122..f008f3534 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 @@ -244,12 +244,7 @@ public class DistributionDeliveryListController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionDeliveryList") public void exportDistributionDeliveryList(@ApiIgnore @RequestParam Map distributionDeliveryList, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionDeliveryList, DistributionDeliveryListEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionDeliveryList::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionDeliveryListEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionDeliveryListService.exportDistributionDeliveryList(queryWrapper); + List list = distributionDeliveryListService.exportDistributionDeliveryList(distributionDeliveryList); ExcelUtil.export(response, "配送管理数据" + DateUtil.time(), "配送管理数据表", list, DistributionDeliveryListExcel.class); } 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 7ca33b4aa..dffa4350b 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 @@ -163,10 +163,10 @@ public class DistributionParcelListController extends BladeController { /** * 修改零担在库数量 */ - @GetMapping("/zeroUpdateMaterial") + @PutMapping("/zeroUpdateMaterial") @ApiOperationSupport(order = 2) @ApiOperation(value = "修改零担在库数量", notes = "传入distributionParcelList") - public R> getZeroUpdateMaterial(@ApiIgnore @RequestParam Map distributionParcelList, Query query) { + public R> getZeroUpdateMaterial(@RequestBody Map distributionParcelList, Query query) { int a = distributionParcelListService.getZeroUpdateMaterial(distributionParcelList); return a > 0 ? R.success("修改成功！") : R.fail("修改失败！"); } @@ -246,15 +246,10 @@ public class DistributionParcelListController extends BladeController { */ @GetMapping("/export-distributionParcelList") @ApiOperationSupport(order = 9) - @ApiOperation(value = "导出数据", notes = "传入distributionParcelList") - public void exportDistributionParcelList(@ApiIgnore @RequestParam Map distributionParcelList, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionParcelList, DistributionParcelListEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionParcelList::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionParcelListEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionParcelListService.exportDistributionParcelList(queryWrapper); - ExcelUtil.export(response, "在库订单包件清单数据" + DateUtil.time(), "在库订单包件清单数据表", list, DistributionParcelListExcel.class); + @ApiOperation(value = "导出包件明细数据", notes = "传入paramMap") + public void exportDistributionParcelList(@ApiIgnore @RequestParam Map paramMap, BladeUser bladeUser, HttpServletResponse response) { + List list = distributionParcelListService.exportDistributionParcelList(paramMap); + ExcelUtil.export(response, "包件明细数据" + DateUtil.time(), "包件明细表", list, DistributionParcelListExcel.class); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index 837dae2b5..4b4578a50 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -183,12 +183,8 @@ public class DistributionReservationController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distrbutionReservation") public void exportDistrbutionReservation(@ApiIgnore @RequestParam Map distrbutionReservation, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distrbutionReservation, DistributionReservationEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistrbutionReservation::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionReservationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = reservationService.exportDistrbutionReservation(queryWrapper); + + List list = reservationService.exportDistrbutionReservation(distrbutionReservation); ExcelUtil.export(response, "预约列表数据" + DateUtil.time(), "预约列表数据表", list, DistributionReservationExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationPackageController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationPackageController.java index f8fa8f3d5..6203ea4b1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationPackageController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationPackageController.java @@ -138,12 +138,8 @@ public class DistributionReservationPackageController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionReservationPackage") public void exportDistributionReservationPackage(@ApiIgnore @RequestParam Map distributionReservationPackage, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionReservationPackage, DistributionReservationPackageEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionReservationPackage::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionReservationPackageEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionReservationPackageService.exportDistributionReservationPackage(queryWrapper); + + List list = distributionReservationPackageService.exportDistributionReservationPackage(distributionReservationPackage); ExcelUtil.export(response, "预约包件中间表数据" + DateUtil.time(), "预约包件中间表数据表", list, DistributionReservationPackageExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java index 7bf8de2d1..33a267d71 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java @@ -149,12 +149,8 @@ public class DistributionReservationStockarticleController extends BladeControll @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionReservationStockarticle") public void exportDistributionReservationStockarticle(@ApiIgnore @RequestParam Map distributionReservationStockarticle, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionReservationStockarticle, DistributionReservationStockarticleEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionReservationStockarticle::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionReservationStockarticleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionReservationStockarticleService.exportDistributionReservationStockarticle(queryWrapper); + + List list = distributionReservationStockarticleService.exportDistributionReservationStockarticle(distributionReservationStockarticle); ExcelUtil.export(response, "预约订单中间表数据" + DateUtil.time(), "预约订单中间表数据表", list, DistributionReservationStockarticleExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStocklistController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStocklistController.java index d5ad4f371..da738f005 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStocklistController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStocklistController.java @@ -138,12 +138,8 @@ public class DistributionReservationStocklistController extends BladeController @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionReservationStocklist") public void exportDistributionReservationStocklist(@ApiIgnore @RequestParam Map distributionReservationStocklist, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionReservationStocklist, DistributionReservationStocklistEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionReservationStocklist::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionReservationStocklistEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionReservationStocklistService.exportDistributionReservationStocklist(queryWrapper); + + List list = distributionReservationStocklistService.exportDistributionReservationStocklist(distributionReservationStocklist); ExcelUtil.export(response, "预约库存中间表数据" + DateUtil.time(), "预约库存中间表数据表", list, DistributionReservationStocklistExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java index dee0aed5c..b29b19fc5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java @@ -16,7 +16,6 @@ */ package com.logpm.distribution.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.dto.DistributionDeliveryInfoDTO; @@ -41,7 +40,6 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; @@ -186,12 +184,13 @@ public class DistributionSigndetailController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionSigndetail") public void exportDistributionSigndetail(@ApiIgnore @RequestParam Map distributionSigndetail, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionSigndetail, DistributionSigndetailEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionSigndetail::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionSigndetailEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionSigndetailService.exportDistributionSigndetail(queryWrapper); +// QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionSigndetail, DistributionSigndetailEntity.class); +// //if (!AuthUtil.isAdministrator()) { +// // queryWrapper.lambda().eq(DistributionSigndetail::getTenantId, bladeUser.getTenantId()); +// //} +// queryWrapper.lambda().eq(DistributionSigndetailEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + + List list = distributionSigndetailService.exportDistributionSigndetail(distributionSigndetail); ExcelUtil.export(response, "签收明细数据" + DateUtil.time(), "签收明细数据表", list, DistributionSigndetailExcel.class); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index 33ca15b5d..d2e30dae8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -21,19 +21,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.dto.DistributionAddvalueDTO; -import com.logpm.distribution.dto.DistributionReservationStocklistDTO; import com.logpm.distribution.dto.DistributionSignforDTO; +import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO; import com.logpm.distribution.entity.DistributionSignPrintEntity; import com.logpm.distribution.entity.DistributionSignforEntity; import com.logpm.distribution.excel.DistributionSignforExcel; +import com.logpm.distribution.excel.DistributionSignforOwnExcel; import com.logpm.distribution.service.IDistributionReservationService; import com.logpm.distribution.service.IDistributionSignforService; +import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl; import com.logpm.distribution.vo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import org.springblade.common.utils.GaoDeApiUtil; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; @@ -42,7 +45,6 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; @@ -74,6 +76,9 @@ public class DistributionSignforController extends BladeController { private final IDistributionReservationService reservationService; + private final DistributionAddvalueServiceImpl distributionAddvalueService; + + /** * 签收管理 详情 */ @@ -255,13 +260,10 @@ public class DistributionSignforController extends BladeController { @PostMapping("/update") @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入distributionSignfor") - public R update(@Valid @RequestBody DistributionSignforEntity distributionSignfor) { - distributionSignfor.setSigneeId(AuthUtil.getUser().getUserId()); - distributionSignfor.setSigneeName(AuthUtil.getUser().getUserName()); - Date date = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - distributionSignfor.setSigningTime(sdf.format(date)); - return R.status(distributionSignforService.updateById(distributionSignfor)); + public R update(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { + R r = distributionSignforService.updateSign(distributionSignfor); +// return R.status(distributionSignforService.updateById(distributionSignfor)); + return r; } /** @@ -286,19 +288,25 @@ public class DistributionSignforController extends BladeController { /** - * 导出数据 + * 待 导出数据 */ @GetMapping("/export-distributionSignfor") @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入distributionSignfor") public void exportDistributionSignfor(@ApiIgnore @RequestParam Map distributionSignfor, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionSignfor, DistributionSignforEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionSignfor::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionSignforEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionSignforService.exportDistributionSignfor(queryWrapper); - ExcelUtil.export(response, "签收管理数据" + DateUtil.time(), "签收管理数据表", list, DistributionSignforExcel.class); + + List list = distributionSignforService.exportDistributionSignfor(distributionSignfor); + ExcelUtil.export(response, "签收管理数据" + DateUtil.time(), "待签收管理数据表", list, DistributionSignforExcel.class); + } + /** + * 已 导出数据 + */ + @GetMapping("/export-distributionSignforOwn") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入distributionSignfor") + public void exportDistributionSignforOwn(@ApiIgnore @RequestParam Map distributionSignfor, BladeUser bladeUser, HttpServletResponse response) { + List list = distributionSignforService.exportDistributionSignforOwn(distributionSignfor); + ExcelUtil.export(response, "签收管理数据" + DateUtil.time(), "已签收管理数据表", list, DistributionSignforOwnExcel.class); } @@ -314,4 +322,69 @@ public class DistributionSignforController extends BladeController { } + + /** + * 签收管理进行增值服务操作 + */ + @GetMapping("/checkAddValuePackageList") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "PC查看增值服务列表", notes = "传入ids") + public IPage checkAddValuePackageList(@RequestParam Map addValueDTO, Query query) { + return distributionSignforService.checkAddValuePackageList(Condition.getPage(query),addValueDTO); + } + + + /** + * 签收管理进行增值服务操作 + */ + @PostMapping("/saveSignAddValuePackage") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "PC查看增值服务列表", notes = "传入ids") + public R checkAddValuePackageList(@RequestBody DistributionAppAddvalueDTO distributionAppAddvalueDTO) { + return distributionAddvalueService.saveAddvalueInfo(distributionAppAddvalueDTO); + } + + /** + * 签收管理进行增值服务操作 + */ + @PostMapping("/updateSignAddValuePackage") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "PC查看增值服务列表", notes = "传入ids") + public R updateSignAddValuePackage(@RequestBody DistributionAppAddvalueDTO distributionAppAddvalueDTO) { + return distributionAddvalueService.updatePCAddvalueInfo(distributionAppAddvalueDTO); + } + + /** + * 签收管理进行增值服务操作 + */ + @PostMapping("/cancelSignAddValuePackage") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "PC查看增值服务列表", notes = "传入ids") + public R cancelSignAddValuePackage(@RequestBody DistributionAppAddvalueDTO distributionAppAddvalueDTO) { + return distributionAddvalueService.cancelSignAddValuePackage(distributionAppAddvalueDTO); + } + + + + + + + + + +// /** +// * 签收管理 修改签收照片信息 +// */ +// @PutMapping("/updatePCPicture") +// @ApiOperationSupport(order = 4) +// @ApiOperation(value = "修改签收照片信息", notes = "修改签收照片信息") +// public R updatePCPicture(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { +// if(ObjectUtil.isNotEmpty(distributionSignfor.getReservationId())){ +// return R.data(distributionSignforService.updatePicture(distributionSignfor)); +// }else { +// return R.fail(3002,"参数不能为空不对！！"); +// } +// } + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 643eb04bf..96c3f11f9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -16,7 +16,6 @@ */ package com.logpm.distribution.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; @@ -42,7 +41,6 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.system.feign.IDictBizClient; @@ -100,6 +98,7 @@ public class DistributionStockArticleController extends BladeController { IPage pages = distributionStockArticleService.pageListOwe(Condition.getPage(query), distributionStockArticle); return R.data(DistributionStockArticleWrapper.build().pageVO(pages)); } + /** * 配送在库订单 分页 */ @@ -346,11 +345,11 @@ public class DistributionStockArticleController extends BladeController { */ @GetMapping("/export-distributionStockArticle") @ApiOperationSupport(order = 9) - @ApiOperation(value = "导出数据", notes = "传入distributionStockArticle") - public void exportDistributionStockArticle(@ApiIgnore @RequestParam Map distributionStockArticle, BladeUser bladeUser, HttpServletResponse response) { + @ApiOperation(value = "导出已签订单数据", notes = "传入distributionStockArticle") + public void exportDistributionStockArticle(@ApiIgnore @RequestParam Map paramMap, BladeUser bladeUser, HttpServletResponse response) { - List list = distributionStockArticleService.exportDistributionStockArticle(distributionStockArticle); - ExcelUtil.export(response, "配送在库订单数据" + DateUtil.time(), "配送在库订单数据表", list, DistributionStockArticleExcel.class); + List list = distributionStockArticleService.exportDistributionStockArticle(paramMap); + ExcelUtil.export(response, "已签订单数据" + DateUtil.time(), "已签订单数据数据表", list, DistributionStockArticleExcel.class); } // /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java index 3cfa123b5..b802748ca 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java @@ -25,6 +25,7 @@ import com.logpm.distribution.entity.DistributionStockEntity; import com.logpm.distribution.excel.DistributionStockExcel; import com.logpm.distribution.service.IDistributionStockService; import com.logpm.distribution.vo.DistributionStockVO; +import com.logpm.distribution.wrapper.DistributionStockWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -76,9 +77,9 @@ public class DistributionStockController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStock") - public R> list(@ApiIgnore @RequestParam Map distributionStock, Query query) { + public R> list(@ApiIgnore @RequestParam Map distributionStock, Query query) { IPage pages = distributionStockService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStock, DistributionStockEntity.class)); - return R.data(pages); + return R.data(DistributionStockWrapper.build().pageVO(pages)); } /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java index eac5e43d1..0d1c0868c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java @@ -16,13 +16,13 @@ */ package com.logpm.distribution.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.entity.DistributionStockupEntity; -import com.logpm.distribution.excel.DistributionStockupExcel; +import com.logpm.distribution.excel.DistributionCityExcel; +import com.logpm.distribution.excel.DistributionMarketExcel; +import com.logpm.distribution.excel.DistributionSelfExcel; import com.logpm.distribution.service.IDistributionStockupService; import com.logpm.distribution.service.IDistrilbutionBillLadingService; import com.logpm.distribution.vo.DistributionStockupVO; @@ -32,15 +32,15 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; -import org.springblade.common.constant.DictBizConstant; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; @@ -63,6 +63,7 @@ import java.util.Map; @AllArgsConstructor @RequestMapping("/distributionStockup") @Api(value = "备货信息表", tags = "备货信息表接口") +@Slf4j public class DistributionStockupController extends BladeController { private final IDistributionStockupService distributionStockupService; @@ -167,6 +168,34 @@ public class DistributionStockupController extends BladeController { IPage pages = distributionStockupService.pageList(Condition.getPage(query),distributionStockup); return R.data(DistributionStockupWrapper.build().pageVO(pages)); } + + /** + * 导出数据 + */ + @GetMapping("/export-StockUp") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出备货数据", notes = "传入paramMap") + public void exportMarket(@ApiIgnore @RequestParam Map paramMap, HttpServletResponse response) { + Object typeService = paramMap.get("typeService"); + if (Func.isEmpty(paramMap.get("typeService"))){ + throw new ServiceException("导出备货数据失败!!!"); + } + switch (typeService.toString()){ + case "1": + List listMarket = distributionStockupService.exportMarket(paramMap); + ExcelUtil.export(response, "商配备货数据" + DateUtil.time(), "商配备货数据表", listMarket, DistributionMarketExcel.class); + break; + case "2": + List listCity = distributionStockupService.exportCity(paramMap); + ExcelUtil.export(response, "市配备货数据" + DateUtil.time(), "市配备货数据表", listCity, DistributionCityExcel.class); + break; + case "3": + List listSelf = distributionStockupService.exportSelf(paramMap); + ExcelUtil.export(response, "自提备货数据" + DateUtil.time(), "自提备货数据表", listSelf, DistributionSelfExcel.class); + break; + } + } + /** * 备货信息表 查询备货人员信息 */ @@ -247,22 +276,6 @@ public class DistributionStockupController extends BladeController { } - /** - * 导出数据 - */ - @GetMapping("/export-distributionStockup") - @ApiOperationSupport(order = 9) - @ApiOperation(value = "导出数据", notes = "传入distributionStockup") - public void exportDistributionStockup(@ApiIgnore @RequestParam Map distributionStockup, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockup, DistributionStockupEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DistributionStockup::getTenantId, bladeUser.getTenantId()); - //} - queryWrapper.lambda().eq(DistributionStockupEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = distributionStockupService.exportDistributionStockup(queryWrapper); - ExcelUtil.export(response, "备货信息表数据" + DateUtil.time(), "备货信息表数据表", list, DistributionStockupExcel.class); - } - /** * 根基备货任务查询备货任务关联的自提任务 */ 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 085cc6262..af2b31c57 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 @@ -20,9 +20,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.logpm.distribution.dto.DistrilbutionBillLadingDTO; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; +import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.excel.DistrilbutionBillLadingExcel; import com.logpm.distribution.service.IDistrilbutionBillLadingService; import com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO; @@ -33,7 +33,7 @@ import com.logpm.distribution.wrapper.DistrilbutionBillLadingWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import kotlin.Suppress; +//import kotlin.Suppress; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; @@ -152,6 +152,18 @@ public class DistrilbutionBillLadingController extends BladeController { return R.data(pages); } + /** + * 导出数据 + */ + @GetMapping("/export-distributionBillLadingVO") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出提货数据", notes = "传入-distributionBillLading") + public void exportDistributionBillLading(@ApiIgnore @RequestParam Map distributionBillLading, HttpServletResponse response) { + + List list = distrilbutionBillLadingService.exportDistributionBillLading(distributionBillLading); + ExcelUtil.export(response, "提货数据" + DateUtil.time(), "提货数据表", list, DistrilbutionBillLadingExcel.class); + } + /** * 提货单 自定义分页 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvalueDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvalueDTO.java index bd7fb5f92..f2da040e6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvalueDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvalueDTO.java @@ -36,4 +36,6 @@ public class DistributionAddvalueDTO extends DistributionAddvalueEntity { */ private Long signforId; + private Long reservationId; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvaluePackageDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvaluePackageDTO.java index f5cd58897..83065d154 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvaluePackageDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvaluePackageDTO.java @@ -33,4 +33,6 @@ public class DistributionAddvaluePackageDTO extends DistributionAddvaluePackageE private Integer zeroQuantity; + private Integer maxQuantity; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java index 5e5dd0359..286041c9a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java @@ -20,6 +20,8 @@ import com.logpm.distribution.entity.DistributionReservationPackageEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** * 预约包件中间表 数据传输对象实体类 * @@ -30,5 +32,20 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class DistributionReservationPackageDTO extends DistributionReservationPackageEntity { private static final long serialVersionUID = 1L; - + private Long warehouseId; + private String waybillNumber; + private String serviceNumber; + private String orderCode; + private String warehouseName; + private String orderPackageCode; + private String sendWarehouseName; + private String acceptWarehouseName; + private Date reservationDate; + private String trainNumber; + private String firsts; + private String second; + private String thirdProduct; + private String materialName; + private String trayCode; + private String positionCode; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStockarticleDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStockarticleDTO.java index 215c246d4..1222ed8e0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStockarticleDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStockarticleDTO.java @@ -31,4 +31,14 @@ import lombok.EqualsAndHashCode; public class DistributionReservationStockarticleDTO extends DistributionReservationStockarticleEntity { private static final long serialVersionUID = 1L; + private String waybillNumber; + private String orderCode; + private String mallName; + private String storeName; + private String descriptionGoods; + private String brand; + private String consigneeUnit; + private String resource; + private String deliveryType; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStocklistDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStocklistDTO.java index bb1ef3b67..e2326c0ac 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStocklistDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationStocklistDTO.java @@ -30,5 +30,16 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class DistributionReservationStocklistDTO extends DistributionReservationStocklistEntity { private static final long serialVersionUID = 1L; + private String incomingBatch; + private String orderCode; + private String sku; + private String marketName; + private String cargoNumber; + private String cargoUnit; + private String descriptionGoods; + private String brandName; + private String trayCode; + private String positionCode; + private String stockupArea; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionRetentionScanDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionRetentionScanDTO.java new file mode 100644 index 000000000..53be07ca2 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionRetentionScanDTO.java @@ -0,0 +1,71 @@ +package com.logpm.distribution.dto; + + +import lombok.Data; + +/** + * 滞留扫描对象 + */ +@Data +//@EqualsAndHashCode(callSuper = true) +public class DistributionRetentionScanDTO { + + /** + * 预约Id + */ + private Long reservationId; + + /** + * 预约Id + */ + private String reservationCode; + + /** + * 订单Id + */ + private Long orderId; + + /** + * 订单自编码 + */ + private Long orderCode; + + /** + * 订单Id + */ + private Long inventoryId; + + + + /** + * 物料编码 + */ + private String materialNumber; + + /** + * 物料名称 + */ + private String materialName; + + /** + * 包件ID + */ + private Long orderPackageId; + + /** + * 包条码 + */ + private Long orderPackageCode; + + /** + * 滞留数量 + */ + private Long retentionQuantity; + + /** + * 类型 + */ + private Integer conditions; + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java index 557ed25ad..8b56384a7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java @@ -21,6 +21,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 签收明细 数据传输对象实体类 * @@ -36,6 +38,12 @@ public class DistributionSigndetailDTO extends DistributionSigndetailEntity { */ @ApiModelProperty(value = "客户名称") private String consignee; + + /** + * 客户名称 + */ + @ApiModelProperty(value = "客户名称") + private List ids; /** * 客户Id */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistrilbutionloadingscanDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistrilbutionloadingscanDTO.java index da4d212ec..1ec1cb490 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistrilbutionloadingscanDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistrilbutionloadingscanDTO.java @@ -45,6 +45,12 @@ public class DistrilbutionloadingscanDTO { @ApiModelProperty(value = "预约Id") private Long orderId; + /** + * 订单自编码 + */ + @ApiModelProperty(value = "预约Id") + private String orderCode; + // /** // * 扫描类型 @@ -88,6 +94,13 @@ public class DistrilbutionloadingscanDTO { // @NotEmpty(message = "扫描物品不能为空") private Integer type; + /** + * 滞留扫描类型 + */ + @ApiModelProperty(value = "扫描物品(1-包条,2-订单,3-托盘)") +// @NotEmpty(message = "扫描物品不能为空") + private Integer retentionType; + /** * 是否库存品 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionCityExcel.java similarity index 59% rename from blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupExcel.java rename to blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionCityExcel.java index d09d2d099..4c5c06d9a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionCityExcel.java @@ -28,7 +28,7 @@ import java.util.Date; /** - * 备货信息表 Excel实体类 + * 市配备货 * * @author cyz * @since 2023-06-15 @@ -37,117 +37,53 @@ import java.util.Date; @ColumnWidth(25) @HeadRowHeight(20) @ContentRowHeight(18) -public class DistributionStockupExcel implements Serializable { +public class DistributionCityExcel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 租户号 - */ @ColumnWidth(20) - @ExcelProperty("租户号") - private Long tenantId; - /** - * 是否已删除 - */ - @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; - /** - * 备货时间 - */ + @ExcelProperty("备货编码") + private String stockupCode; + @ColumnWidth(20) @ExcelProperty("备货时间") private Date stockupDate; - /** - * 备货人 - */ + @ColumnWidth(20) - @ExcelProperty("备货人") - private String stockupUser; - /** - * 备货状态 - */ + @ExcelProperty("出库时间") + private Date outboundDate; + @ColumnWidth(20) @ExcelProperty("备货状态") private String stockupStatus; - /** - * 备货区 - */ + @ColumnWidth(20) @ExcelProperty("备货区") private String stockupArea; - /** - * 指派状态;1-未指派、2-已指派 - */ + @ColumnWidth(20) @ExcelProperty("指派状态;1-未指派、2-已指派") private String assignStatus; - /** - * 备货库位 - */ + @ColumnWidth(20) - @ExcelProperty("备货库位") + @ExcelProperty("所在库位") private String stockipAllocation; - /** - * 预留1 - */ - @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; - /** - * 预留2 - */ - @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; - /** - * 预留3 - */ - @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; - /** - * 预留4 - */ - @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; - /** - * 预留5 - */ - @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; - /** - * 备货区编号 - */ - @ColumnWidth(20) - @ExcelProperty("备货区编号") - private Long goodsAreaId; - /** - * 叉车司机 - */ + @ColumnWidth(20) - @ExcelProperty("叉车司机") + @ExcelProperty("备货人员") private Long forklift; - /** - * 装卸班组 - */ + @ColumnWidth(20) - @ExcelProperty("装卸班组") - private Long loader; - /** - * 确认完成备货时间 - */ + @ExcelProperty("所在托盘") + private String pallet; + @ColumnWidth(20) @ExcelProperty("确认完成备货时间") private Date fixTime; - /** - * 指派时间 - */ + @ColumnWidth(20) @ExcelProperty("指派时间") private Date assignTime; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java index 3f03bdb3f..8c7ee8cdc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java @@ -41,71 +41,37 @@ public class DistributionDeliveryListExcel implements Serializable { private static final long serialVersionUID = 1L; + /** - * 租户号 - */ - @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; - /** - * 是否已删除 - */ - @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; - /** - * 预留1 - */ - @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; - /** - * 预留2 - */ - @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; - /** - * 预留3 - */ - @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; - /** - * 预留4 - */ - @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; - /** - * 预留5 + * 车次 */ @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; + @ExcelProperty("车次") + private String trainNumber; /** * 车次 */ @ColumnWidth(20) - @ExcelProperty("车次") - private String trainNumber; + @ExcelProperty("配送日期") + private String taskTime; + /** * 仓库 */ @ColumnWidth(20) @ExcelProperty("仓库") - private String warehouse; + private String warehouseName; /** * 配送类型;1-自主配送,2-三方配送 */ @ColumnWidth(20) - @ExcelProperty("配送类型;1-自主配送,2-三方配送") + @ExcelProperty("配送类型") private String type; /** * 配送种类;1-市配,2-商配 */ @ColumnWidth(20) - @ExcelProperty("配送种类;1-市配,2-商配") + @ExcelProperty("配送种类") private String kind; /** * 配送车辆 @@ -123,13 +89,13 @@ public class DistributionDeliveryListExcel implements Serializable { * 配送公司;1-货拉拉,2-京东 */ @ColumnWidth(20) - @ExcelProperty("配送公司;1-货拉拉,2-京东") + @ExcelProperty("配送公司") private String distributionCompany; /** * 配送状态;1-配送中,2-已完成 */ @ColumnWidth(20) - @ExcelProperty("配送状态;1-配送中,2-已完成") + @ExcelProperty("配送状态") private String state; /** * 配送客户数 @@ -143,12 +109,12 @@ public class DistributionDeliveryListExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("配送价格") private BigDecimal price; - /** - * 增值服务表id - */ - @ColumnWidth(20) - @ExcelProperty("增值服务表id") - private Integer addedServicesId; +// /** +// * 增值服务表id +// */ +// @ColumnWidth(20) +// @ExcelProperty("增值服务表id") +// private Integer addedServicesId; /** * 订单总数 */ @@ -159,8 +125,14 @@ public class DistributionDeliveryListExcel implements Serializable { * 配送件数 */ @ColumnWidth(20) - @ExcelProperty("配送件数") + @ExcelProperty("配送包件数") private Integer deliveryNumber; + /** + * 配送件数 + */ + @ColumnWidth(20) + @ExcelProperty("配送库存品数") + private Integer inventoryNub; /** * 扫描件数 */ @@ -173,11 +145,11 @@ public class DistributionDeliveryListExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("装卸班组") private String loadingTeam; - /** - * 预约表id - */ - @ColumnWidth(20) - @ExcelProperty("预约表id") - private String reservationId; +// /** +// * 预约表id +// */ +// @ColumnWidth(20) +// @ExcelProperty("预约表id") +// private String reservationId; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java new file mode 100644 index 000000000..103c30973 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java @@ -0,0 +1,89 @@ +/* + * 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.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 商配备货 + * + * @author cyz + * @since 2023-06-15 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class DistributionMarketExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ColumnWidth(20) + @ExcelProperty("备货编码") + private String stockupCode; + + @ColumnWidth(20) + @ExcelProperty("备货时间") + private Date stockupDate; + + @ColumnWidth(20) + @ExcelProperty("出库时间") + private Date outboundDate; + + @ColumnWidth(20) + @ExcelProperty("备货状态") + private String stockupStatus; + + @ColumnWidth(20) + @ExcelProperty("备货区") + private String stockupArea; + + @ColumnWidth(20) + @ExcelProperty("指派状态;1-未指派、2-已指派") + private String assignStatus; + + @ColumnWidth(20) + @ExcelProperty("所在库位") + private String stockipAllocation; + + @ColumnWidth(20) + @ExcelProperty("备货人员") + private Long forklift; + + @ColumnWidth(20) + @ExcelProperty("所在托盘") + private String pallet; + + @ColumnWidth(20) + @ExcelProperty("确认完成备货时间") + private Date fixTime; + + @ColumnWidth(20) + @ExcelProperty("指派时间") + private Date assignTime; + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionParcelListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionParcelListExcel.java index cc15998c5..7f6d4ff42 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionParcelListExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionParcelListExcel.java @@ -40,119 +40,47 @@ public class DistributionParcelListExcel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 租户号 - */ - @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; - /** - * 是否已删除 - */ - @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; - /** - * 预留1 - */ - @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; - /** - * 预留2 - */ - @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; - /** - * 预留3 - */ - @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; - /** - * 预留4 - */ - @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; - /** - * 预留5 - */ - @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; - /** - * 仓库 - */ @ColumnWidth(20) @ExcelProperty("仓库") private String warehouse; - /** - * 状态 - */ - @ColumnWidth(20) - @ExcelProperty("状态") - private Integer conditions; - /** - * 包条码 - */ + @ColumnWidth(20) @ExcelProperty("包条码") - private String packetBarCode; - /** - * 货位信息 - */ + private String orderPackageCode; + @ColumnWidth(20) @ExcelProperty("货位信息") private String goodsAllocation; - /** - * 所在托盘 - */ + @ColumnWidth(20) @ExcelProperty("所在托盘") private String pallet; - /** - * 一级品 - */ + @ColumnWidth(20) @ExcelProperty("一级品") private String firsts; - /** - * 二级品 - */ + @ColumnWidth(20) @ExcelProperty("二级品") private String second; - /** - * 三级品 - */ + @ColumnWidth(20) @ExcelProperty("三级品") private String thirdProduct; - /** - * 物料 - */ + @ColumnWidth(20) - @ExcelProperty("物料") - private String material; - /** - * 数量 - */ + @ExcelProperty("上架状态") + private String orderPackageGroundingStatus; + @ColumnWidth(20) @ExcelProperty("数量") - private Integer quantity; - /** - * 车次号 - */ + private String quantity; + @ColumnWidth(20) @ExcelProperty("车次号") private String trainNumber; - /** - * 在库订单ID - */ - @ColumnWidth(20) - @ExcelProperty("在库订单ID") - private String stockArticleId; + @ColumnWidth(20) + @ExcelProperty("订单自编号") + private String orderCode; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationExcel.java index 813edddaa..94227f448 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationExcel.java @@ -42,24 +42,44 @@ public class DistributionReservationExcel implements Serializable { private static final long serialVersionUID = 1L; + + /** + * 订单自编号;订单自编号，关联订单表 + */ + @ColumnWidth(20) + @ExcelProperty("预约单编号") + private String reservationCode; + /** + * 订单自编号;订单自编号，关联订单表 + */ + @ColumnWidth(20) + @ExcelProperty("订单号") + private String orderCode; /** - * 租户号 + * 订单自编号;订单自编号，关联订单表 */ @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; + @ExcelProperty("服务号") + private String serviceNumber; /** - * 是否已删除 + * 订单自编号;订单自编号，关联订单表 */ @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; + @ExcelProperty("仓库") + private String warehouseName; /** * 订单自编号;订单自编号，关联订单表 */ @ColumnWidth(20) - @ExcelProperty("订单自编号;订单自编号，关联订单表") - private String orderId; + @ExcelProperty("商场") + private String mallName; + /** + * 订单自编号;订单自编号，关联订单表 + */ + @ColumnWidth(20) + @ExcelProperty("门店") + private String storeName; + /** * 收货人 */ @@ -78,18 +98,43 @@ public class DistributionReservationExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("预约时间") private Date reservationData; + /** + * 预约时间 + */ + @ColumnWidth(20) + @ExcelProperty("预约包件数") + private Integer reservationNumber; + /** + * 预约时间 + */ + @ColumnWidth(20) + @ExcelProperty("预约库存品数") + private Integer stockListNumber; + /** + * 预约时间 + */ + @ColumnWidth(20) + @ExcelProperty("待收货款") + private BigDecimal dueSincere; + + /** + * 预约时间 + */ + @ColumnWidth(20) + @ExcelProperty("时段") + private String periodTimeName; /** * 服务类型;预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货； */ @ColumnWidth(20) - @ExcelProperty("服务类型;预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；") - private String serveType; + @ExcelProperty("服务类型") + private String serveTypeName; /** * 配送方式;预约添加送货方式；1-送货(商配的唯一方式)、2-送货上楼、3-送装一体、4-装 */ @ColumnWidth(20) - @ExcelProperty("配送方式;预约添加送货方式；1-送货(商配的唯一方式)、2-送货上楼、3-送装一体、4-装") - private String deliveryType; + @ExcelProperty("配送方式") + private String deliveryTypeName; /** * 到付运费 */ @@ -107,66 +152,48 @@ public class DistributionReservationExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("代付运费") - private String replaceFee; + private BigDecimal replaceFee; /** * 收件人电话 */ @ColumnWidth(20) @ExcelProperty("收件人电话") private String deliveryPhone; +// /** +// * 预约信息状态;预约列表信息状态；1-待确认、2-已确认 +// */ +// @ColumnWidth(20) +// @ExcelProperty("预约信息状态;预约列表信息状态；1-待确认、2-已确认") +// private String resvervationStatus; /** * 预约信息状态;预约列表信息状态；1-待确认、2-已确认 */ @ColumnWidth(20) - @ExcelProperty("预约信息状态;预约列表信息状态；1-待确认、2-已确认") - private String resvervationStatus; - /** - * 订单来源 - */ - @ColumnWidth(20) - @ExcelProperty("订单来源") - private String orderSource; + @ExcelProperty("预约信息状态") + private String resvervationStatusName; +// /** +// * 订单来源 +// */ +// @ColumnWidth(20) +// @ExcelProperty("订单来源") +// private String orderSource; +// /** +// * 备货状态;备货状态；1-未备货、2-待备货、3-已备货 +// */ +// @ColumnWidth(20) +// @ExcelProperty("备货状态") +// private String stockupStatus; /** * 备货状态;备货状态；1-未备货、2-待备货、3-已备货 */ @ColumnWidth(20) - @ExcelProperty("备货状态;备货状态；1-未备货、2-待备货、3-已备货") - private String stockupStatus; - /** - * 备货区编号 - */ - @ColumnWidth(20) - @ExcelProperty("备货区编号") - private String goodsShelfId; - /** - * 预留1 - */ - @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; - /** - * 预留2 - */ - @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; - /** - * 预留3 - */ - @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; - /** - * 预留4 - */ - @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; - /** - * 预留5 - */ - @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; + @ExcelProperty("备货状态") + private String stockupStatusName; +// /** +// * 备货区编号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("备货区编号") +// private String goodsShelfId; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java index 0c7fbfecd..ebd7f0a0a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java @@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** @@ -40,65 +41,145 @@ public class DistributionReservationPackageExcel implements Serializable { private static final long serialVersionUID = 1L; + /** - * 租户号 + * 预约编号 */ @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; + @ExcelProperty("预约编号") + private String reservationCode; /** - * 是否已删除 + * 包件编号 */ @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; + @ExcelProperty("预约时间") + private Date reservationDate; + /** - * 预约编号 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预约编号") - private String reservationId; + @ExcelProperty("服务类型") + private String deliveryType; /** - * 包件编号 + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("收货人") + private String consignee; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("手机号码") + private String deliveryPhone; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("收货地址") + private String deliveryAddress; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("运单号") + private String waybillNumber; + /** + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("包件编号") - private String parceListId; + @ExcelProperty("服务号") + private String serviceNumber; /** - * 预留1 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; + @ExcelProperty("订单自编号") + private String orderCode; /** - * 预留2 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; + @ExcelProperty("仓库") + private String warehouseName; /** - * 预留3 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; + @ExcelProperty("包条码") + private String orderPackageCode; /** - * 预留4 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; + @ExcelProperty("发站仓") + private String sendWarehouseName; /** - * 预留5 + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("目的仓") + private String acceptWarehouseName; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("入库时间") + private String warehouseEntryTimeEnd; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("车次号") + private String trainNumber; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("一级品") + private Long firsts; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("二级品") + private Long second; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("三级品") + private Long thirdProduct; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("物料名称") + private Long materialName; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private Long quantity; +// /** +// * 订单编号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("计划数量") +// private Long stockArticle; + /** + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; + @ExcelProperty("货位数量") + private Long positionCode; /** * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("订单编号") - private Long stockArticle; + @ExcelProperty("所在托盘") + private Long trayCode; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStockarticleExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStockarticleExcel.java index c9a245fc3..c7b74d1b5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStockarticleExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStockarticleExcel.java @@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** @@ -40,65 +41,100 @@ public class DistributionReservationStockarticleExcel implements Serializable { private static final long serialVersionUID = 1L; + + /** + * 预约编号 + */ + @ColumnWidth(20) + @ExcelProperty("预约单号") + private String reservationCode; + /** + * 预约编号 + */ + @ColumnWidth(20) + @ExcelProperty("运单号") + private String waybillNumber; + /** + * 预约编号 + */ + @ColumnWidth(20) + @ExcelProperty("订单自编号") + private String orderCode; + /** + * 预约编号 + */ + @ColumnWidth(20) + @ExcelProperty("商场名称") + private String mallName; + /** - * 租户号 + * 预约编号 */ @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; + @ExcelProperty("门店名称") + private String storeName; /** - * 是否已删除 + * 预约编号 */ @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; + @ExcelProperty("货物名称") + private String descriptionGoods; /** * 预约编号 */ @ColumnWidth(20) - @ExcelProperty("预约编号") - private String reservationId; + @ExcelProperty("品牌") + private String brand; + /** + * 预约编号 + */ + @ColumnWidth(20) + @ExcelProperty("收货单位") + private String consigneeUnit; /** * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("订单编号") - private String stockarticleId; + @ExcelProperty("订单来源") + private String resource; + /** * 预约数量 */ @ColumnWidth(20) - @ExcelProperty("预约数量") - private String reservationNum; + @ExcelProperty("服务类型") + private String deliveryType; /** - * 预留1 + * 预约数量 */ @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; + @ExcelProperty("预约时间 ") + private Date reservationDate; /** - * 预留2 + * 预约数量 */ @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; + @ExcelProperty("收货人") + private String consignee; /** - * 预留3 + * 预约数量 */ @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; + @ExcelProperty("手机号") + private String deliveryPhone; /** - * 预留4 + * 预约数量 */ @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; + @ExcelProperty("收货地址") + private String deliveryAddress; /** - * 预留5 + * 预约数量 */ @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; + @ExcelProperty("包件数量") + private String reservationNum; + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStocklistExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStocklistExcel.java index d8a88307a..3e9953e3e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStocklistExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStocklistExcel.java @@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** @@ -40,65 +41,132 @@ public class DistributionReservationStocklistExcel implements Serializable { private static final long serialVersionUID = 1L; + /** - * 租户号 + * 预约编号 */ @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; + @ExcelProperty("预约编号") + private String reservationCode; /** - * 是否已删除 + * 包件编号 */ @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; + @ExcelProperty("预约时间") + private Date reservationDate; + /** - * 预约编号 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预约编号") - private String reservationId; + @ExcelProperty("服务类型") + private String deliveryType; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("收货人") + private String consignee; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("手机号码") + private String deliveryPhone; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("收货地址") + private String deliveryAddress; + +// /** +// * 订单编号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("服务号") +// private String serviceNumber; + + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("订单自编号") + private String orderCode; + + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("SKU") + private String sku; /** - * 库存编号 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("库存编号") - private String stocklistId; + @ExcelProperty("商场名称") + private String marketName; /** - * 预约数量 + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("物料编码") + private String cargoNumber; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("单位") + private String cargoUnit; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("物料名称") + private String descriptionGoods; + /** + * 订单编号 + */ + @ColumnWidth(20) + @ExcelProperty("品牌") + private String brandName; + + /** + * 订单编号 */ @ColumnWidth(20) @ExcelProperty("预约数量") private String reservationNum; /** - * 预留1 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; + @ExcelProperty("备货数量") + private String stockNumber; /** - * 预留2 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; + @ExcelProperty("已备件数") + private String realityNum; /** - * 预留3 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; + @ExcelProperty("备货区") + private String stockupArea; /** - * 预留4 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; + @ExcelProperty("托盘码") + private String trayCode; /** - * 预留5 + * 订单编号 */ @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; + @ExcelProperty("库位信息") + private String positionCode; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSelfExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSelfExcel.java new file mode 100644 index 000000000..d8f593ed5 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSelfExcel.java @@ -0,0 +1,89 @@ +/* + * 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.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 自提备货 + * + * @author cyz + * @since 2023-06-15 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class DistributionSelfExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ColumnWidth(20) + @ExcelProperty("备货编码") + private String stockupCode; + + @ColumnWidth(20) + @ExcelProperty("备货时间") + private Date stockupDate; + + @ColumnWidth(20) + @ExcelProperty("出库时间") + private Date outboundDate; + + @ColumnWidth(20) + @ExcelProperty("备货状态") + private String stockupStatus; + + @ColumnWidth(20) + @ExcelProperty("备货区") + private String stockupArea; + + @ColumnWidth(20) + @ExcelProperty("指派状态;1-未指派、2-已指派") + private String assignStatus; + + @ColumnWidth(20) + @ExcelProperty("所在库位") + private String stockipAllocation; + + @ColumnWidth(20) + @ExcelProperty("备货人员") + private Long forklift; + + @ColumnWidth(20) + @ExcelProperty("所在托盘") + private String pallet; + + @ColumnWidth(20) + @ExcelProperty("确认完成备货时间") + private Date fixTime; + + @ColumnWidth(20) + @ExcelProperty("指派时间") + private Date assignTime; + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSigndetailExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSigndetailExcel.java index 260ef023f..8ffd90351 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSigndetailExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSigndetailExcel.java @@ -21,6 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -41,132 +42,90 @@ public class DistributionSigndetailExcel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 租户号 - */ - @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; - /** - * 是否已删除 - */ - @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; - /** - * 预留1 - */ - @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; - /** - * 预留2 - */ - @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; - /** - * 预留3 - */ - @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; - /** - * 预留4 - */ - @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; - /** - * 预留5 - */ - @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; - /** - * 签收表id - */ - @ColumnWidth(20) - @ExcelProperty("签收表id") - private Integer masterId; /** * 服务号 */ @ColumnWidth(20) @ExcelProperty("服务号") private String serviceNumber; - /** - * 配送/自提单号 - */ - @ColumnWidth(20) - @ExcelProperty("配送/自提单号") - private String deliveryNumber; + /** * 配送车次号 */ @ColumnWidth(20) @ExcelProperty("配送车次号") private String trainNumber; + /** - * 服务类型 + * 配送/自提单号 */ @ColumnWidth(20) - @ExcelProperty("服务类型") - private String serveType; + @ExcelProperty("配送类型") + private String deliveryNumber; + /** - * 订单自编号 + * 订单自提单号 */ @ColumnWidth(20) @ExcelProperty("订单自编号") - private String orderId; + private String orderCode; /** * 商城名称 */ @ColumnWidth(20) @ExcelProperty("商城名称") private String mallName; - /** - * 货物名称 - */ - @ColumnWidth(20) - @ExcelProperty("货物名称") - private String goodsName; /** * 仓库 */ @ColumnWidth(20) @ExcelProperty("仓库") - private String warehouse; + private String warehouseName; + /** * 入库时间 */ @ColumnWidth(20) @ExcelProperty("入库时间") - private Date warehousingTime; + private String warehouseEntryTime; + /** - * 备货时间 + * 司机签收时间 */ @ColumnWidth(20) - @ExcelProperty("备货时间") - private Date leadTime; + @ExcelProperty("司机签收时间") + private String sjsigningTime; + /** + * 文员签收时间 + */ + @ColumnWidth(20) + @ExcelProperty("文员签收时间") + private String signingTime; + + /** * 在库时长;(天) */ @ColumnWidth(20) - @ExcelProperty("在库时长;(天)") - private Integer durationInStock; + @ExcelProperty("在库时长(天)") + private String storeTime; + + /** - * 签收件数 + * 订单总件数 */ + @ApiModelProperty(value = "订单总件数") @ColumnWidth(20) - @ExcelProperty("签收件数") - private Integer signedNumber; + @ExcelProperty("订单总件数") + private Integer totalNumber; + + /** - * 是否齐套 + * 签收件数 */ @ColumnWidth(20) - @ExcelProperty("是否齐套") - private String isKitting; + @ExcelProperty("签收件数") + private Integer signfornum; /** * 品牌 */ @@ -174,4 +133,71 @@ public class DistributionSigndetailExcel implements Serializable { @ExcelProperty("品牌") private String brand; + /** + * 服务类型 + */ + @ColumnWidth(20) + @ExcelProperty("顾客名称") + private String consignee; + /** + * 服务类型 + */ + @ColumnWidth(20) + @ExcelProperty("客户电话") + private String deliveryPhone; + + /** + * 服务类型 + */ + @ColumnWidth(20) + @ExcelProperty("客户地址") + private String deliveryAddress; + + + + +// /** +// * 配送/自提单号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("配送/自提单号") +// private String deliveryNumber; +// +// /** +// * 服务类型 +// */ +// @ColumnWidth(20) +// @ExcelProperty("服务类型") +// private String serveType; +// +// +// /** +// * 货物名称 +// */ +// @ColumnWidth(20) +// @ExcelProperty("货物名称") +// private String goodsName; +// /** +// * 仓库 +// */ +// @ColumnWidth(20) +// @ExcelProperty("仓库") +// private String warehouse; +// +// /** +// * 备货时间 +// */ +// @ColumnWidth(20) +// @ExcelProperty("备货时间") +// private Date leadTime; +// +// +// /** +// * 是否齐套 +// */ +// @ColumnWidth(20) +// @ExcelProperty("是否齐套") +// private String isKitting; + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java index d42ecf506..0e7d331af 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java @@ -41,66 +41,37 @@ public class DistributionSignforExcel implements Serializable { private static final long serialVersionUID = 1L; + /** - * 租户号 - */ - @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; - /** - * 是否已删除 - */ - @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; - /** - * 预留1 - */ - @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; - /** - * 预留2 - */ - @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; - /** - * 预留3 - */ - @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; - /** - * 预留4 - */ - @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; - /** - * 预留5 + * 配送车次 */ @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; + @ExcelProperty("配送车次") + private String trainNumber; /** * 订单自编号;订单关联id */ @ColumnWidth(20) - @ExcelProperty("订单自编号;订单关联id") - private String orderId; + @ExcelProperty("订单自编号") + private String orderCode; /** * 预约关联Id;预约关联id */ @ColumnWidth(20) - @ExcelProperty("预约关联Id;预约关联id") - private Long reservationId; + @ExcelProperty("服务类型") + private String deliveryTypeName; /** * 收货人 */ @ColumnWidth(20) - @ExcelProperty("收货人") + @ExcelProperty("客户名称") private String consignee; + /** + * 收货人 + */ + @ColumnWidth(20) + @ExcelProperty("客户电话") + private String deliveryPhone; /** * 收货地址 */ @@ -108,35 +79,49 @@ public class DistributionSignforExcel implements Serializable { @ExcelProperty("收货地址") private String deliveryAddress; /** - * 服务类型 + * 配送仓库 */ @ColumnWidth(20) - @ExcelProperty("服务类型") - private String serveType; + @ExcelProperty("配送仓库") + private String warehouseName; /** * 配送仓库 */ @ColumnWidth(20) - @ExcelProperty("配送仓库") - private String distributingWarehouse; + @ExcelProperty("商城名称") + private String mallName; /** - * 配送车次 + * 配送仓库 */ @ColumnWidth(20) - @ExcelProperty("配送车次") - private String trainNumber; + @ExcelProperty("门店名称") + private String storeName; /** - * 订单总数 + * 服务类型 */ @ColumnWidth(20) - @ExcelProperty("订单总数") - private Integer orderTotal; + @ExcelProperty("配送服务类型") + private String deliveryWayName; /** - * 总件数 + * 服务类型 */ @ColumnWidth(20) - @ExcelProperty("总件数") - private Integer total; + @ExcelProperty("装车时间") + private String deliveryTime; + + + /** + * 订单总数 + */ + @ColumnWidth(20) + @ExcelProperty("配送件数") + private Integer reservationNum; +// /** +// * 总件数 +// */ +// @ColumnWidth(20) +// @ExcelProperty("总件数") +// private Integer orderTotal; /** * 装车件数 */ @@ -149,65 +134,65 @@ public class DistributionSignforExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("签收数") private Integer receivedQuantity; - /** - * 送货司机 - */ - @ColumnWidth(20) - @ExcelProperty("送货司机") - private String deliveryDriver; - /** - * 送货司机手机号 - */ - @ColumnWidth(20) - @ExcelProperty("送货司机手机号") - private String deliveryDriverPhone; +// /** +// * 送货司机 +// */ +// @ColumnWidth(20) +// @ExcelProperty("送货司机") +// private String deliveryDriver; +// /** +// * 送货司机手机号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("送货司机手机号") +// private String deliveryDriverPhone; /** * 签收时间 */ @ColumnWidth(20) @ExcelProperty("签收时间") - private Date signingTime; - /** - * 签收人 - */ - @ColumnWidth(20) - @ExcelProperty("签收人") - private String signee; + private Date sjsigningTime; +// /** +// * 签收人 +// */ +// @ColumnWidth(20) +// @ExcelProperty("签收人") +// private String signee; /** * 签收状态;1-未签收,2-司机签收,3-文员签收 */ @ColumnWidth(20) - @ExcelProperty("签收状态;1-未签收,2-司机签收,3-文员签收") - private String signingStatus; + @ExcelProperty("司机签收状态") + private String driverSigningName; /** * 签收类型;1-签收,2-代签收 */ @ColumnWidth(20) - @ExcelProperty("签收类型;1-签收,2-代签收") - private String signingType; - /** - * 文员复核图片 - */ - @ColumnWidth(20) - @ExcelProperty("文员复核图片") - private String clerkSignPictures; - /** - * 司机签收图片 - */ - @ColumnWidth(20) - @ExcelProperty("司机签收图片") - private String deliverySignPictures; - /** - * 服务号 - */ - @ColumnWidth(20) - @ExcelProperty("服务号") - private String serviceNumber; - /** - * 备注 - */ - @ColumnWidth(20) - @ExcelProperty("备注") - private String notes; + @ExcelProperty("文员审核状态") + private String signingStatusName; +// /** +// * 文员复核图片 +// */ +// @ColumnWidth(20) +// @ExcelProperty("文员复核图片") +// private String clerkSignPictures; +// /** +// * 司机签收图片 +// */ +// @ColumnWidth(20) +// @ExcelProperty("司机签收图片") +// private String deliverySignPictures; +// /** +// * 服务号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("服务号") +// private String serviceNumber; +// /** +// * 备注 +// */ +// @ColumnWidth(20) +// @ExcelProperty("备注") +// private String notes; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforOwnExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforOwnExcel.java new file mode 100644 index 000000000..b18ae17bf --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforOwnExcel.java @@ -0,0 +1,419 @@ +/* + * 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.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 签收管理 Excel实体类 + * + * @author lmy + * @since 2023-06-13 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class DistributionSignforOwnExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 配送车次 + */ + @ApiModelProperty(value = "配送车次") + @ColumnWidth(20) + @ExcelProperty("配送车次") + private String trainNumber; + + /** + * 订单自编号;订单关联id + */ + @ColumnWidth(20) + @ExcelProperty("订单自编号") + private String orderCode; + + /** + * 配送仓库(名称) + */ + @ApiModelProperty(value = "配送仓库(名称)") + @ColumnWidth(20) + @ExcelProperty("配送仓库") + private String warehouseName; + + /** + * 收货人 + */ + @ColumnWidth(20) + @ExcelProperty("客户名称") + private String consignee; + /** + * 收货人 + */ + @ColumnWidth(20) + @ExcelProperty("客户电话") + private String deliveryPhone; + /** + * 收货地址 + */ + @ColumnWidth(20) + @ExcelProperty("收货地址") + private String deliveryAddress; + + /** + * 配送类型 + */ + @ApiModelProperty(value = "配送类型；1-商配、2-市配") + @ColumnWidth(20) + @ExcelProperty("配送类型") + private String deliveryTypeName; + + /** + * 门店名称 + */ + @ColumnWidth(20) + @ExcelProperty("服务类型") + private String deliveryWayName; + + /** + * 总件数 + */ + @ApiModelProperty(value = "总件数") + @ColumnWidth(20) + @ExcelProperty("总件数") + private Integer reservationNum; + + /** + * 装车件数 + */ + @ApiModelProperty(value = "装车件数") + @ColumnWidth(20) + @ExcelProperty("装车件数") + private Integer loadedNumber; + + /** + * 签收数 + */ + @ApiModelProperty(value = "签收数") + @ColumnWidth(20) + @ExcelProperty("签收数") + private Integer receivedQuantity; + + /** + * 装车未扫数 + */ + @ApiModelProperty(value = "装车未扫数") + @ColumnWidth(20) + @ExcelProperty("装车未扫数") + private String withoutScanning; + + /** + * 未签收数目 + */ + @ApiModelProperty(value = "未签收数目") + @ColumnWidth(20) + @ExcelProperty("未签收数目") + private String unsigneds; + + /** + * 送货司机(名称) + */ + @ApiModelProperty(value = "送货司机(名称)") + @ColumnWidth(20) + @ExcelProperty("送货司机") + private String deliveryDriverName; + + /** + * 送货司机手机号 + */ + @ApiModelProperty(value = "送货司机手机号") + @ColumnWidth(20) + @ExcelProperty("送货司机手机号") + private String deliveryDriverPhone; + + /** + * 文员签收时间 + */ + @ApiModelProperty(value = "签收时间") + @ColumnWidth(20) + @ExcelProperty("签收时间") + private String signingTime; + + /** + * 司机签收时间 + */ + @ApiModelProperty(value = "司机签收时间") + @ColumnWidth(20) + @ExcelProperty("司机签收时间") + private String sjsigningTime; + + /** + * 签收人(名称) + */ + @ApiModelProperty(value = "签收人(名称)") + @ColumnWidth(20) + @ExcelProperty("签收人") + private String signeeName; + + + /** + * 文员签收状态;1-未签收，2-签收 + */ + @ApiModelProperty(value = "文员签收状态;1-未签收，2-签收") + @ColumnWidth(20) + @ExcelProperty("文员签收状态") + private String signingStatusName; + + /** + * 司机签收状态;1-未签收，2-签收 + */ + @ApiModelProperty(value = "司机签收状态;1-未签收，2-签收") + @ColumnWidth(20) + @ExcelProperty("司机签收状态") + private String driverSigningName; + + + + + + +// /** +// * 服务类型 +// */ +// @ApiModelProperty(value = "预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；") +// @ColumnWidth(20) +// @ExcelProperty("预约服务类型") +// private String deliveryWay; +// +// /** +// * 商城名称 +// */ +// @ApiModelProperty(value = "商城名称") +// @ColumnWidth(20) +// @ExcelProperty("商城名称") +// private String mallName; +// +// +// +// /** +// * 订单总数 +// */ +// @ApiModelProperty(value = "订单总数") +// @ColumnWidth(20) +// @ExcelProperty("订单总数") +// private Integer orderTotal; +// +// +// /** +// * 签收类型;1-签收,2-代签收 +// */ +// @ApiModelProperty(value = "签收类型;1-签收,2-代签收") +// @ColumnWidth(20) +// @ExcelProperty("签收类型") +// private String signingType; +// /** +// * 服务号 +// */ +// @ApiModelProperty(value = "服务号") +// @ColumnWidth(20) +// @ExcelProperty("服务号") +// private String serviceNumber; +// /** +// * 司机备注 +// */ +// @ApiModelProperty(value = "司机备注") +// @ColumnWidth(20) +// @ExcelProperty("司机备注") +// private String driverRemarks; +// /** +// * 文员备注 +// */ +// @ApiModelProperty(value = "文员备注") +// @ColumnWidth(20) +// @ExcelProperty("文员备注") +// private String clerkSignRemarks; +// +// /** +// * 送货车辆(值) +// */ +// @ApiModelProperty(value = "送货车辆(值)") +// @ColumnWidth(20) +// @ExcelProperty("送货车辆") +// private String deliveryVehicleName; +// +// /** +// * 编号 +// */ +// @ApiModelProperty(value = "编号") +// @ColumnWidth(20) +// @ExcelProperty("编号") +// private String number; +// +// /** +// * 配送单号 +// */ +// @ApiModelProperty(value = "配送单号") +// @ColumnWidth(20) +// @ExcelProperty("配送单号") +// private String noteNumber; +// +// +// /** +// * 配送时间 +// */ +// @ApiModelProperty(value = "配送时间") +// @ColumnWidth(20) +// @ExcelProperty("配送时间") +// private String deliveryTime; +// /** +// * 装车时间 +// */ +// @ApiModelProperty(value = "装车时间") +// @ColumnWidth(20) +// @ExcelProperty("装车时间") +// private String loadingTime; +// +// /** +// * 定位打卡 +// */ +// @ApiModelProperty(value = "定位打卡") +// @ColumnWidth(20) +// @ExcelProperty("定位打卡") +// private String positioning; +// /** +// * 定位打卡地址 +// */ +// @ApiModelProperty(value = "定位打卡地址") +// @ColumnWidth(20) +// @ExcelProperty("定位打卡地址") +// private String positioningAdr; +// +// +// +// /** +// * 预约关联Id;预约关联id +// */ +// @ColumnWidth(20) +// @ExcelProperty("服务类型") +// private String deliveryTypeName; +// +// +// +// /** +// * 配送仓库 +// */ +// @ColumnWidth(20) +// @ExcelProperty("门店名称") +// private String storeName; +// /** +// * 服务类型 +// */ +// @ColumnWidth(20) +// @ExcelProperty("配送服务类型") +// private String deliveryWayName; +// +// /** +// * 签收状态;1-未签收,2-司机签收,3-文员签收 +// */ +// @ColumnWidth(20) +// @ExcelProperty("司机签收状态") +// private String driverSigningName; +// /** +// * 签收类型;1-签收,2-代签收 +// */ +// @ColumnWidth(20) +// @ExcelProperty("文员审核状态") +// private String signingStatusName; +// +// +// /** +// * 门店名称 +// */ +// @ColumnWidth(20) +// @ExcelProperty("服务类型") +// private String serveType; +// +// /** +// * 配送单号 +// */ +// @ApiModelProperty(value = "配送单号") +// @ColumnWidth(20) +// @ExcelProperty("服务类型") +// private String reservationCode; +// /** +// * 预约时间 +// */ +// @ApiModelProperty(value = "预约时间") +// @ColumnWidth(20) +// @ExcelProperty("服务类型") +// private String reservationDate; +// +// +// /** +// * 签收状态 +// */ +// @ApiModelProperty(value = "签收状态") +// @ColumnWidth(20) +// @ExcelProperty("签收状态") +// private String signingStatusAll; +// +// +// /** +// * 备注 +// */ +// @ColumnWidth(20) +// @ExcelProperty("备注") +// private String remarks; +// +// +// /** +// * 是否加急 +// */ +// @ColumnWidth(20) +// @ExcelProperty("是否加急") +// private String isUrgent; +// +// /** +// * 配送车牌号 +// */ +// @ColumnWidth(20) +// @ExcelProperty("配送车牌号") +// private String vehicleName; +// +// /** +// * 配送司机 +// */ +// @ColumnWidth(20) +// @ExcelProperty("配送司机") +// private String driverName; + + + + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistrilbutionBillLadingExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistrilbutionBillLadingExcel.java index b95be8e2a..b9536f654 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistrilbutionBillLadingExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistrilbutionBillLadingExcel.java @@ -21,6 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -41,83 +42,97 @@ public class DistrilbutionBillLadingExcel implements Serializable { private static final long serialVersionUID = 1L; - /** - * 租户号 - */ - @ColumnWidth(20) - @ExcelProperty("租户号") - private String tenantId; - /** - * 是否已删除 - */ - @ColumnWidth(20) - @ExcelProperty("是否已删除") - private Integer isDeleted; - /** - * 预留1 - */ - @ColumnWidth(20) - @ExcelProperty("预留1") - private String reserve1; - /** - * 预留2 - */ - @ColumnWidth(20) - @ExcelProperty("预留2") - private String reserve2; - /** - * 预留3 - */ - @ColumnWidth(20) - @ExcelProperty("预留3") - private String reserve3; - /** - * 预留4 - */ - @ColumnWidth(20) - @ExcelProperty("预留4") - private String reserve4; - /** - * 预留5 - */ - @ColumnWidth(20) - @ExcelProperty("预留5") - private String reserve5; - /** - * 提货时间 - */ - @ColumnWidth(20) - @ExcelProperty("提货时间") - private String pickUpTime; - /** - * 提货人 - */ + @ColumnWidth(20) + @ExcelProperty("提货批次") + private String pickupBatch; + + @ColumnWidth(20) + @ExcelProperty("服务号") + private String serviceNumber; + + @ColumnWidth(20) + @ExcelProperty("运单号") + private String waybillNumber; + + @ColumnWidth(20) + @ExcelProperty("收货单位") + private String consigneeUnit; + + @ColumnWidth(20) + @ExcelProperty("收货人") + private String customerName; + + @ColumnWidth(20) + @ExcelProperty("联系电话") + private String customerTelephone; + + @ColumnWidth(20) + @ExcelProperty("仓库") + private String warehouse; + + @ColumnWidth(20) + @ExcelProperty("入库时间") + private String warehouseEntryTime; + + @ColumnWidth(20) + @ExcelProperty("到付运费") + private String collectFee; + + @ColumnWidth(20) + @ExcelProperty("搬运费") + private String transport; //搬运 + + @ColumnWidth(20) + @ExcelProperty("仓储费") + private String storageFee; + + @ColumnWidth(20) + @ExcelProperty("叉车费") + private String forklift; //叉车 + + @ColumnWidth(20) + @ExcelProperty("其他增值费用") + private String otherFee; + + @ColumnWidth(20) + @ExcelProperty("应提件数") + private String totalNumber; + + @ColumnWidth(20) + @ExcelProperty("实提件数") + private Integer stopNum; //已 + + @ColumnWidth(20) + @ExcelProperty("品牌") + private String brand; + + @ColumnWidth(20) + @ExcelProperty("货品信息") + private String productInformation; + @ColumnWidth(20) @ExcelProperty("提货人") private String consignee; - /** - * 提货车牌 - */ + @ColumnWidth(20) @ExcelProperty("提货车牌") private String pickUpPlate; - /** - * 提货证件 - */ + @ColumnWidth(20) @ExcelProperty("提货证件") private String deliveryDocument; - /** - * 证件类型 - */ + @ColumnWidth(20) @ExcelProperty("证件类型") - private String certificateType; - /** - * 费用合计 - */ + @ApiModelProperty(value = "证件类型名称") + private String certificateTypeName; + + @ColumnWidth(20) + @ExcelProperty("状态") + private String conditionName; + @ColumnWidth(20) @ExcelProperty("费用合计") - private BigDecimal totalCost; + private BigDecimal totalCost; //费用 } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java index 18f4d6d18..179dad553 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java @@ -19,6 +19,9 @@ package com.logpm.distribution.feign; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.entity.DistributionDeliveryListEntity; import com.logpm.distribution.service.IDistributionDeliveryListService; +import com.logpm.distribution.vo.DistributionDeliveryListVO; +import com.logpm.distribution.vo.DistributionDeliverySelfVO; +import com.logpm.distribution.vo.DistributionRetentionScanVo; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; @@ -27,6 +30,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.List; + /** * 配送管理 Feign实现类 * @@ -42,7 +47,7 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList @Override @GetMapping(TOP) - public BladePage top(Integer current, Integer size) { + public BladePage deliveryListTop(Integer current, Integer size) { Query query = new Query(); query.setCurrent(current); query.setSize(size); @@ -50,4 +55,14 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList return BladePage.of(page); } + @Override + public DistributionDeliveryListVO getDeliveryDriverInfo(Long deliveryId) { + return distributionDeliveryListService.getDeliveryList(deliveryId); + } + +// @Override +// public void retentionCancelDeliveryPack(DistributionRetentionScanVo distributionRetentionScanVo) { +// distributionDeliveryListService.retentionCancelDeliveryPack(distributionRetentionScanVo); +// } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index 1d15ec402..e8a8bb27b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.service.IDistributionParcelListService; +import com.logpm.distribution.vo.DistributionParcelListVO; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; @@ -172,4 +173,10 @@ public class DistributionParcelListClient implements IDistributionParcelListClie .eq("order_code",orderCode); distributionParcelListService.update(updateWrapper); } + + @Override + @PostMapping(GETPARCELLISTINFO) + public List getParcelListInfo(DistributionParcelListVO parcelListVO) { + return distributionParcelListService.getParcelListInfo(parcelListVO); + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java index b238dac66..1cab1eac1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java @@ -19,6 +19,7 @@ package com.logpm.distribution.feign; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.entity.DistributionReservationEntity; import com.logpm.distribution.service.IDistributionReservationService; +import com.logpm.distribution.vo.DistributionRetentionScanVo; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; @@ -50,4 +51,9 @@ public class DistributionReservationClient implements IDistributionReservationCl return BladePage.of(page); } + @Override + public boolean retentionCancelReservationPack(DistributionRetentionScanVo distributionRetentionScanVo) { + return reservationService.retentionCancelReservationPack(distributionRetentionScanVo); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java index 049aaf615..934f29137 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java @@ -19,6 +19,8 @@ package com.logpm.distribution.feign; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.service.IDistributionParcelListService; @@ -191,4 +193,22 @@ public class DistributionStockArticleClient implements IDistributionStockArticle distributionStockArticleService.submitHandleNumByOrderId(subNum,articleId); } + /** + * 查询订单数据 + * @param stockArticleEntity + * @return + */ + @Override + @PostMapping(GETSTOCKARTICLEINFO) + public List getStockArticleInfo(DistributionStockArticleEntity stockArticleEntity) { + return distributionStockArticleService.list(Wrappers.query().lambda() + .eq(DistributionStockArticleEntity::getWarehouseId,stockArticleEntity.getWarehouseId()) + .eq(ObjectUtils.isNotNull(stockArticleEntity.getMallId()),DistributionStockArticleEntity::getMallId,stockArticleEntity.getMallId()) + .eq(ObjectUtils.isNotNull(stockArticleEntity.getId()),DistributionStockArticleEntity::getId,stockArticleEntity.getId()) + .eq(ObjectUtils.isNotNull(stockArticleEntity.getGenre()),DistributionStockArticleEntity::getGenre,stockArticleEntity.getGenre()) + .eq(ObjectUtils.isNotNull(stockArticleEntity.getIsZero()),DistributionStockArticleEntity::getIsZero,stockArticleEntity.getIsZero()) + ); + + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java index 01ce2518f..a6713755a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java @@ -173,4 +173,16 @@ public class DistributionStockListClient implements IDistributionStockListClient return distributionStockListService.list(stockListEntityLambdaQueryWrapper); } + /** + * 查询商场库存平 + * + * @param distributionStockListEntity + * @return + */ + @Override + @PostMapping(GETSTOCKLISTINFO) + public List getStockListInfo(DistributionStockListEntity distributionStockListEntity) { + return distributionStockListService.getStockListInfo(distributionStockListEntity); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java index 5aaaab958..d5de1513b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java @@ -23,9 +23,11 @@ import com.logpm.distribution.dto.DistributionAddvalueDTO; import com.logpm.distribution.entity.DistributionAddvalueEntity; import com.logpm.distribution.entity.DistributionAddvaluePackageEntity; import com.logpm.distribution.excel.DistributionAddvalueExcel; +import com.logpm.distribution.vo.DistributionAddvaluePackageVO; import com.logpm.distribution.vo.DistributionAddvalueVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 配送增值服务表 Mapper 接口 @@ -81,6 +83,54 @@ public interface DistributionAddvalueMapper extends BaseMapper selectAddvaluePackageVO(@Param("reservationId") Long reservationId, @Param("stockArticleId") Long stockArticleId,@Param("obj") Map addValueDTO); + + + List selectAddvalueZeroPackageVO(@Param("reservationId")Long reservationId,@Param("stockArticleId")Long stockArticleId,@Param("obj")Map addValueDTO); + + List selectAddvalueInventoryPackageVO(@Param("reservationId")Long reservationId,@Param("stockListId")Long stockListId,@Param("obj")Map addValueDTO); + + /** + * + * @param reservationId + * @param addvalueType + * @return + */ + List selectAddvaluePackageListByAddvalueType(@Param("reservationId")Long reservationId,@Param("addvalueType") String addvalueType); + // /** // * 删除增值服务 // * @param reservationId diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml index c651c45dc..4c26fd93c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml @@ -92,5 +92,184 @@ GROUP BY lda.id + + + + + + + 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 03c6f6906..71ac1382b 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 @@ -235,6 +235,8 @@ ldsa.customer_name, ldsa.customer_telephone, ldsa.customer_address, + ldsa.total_number, + ldsa.hand_quantity, ldrs.reservation_num AS deliveryNumber, ldsa.description_goods descriptionGoods, ( @@ -278,7 +280,7 @@ ( select sum(loaded_nub) FROM logpm_distribution_loadscan AS ldl WHERE ldl.order_id=ldrs.stock_article_id and ldl.scan_status != 1 and ldl.reservation_id = lds.reservation_id - ) AS loadingNumber , + ) AS loadingNumber, ( select count(*) FROM logpm_distribution_stock AS lstock WHERE lstock.stock_article=ldrs.stock_article_id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java index d82d96d15..e2de4c10c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -57,7 +57,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper exportDistributionDeliveryList(@Param("ew") Wrapper queryWrapper); + List exportDistributionDeliveryList(@Param("ew") Wrapper queryWrapper); /** * 商配车次 * @@ -410,4 +410,22 @@ public interface DistributionDeliveryListMapper extends BaseMapper selectDeliveryZeroOrderDetail(@Param("orderId") Long orderId,@Param("deliveryListId") Long deliveryId); + + /** + * 查询滞留库存品包件 + * @param stockPackageCode + * @param deliveryId + * @return + */ + DistributionRetentionScanVo selectRetentionInventoryPackage(@Param("stockPackageCode") String stockPackageCode,@Param("deliveryId") Long deliveryId); + + /** + * 查询滞留包件细腻系 + * @param orderPackageCode + * @param deliveryId + * @return + */ + DistributionRetentionScanVo selectRetentionPackage(@Param("orderPackageCode")String orderPackageCode,@Param("deliveryId") Long deliveryId); + + List selectRetentionZeroPackage(@Param("deliveryId")Long deliveryId, @Param("orderCode")String barcode); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 45e9d0c85..e9071803c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -260,7 +260,7 @@ - SELECT * FROM logpm_distribution_delivery_list ${ew.customSqlSegment} + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryTripartiteMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryTripartiteMapper.java index 5d7876912..6128c9a4b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryTripartiteMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryTripartiteMapper.java @@ -67,4 +67,11 @@ public interface DistributionDeliveryTripartiteMapper extends BaseMapper select id id,driver_name driverName,vehicle_num vehicleNub FROM logpm_distribution_delivery_tripartite where delivery_id = #{deliveryId} + 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 729bc5307..df8faf4d7 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 @@ -31,6 +31,7 @@ import org.apache.ibatis.annotations.Param; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 在库订单包件清单 Mapper 接口 @@ -49,15 +50,6 @@ public interface DistributionParcelListMapper extends BaseMapper selectDistributionParcelListPage(IPage page,@Param("param") DistributionParcelListVO distributionParcelList); - - /** - * 获取导出数据 - * - * @param queryWrapper - * @return - */ - List exportDistributionParcelList(@Param("ew") Wrapper queryWrapper); - int submitNumByOrderIdAndName(@Param("articleId") Long articleId,@Param("productName") String productName, @Param("num") Integer num); List selectOrderInfoList(@Param("param") StockupDTO stockupDTO); @@ -86,9 +78,9 @@ public interface DistributionParcelListMapper extends BaseMapper selectOrderInfoSelfList(@Param("param") StockupDTO stockupDTO); @@ -109,7 +101,6 @@ public interface DistributionParcelListMapper extends BaseMapper getPackageList(@Param("stockArticleId") Long id); - List selectListByOderId(@Param("id")Long id,@Param("collect") List collect); ArrayList selectorderPackageCodeByLike(@Param("condition") String condition,@Param("collect") List collect); @@ -117,4 +108,8 @@ public interface DistributionParcelListMapper extends BaseMapper selectorderCodeByLike(@Param("condition") String condition,@Param("collect") List collect); List selectStockListByOderId(@Param("id")Long id,@Param("collect") List collect); + + List getParcelListInfo(@Param("param")DistributionParcelListVO parcelListVO); + + List exportDistributionParcelList(@Param("paramMap")Map paramMap, @Param("idArr") List idArr); } 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 b478855fd..f0bdd4281 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 @@ -34,9 +34,79 @@ + + from logpm_distribution_stock_article ldsa + LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id + + ldsa.warehouse_id = #{param.warehouseId} and ldpl.order_package_status != '70' + and ldsa.mall_id = #{param.mallId} + and ldsa.genre = #{param.genre} + and ldsa.is_zero = #{param.isZero} + + + + - - update logpm_distribution_parcel_list set quantity = quantity - #{num} @@ -708,5 +773,58 @@ lwtg.tray_code, lwug.position_code; + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index 563ccf5cd..69647f53a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -55,7 +55,7 @@ public interface DistributionReservationMapper extends BaseMapper exportDistrbutionReservation(@Param("ew") Wrapper queryWrapper); + List exportDistrbutionReservation(@Param("ew") Wrapper queryWrapper); Integer addReservations(@Param("list")List toLongList); 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 bb7d25318..5c2c9cc31 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 @@ -73,8 +73,8 @@ - + SELECT * FROM logpm_distribution_reservation ${ew.customSqlSegment} - + + select DISTINCT ldr.reservation_code reservationCode,ldr.reservation_date reservationDate,ldr.delivery_type deliveryType,ldr.consignee,ldr.delivery_address deliveryAddress + ,ldr.delivery_phone deliveryPhone,ldr.reservation_num reservationNum,ldr.warehouse_name warehouseName, + ldpl.waybill_number waybillNumber,ldpl.service_number serviceNumber,ldpl.order_code orderCode,ldpl.order_package_code orderPackageCode,ldpl.send_warehouse_name sendWarehouseName + ,ldpl.accept_warehouse_name acceptWarehouseName,ldpl.warehouse_entry_time_end warehouseEntryTimeEnd, + ldpl.train_number trainNumber,ldpl.firsts,ldpl.second,ldpl.third_product thirdProduct,ldpl.material_name materialName,ldpl.quantity, lwtg.tray_code trayCode, + lwug.position_code positionCode + + from logpm_distribution_reservation_package ldrp + LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrp.reservation_id + LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id + LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.warehouse_id = #{param.warehouseId} + LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.warehouse_id = #{param.warehouseId} + + ldrp.packet_bar_status in (1,3) + and ldrs.reservation_id = #{param.reservationId } + and ldpl.waybill_number like concat('%',#{param.waybillNumber },'%') + and ldpl.service_number like concat('%', #{param.serviceNumber },'%') + and ldpl.order_code like concat('%', #{param.orderCode },'%') + and ldr.warehouse_name like concat('%', #{param.warehouseName },'%') + and ldpl.order_package_code like concat('%', #{param.orderPackageCode },'%') + and ldpl.send_warehouse_name like concat('%', #{param.sendWarehouseName },'%') + and ldpl.accept_warehouse_name like concat('%', #{param.acceptWarehouseName },'%') + and date_format(ldr.reservation_date,'%Y-%m-%d') = #{param.reservationDate} + and ldpl.train_number like concat('%', #{param.trainNumber },'%') + and ldpl.firsts like concat('%', #{param.firsts },'%') + and ldpl.second like concat('%', #{param.second } ,'%') + and ldpl.third_product like concat('%', #{param.thirdProduct } ,'%') + and ldpl.material_name like concat('%', #{param.materialName },'%') + and lwtg.tray_code like concat('%',#{param.trayCode },'%') + and lwug.position_code like concat('%', #{param.positionCode } ,'%') + + + select GROUP_CONCAT(t.title) + from (select CONCAT(ldpl.third_product,'(',count(ldpl.id),')') title + from logpm_distribution_reservation_package ldrp + left join logpm_distribution_parcel_list ldpl on ldrp.stock_article_id = ldpl.stock_article_id + where ldrp.reservation_id = #{reservationId} + and ldrp.stock_article_id = #{stockArticleId} + and ldrp.packet_bar_status != 2 + group by ldpl.third_product) t + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.java index e9a649931..2d725a81f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStockarticleMapper.java @@ -19,6 +19,7 @@ package com.logpm.distribution.mapper; 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.dto.DistributionReservationStockarticleDTO; import com.logpm.distribution.entity.DistributionReservationStockarticleEntity; import com.logpm.distribution.excel.DistributionReservationStockarticleExcel; import com.logpm.distribution.vo.DistributionReservationStockarticleVO; @@ -52,7 +53,7 @@ public interface DistributionReservationStockarticleMapper extends BaseMapper exportDistributionReservationStockarticle(@Param("ew") Wrapper queryWrapper); + List exportDistributionReservationStockarticle(@Param("param") DistributionReservationStockarticleDTO queryWrapper); /** * 物理删除预约订单中间表 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 3342e3dfe..6b52e664a 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 @@ -45,9 +45,31 @@ - + + + select ldr.reservation_code reservationCode,ldr.reservation_date reservationDate,ldr.delivery_type deliveryType,ldr.consignee,ldr.delivery_address deliveryAddress + ,ldr.delivery_phone deliveryPhone,ldr.reservation_num reservationNum, + ldsa.waybill_number waybillNumber,ldsa.order_code orderCode,ldsa.mall_name mallName,ldsa.store_name storeName,ldsa.description_goods descriptionGoods,ldsa.brand, + ldsa.consignee_unit consigneeUnit ,ldsa.resource + from logpm_distribution_reservation ldr + LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldr.id = ldrs.reservation_id + LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldrs.stock_article_id + + ldrs.stock_article_status in (1,3) + and ldrs.reservation_id = #{param.reservationId } + and ldsa.waybill_number like concat('%',#{param.waybillNumber },'%') + and ldsa.order_code like concat('%', #{param.orderCode },'%') + and ldsa.mall_name like concat('%', #{param.mallName },'%') + and ldsa.store_name like concat('%', #{param.storeName },'%') + and ldsa.description_goods like concat('%', #{param.descriptionGoods },'%') + and ldsa.brand like concat('%', #{param.brand },'%') + and ldsa.consignee_unit like concat('%', #{param.consigneeUnit },'%') + and ldsa.resource like concat('%',#{param.resource },'%') + and ldr.delivery_type = #{param.deliveryType} + + + - SELECT * FROM logpm_distribution_reservation_stocklist ${ew.customSqlSegment} + + select DISTINCT ldr.reservation_code reservationCode,ldr.reservation_date reservationDate,ldr.delivery_type deliveryType,ldr.consignee,ldr.delivery_address deliveryAddress + ,ldr.delivery_phone deliveryPhone,ldr.reservation_num reservationNum,ldr.warehouse_name warehouseName, + ldsl.incoming_batch incomingBatch,ldsl.incoming_batch orderCode,ldsl.sku,ldsl.market_name marketName,ldsl.cargo_number cargoNumber,ldsl.cargo_unit cargoUnit,ldsl.description_goods descriptionGoods, + ldsl.brand_name brandName,ldrs.reservation_num reservationNum,ldrs.reservation_num stockNumber,ldrs.reality_num realityNum, lwtg.tray_code trayCode ,lwug.position_code positionCode + ,lds.stockup_area stockupArea + + from logpm_distribution_reservation_stocklist ldrs + LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrs.reservation_id + LEFT JOIN logpm_distribution_stock_list ldsl on ldsl.id = ldrs.stocklist_id + LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldsl.material_id and lwtg.incoming_batch = ldsl.incoming_batch and lwtg.market_id = ldsl.market_id + LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldsl.material_id and lwug.incoming_batch = ldsl.incoming_batch and lwug.market_id = ldsl.market_id + LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldrs.reservation_id + LEFT JOIN logpm_distribution_stockup lds on lds.id = ldsi.stockup_id + + and ldsl.incoming_batch like concat('%', #{param.incomingBatch },'%') + and ldsl.sku like concat('%', #{param.sku },'%') + and ldsl.market_name like concat('%', #{param.marketName },'%') + and ldsl.cargo_number like concat('%', #{param.cargoNumber },'%') + and ldsl.cargo_unit like concat('%', #{param.cargoUnit },'%') + and ldsl.description_goods like concat('%', #{param.descriptionGoods },'%') + and ldsl.brand_name like concat('%', #{param.brandName },'%') + and lwtg.tray_code like concat('%', #{param.trayCode },'%') + and lwug.position_code like concat('%', #{param.positionCode },'%') + and lds.stockup_area like concat('%', #{param.stockupArea },'%') + and ldsl.incoming_batch like concat('%', #{param.orderCode },'%') + + + + + + + + - SELECT * FROM logpm_distribution_signfor ${ew.customSqlSegment} + @@ -491,15 +530,15 @@ order by create_time desc limit 1 + + + + + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java index f377861bf..47899bf53 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java @@ -52,10 +52,10 @@ public interface DistributionStockArticleMapper extends BaseMapper exportDistributionStockArticle(@Param("ew") Wrapper queryWrapper); + List exportDistributionStockArticle(@Param("paramMap") Map paramMap, @Param("idArr") List idArr); void addHandQuantity(@Param("id") Long id,@Param("num") int num); 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 e7b096db3..625a61e5b 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 @@ -55,11 +55,6 @@ select * from logpm_distribution_stock_article where is_deleted = 0 - - - update logpm_distribution_stock_article set hand_quantity = hand_quantity + #{num} where id = #{id} @@ -646,6 +641,112 @@ WHERE ldsa.id = #{stockArticleId} + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java index 4fb031d6f..a399d0cda 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java @@ -102,4 +102,11 @@ public interface DistributionStockListMapper extends BaseMapper selectAllStockList(@Param("par")DistributionStockListDTO stockListDTO); + + /** + * 查询库存平数据 + * @param distributionStockListEntity + * @return + */ + List getStockListInfo(@Param("par")DistributionStockListEntity distributionStockListEntity); } 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 a2d8476ec..f90a983ef 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 @@ -93,7 +93,29 @@ select * from logpm_distribution_stock_list where is_deleted = 0 + @@ -351,7 +373,7 @@ and ldsl.warehouse_id = #{warehouseId} select COUNT(ldpl.id) from logpm_distribution_stockup_info ldsi - LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id - LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id + LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id + LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id ldsi.reservation_id = #{param.reservationId} and ldsi.stockup_id = #{param.stockupId} and ldpl.order_package_code = #{param.packetBarCode} @@ -50,7 +52,7 @@ and ldpl.order_code in - + #{a} @@ -61,15 +63,16 @@ select lwug.id lwugId,lds.id ldsId,ldpl.order_package_code orderPackageCode,lwug.allocation_id allocationId from logpm_distrilbution_bill_stock ldbs LEFT JOIN logpm_distribution_parcel_list ldpl on ldbs.stock_article_id = ldpl.stock_article_id - LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = 3 + LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = 3 LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id - ldbs.order_status in (1,2) and ldbs.bill_lading_id = #{param.reservationId} + ldbs.order_status in (1,2) and ldbs.bill_lading_id = #{param.reservationId} - + select DISTINCT lds.id,lds.stockup_date stockupDate, lds.stockup_user stockupUser, lds.stockup_status + stockupStatus, lds.stockup_area stockupArea, lds.assign_status assignStatus, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName, - lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime, - lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,(GROUP_CONCAT(DISTINCT lwtg.tray_code)) stockipAllocation + lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time + fixTime,lds.assign_time assignTime, + lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode, + COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '') + stockipAllocation,COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet from logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id + LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id lds.is_deleted = 0 - and lds.type_service = #{param.typeService} - and TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate}) - and TO_DAYS(lds.outbound_date)=TO_DAYS( #{param.outboundDate}) - and lds.stockup_date between #{param.startDate} and #{param.entDate} - and lds.stockup_user like concat('%',#{param.stockupUser},'%') - and lds.stockip_allocation like concat('%',#{param.stockipAllocation},'%') - and lds.stockup_code like concat('%',#{param.stockupCode},'%') - and lds.stockup_status = #{param.stockupStatus} - and lds.stockup_area = #{param.stockupArea} - and lds.assign_status = #{param.assignStatus} - and lds.forklift_name like concat('%', #{param.forkliftName},'%') - and lds.loader_name like concat('%', #{param.loaderName},'%') - and lds.type_service = #{param.typeService} - and lds.warehouse_id = #{param.warehouseId} + and lds.type_service = + #{param.typeService} + + and TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate}) + and TO_DAYS(lds.outbound_date)=TO_DAYS( #{param.outboundDate}) + and lds.stockup_date between #{param.startDate} and #{param.entDate} + + and lds.stockup_user like + concat('%',#{param.stockupUser},'%') + + and lds.stockip_allocation + like concat('%',#{param.stockipAllocation},'%') + + and lds.stockup_code like + concat('%',#{param.stockupCode},'%') + + and lds.stockup_status = + #{param.stockupStatus} + + and lds.stockup_area = + #{param.stockupArea} + + and lds.assign_status = + #{param.assignStatus} + + and lds.forklift_name like concat('%', + #{param.forkliftName},'%') + + and lds.loader_name like concat('%', + #{param.loaderName},'%') + + and lds.type_service = + #{param.typeService} + + and lds.warehouse_id = + #{param.warehouseId} + and lds.warehouse_id in - + #{a} - GROUP BY lds.id + GROUP BY lds.id - - - + select lds.stockup_area goodsAreaName, + ( + select GROUP_CONCAT(DISTINCT ldsa.mall_name SEPARATOR ',') + from logpm_distrilbution_bill_stock ldbs + LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id + where ldbs.bill_lading_id = ldsi.reservation_id + ) consignee, + ( + select SUM(lddd.quantity) + from logpm_distribution_delivery_details lddd + where lddd.bill_lading_id = ldsi.reservation_id + ) planNum, + ( + select COUNT(id) + from logpm_distribution_stock + where stock_list_id in ( + select lddd.stock_list_id + from logpm_distribution_delivery_details lddd + where lddd.bill_lading_id = ldsi.reservation_id + ) + and bill_lading_id = ldsi.reservation_id + and ldsi.stockup_id = stockup_id + ) scanNum from logpm_distribution_stockup_info ldsi - LEFT JOIN logpm_distribution_stockup lds on ldsi.stockup_id = lds.id + LEFT JOIN logpm_distribution_stockup lds on ldsi.stockup_id = lds.id where ldsi.reservation_id = #{reservationId} @@ -718,39 +827,43 @@ LEFT JOIN logpm_distribution_reservation_stockarticle ldrs ON ldrs.reservation_id = ldsi.reservation_id LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldrs.stock_article_id LEFT JOIN logpm_distribution_stockup lds ON lds.id = ldsi.stockup_id - - ldsi.stockup_id = #{ id } - AND ldsi.is_deleted = 0 - + + ldsi.stockup_id = #{ id } + AND ldsi.is_deleted = 0 + @@ -758,8 +871,8 @@ select lwga.headline from logpm_distribution_stockup_info ldsi - left join logpm_distribution_stockup lds on lds.id = ldsi.stockup_id and lds.is_deleted = 0 - left join logpm_warehouse_goods_area lwga on lwga.id = lds.goods_area_id and lwga.is_deleted = 0 + left join logpm_distribution_stockup lds on lds.id = ldsi.stockup_id and lds.is_deleted = 0 + left join logpm_warehouse_goods_area lwga on lwga.id = lds.goods_area_id and lwga.is_deleted = 0 where ldsi.reservation_id = #{reservationId} - and ldsi.is_deleted = 0 + and ldsi.is_deleted = 0 + + + 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 3cbc6e63e..017d870d2 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 @@ -26,7 +26,6 @@ import com.logpm.distribution.excel.DistrilbutionBillLadingExcel; import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO; import org.apache.ibatis.annotations.Param; -import org.springblade.core.tool.api.R; import java.util.List; import java.util.Map; @@ -89,4 +88,7 @@ public interface DistrilbutionBillLadingMapper extends BaseMapper getViewDetailOwn(@Param("id") String id); List selectBillStockList(IPage page, @Param("distrilbutionBillLading") Map distrilbutionBillLading); + + + List exportDistributionBillLading(@Param("param") Map param, @Param("idArr") List idArr); } 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 43e82413c..aca69294e 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 @@ -27,59 +27,198 @@ + + - diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index 4057901cb..62cee5a6f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml @@ -114,24 +114,29 @@ SELECT * FROM logpm_distrilbution_bill_stock ${ew.customSqlSegment} + + + + CREATE TABLE ${questNum} ( + `id` bigint(20) NOT NULL COMMENT '主键', + `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户号', + `create_user` bigint(20) NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_user` bigint(20) NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `create_dept` bigint(20) NULL DEFAULT NULL COMMENT '创建部门', + `is_deleted` int(11) NULL DEFAULT NULL COMMENT '是否删除', + `status` int(11) NULL DEFAULT NULL COMMENT '状态', + `reserve1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留1', + `reserve2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留2', + `reserve3` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留3', + `reserve4` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留4', + `reserve5` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留5', + `quest_detail_id` bigint(20) NULL DEFAULT NULL COMMENT '盘点明细ID', + `cargo_name` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '货物状态;10 在库 20 破损 30丢失 40不可修复 50配送 60未入库', + `quest_num` int(10) NOT NULL DEFAULT 1 COMMENT '盘点数量', + `warehouse_id` bigint(20) NULL DEFAULT NULL COMMENT '仓库id', + PRIMARY KEY (`id`) USING BTREE, + INDEX `quest_detail_id_index`(`quest_detail_id`) USING BTREE COMMENT '盘点明细' + ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '${questNum}盘点明细子表' ROW_FORMAT = Dynamic; + + + CREATE TABLE ${questNum} ( + `id` bigint(20) NOT NULL COMMENT '主键', + `tenant_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户号', + `create_user` bigint(20) NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_user` bigint(20) NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `create_dept` bigint(20) NULL DEFAULT NULL COMMENT '创建部门', + `is_deleted` int(11) NULL DEFAULT NULL COMMENT '是否删除', + `status` int(11) NULL DEFAULT NULL COMMENT '状态', + `reserve1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留1', + `reserve2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留2', + `reserve3` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留3', + `reserve4` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留4', + `reserve5` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留5', + `order_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单号', + `quest_id` bigint(20) NULL DEFAULT NULL COMMENT '任务ID', + `order_id` bigint(20) NULL DEFAULT NULL COMMENT '订单ID', + `quest_type` int(11) NULL DEFAULT NULL COMMENT '盘点方式;1. 随机 2 库位3 订单 4 托盘', + `quest_target` int(11) NULL DEFAULT NULL COMMENT '盘点对象;1.定制品 2零担 3 库存品', + `orde_package_code` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '包条码;对应定制品', + `order_package_id` bigint(20) NULL DEFAULT NULL COMMENT '包条ID;对应定制品', + `category_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '品类名称;对应零担', + `stock_id` bigint(20) NULL DEFAULT NULL COMMENT '库存品ID;对应库存品', + `quest_status` int(10) NOT NULL DEFAULT 0 COMMENT '盘点状态;0 待盘点 1. 已盘 2未盘点 3已排除', + `stock_num` int(10) NOT NULL DEFAULT 1 COMMENT '在库数量', + `warehouse_id` bigint(20) NULL DEFAULT NULL COMMENT '仓库id', + `position_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '完整货位（按库位）', + `tray_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '托盘码（按托盘）', + `tray_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '托盘id（按托盘）', + `allocation_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '货位id(按库位）', + `grounding_allocation_id` bigint(20) NULL DEFAULT NULL COMMENT '上架后的库位ID', + `is_new` int(20) NULL DEFAULT NULL COMMENT '是否是新增数据', + `grounding_position_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上架后的完整库位', + `material_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物料编码（库存品）', + `market_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商场名称（库存品）', + `incoming_batch` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '批次号（库存品）', + `material_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物料名称(库存品)', + `waybill_number` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '运单号', + PRIMARY KEY (`id`) USING BTREE, + INDEX `quest_id_index`(`quest_id`) USING BTREE COMMENT '任务id', + INDEX `order_id_index`(`order_id`) USING BTREE COMMENT '订单id', + INDEX `tenant_id_index`(`tenant_id`) USING BTREE COMMENT '租户id' + ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '${questNum}盘点明细' ROW_FORMAT = Dynamic; + + + INSERT INTO ${questNum}(`id`, `tenant_id`, `create_user`, `create_time`, `update_user`, `update_time`, `create_dept`, + `is_deleted`, `status`, `reserve1`, `reserve2`, `reserve3`, `reserve4`, `reserve5`, `order_code`, `quest_id`, `order_id`, `quest_type`, `quest_target`, + `orde_package_code`, `order_package_id`, `category_name`, `stock_id`, `quest_status`, `stock_num`, `warehouse_id`, `position_code`, `tray_code`, `tray_id`, + `allocation_id`, `grounding_allocation_id`, `is_new`, `grounding_position_code`, `material_code`, `market_name`, `incoming_batch`, `material_name`, + `waybill_number`) VALUES + + (#{item.id}, #{item.tenantId}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime}, #{item.createDept}, #{item.isDeleted} + , #{item.status}, #{item.reserve1}, #{item.reserve2}, #{item.reserve3}, #{item.reserve4}, #{item.reserve5}, #{item.orderCode}, #{item.questId}, #{item.orderId} + , #{item.questType}, #{item.questTarget}, #{item.ordePackageCode}, #{item.orderPackageId}, #{item.categoryName}, #{item.stockId}, #{item.questStatus}, + #{item.stockNum}, #{item.warehouseId} , #{item.positionCode}, #{item.trayCode}, #{item.trayId}, #{item.allocationId}, #{item.groundingAllocationId}, + #{item.isNew}, #{item.groundingPositionCode}, #{item.materialCode}, #{item.marketName} , #{item.incomingBatch}, #{item.materialName}, #{item.waybillNumber} + ) + + + + + + + + + update ${questNum} set quest_status = #{param.questStatus} + WHERE `id` = #{ param.id } + + + + update ${questNum} + + grounding_allocation_id = #{item. groundingAllocationId}, + grounding_position_code = #{item.groundingPositionCode }, + quest_status = #{item.questStatus }, + + + WHERE `id` = #{ item.id } + + + + + + update ${questNum} + + cargo_name = #{item.cargoName }, + quest_num = #{item.questNum }, + + + + + + + + + WHERE `id` = #{ item.id } + + + + INSERT INTO ${questNum} (`id`, `tenant_id`, `create_user`, `create_time`, `update_user`, `update_time`, + `create_dept`, `is_deleted`, `status`, `reserve1`, `reserve2`, `reserve3`, `reserve4`, `reserve5`, `quest_detail_id`, `cargo_name`, + `quest_num`, `warehouse_id`) + VALUES + + (#{item.id}, #{item.tenantId}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime}, #{item.createDept}, #{item.isDeleted} + , #{item.status}, #{item.reserve1}, #{item.reserve2}, #{item.reserve3}, #{item.reserve4}, #{item.reserve5}, + #{item.questDetailId}, #{item.cargoName}, #{item.questNum} , #{item.warehouseId} ) + + + + + + SELECT lqd.id id, + lqd.id id, lqd.order_code orderCode, lqd.quest_id questId, lqd.order_id orderId, @@ -167,7 +391,7 @@ ldpl.send_warehouse_name sendWarehouseName, ldsa.consignee_unit consigneeUnit FROM - logpm_quest_detail lqd + ${questNum} lqd JOIN logpm_distribution_parcel_list ldpl ON lqd.order_package_id = ldpl.id left join logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id AND lqd.quest_target =1 @@ -190,7 +414,7 @@ ldsl.service_number serviceNumber, ldsl.description_goods descriptionGoods FROM - logpm_quest_detail lqd + ${questNum} lqd JOIN logpm_distribution_stock_list ldsl ON lqd.stock_id = ldsl.id AND lqd.quest_target =3 @@ -213,7 +437,7 @@ ldsa.consignee_address consigneeAddress, ldsa.consignee_mobile consigneeMobile FROM - logpm_quest_detail lqd + ${questNum} lqd JOIN logpm_distribution_stock_article ldsa ON lqd.order_id = ldsa.id AND lqd.quest_target =2 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.java index 4093e7224..53e4409a3 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.java @@ -27,6 +27,7 @@ import com.logpm.warehouse.vo.WarehouseWaybillDetentionVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 滞留记录 Mapper 接口 @@ -45,14 +46,6 @@ public interface WarehouseRetentionRecordMapper extends BaseMapper selectWarehouseRetentionRecordPage(IPage page, WarehouseRetentionRecordVO warehouseRetentionRecord); - - /** - * 获取导出数据 - * - * @param queryWrapper - * @return - */ - List exportWarehouseRetentionRecord(@Param("ew") Wrapper queryWrapper); /** * 滞留运单 * warehouseWaybillDetentionVO @@ -62,4 +55,6 @@ public interface WarehouseRetentionRecordMapper extends BaseMapper retentionPackageList(IPage page, @Param("param") RetentionDTO retentionDTO); + + List exportWarehouseRetentionRecord(@Param("paramMap") Map paramMap, @Param("idArr") List idArr); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml index 079120755..f553ca586 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml @@ -40,10 +40,6 @@ select * from logpm_warehouse_retention_record where is_deleted = 0 - - @@ -60,5 +56,40 @@ order by update_time desc + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.java index 6e2270a20..420ac45a3 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.java @@ -26,6 +26,7 @@ import com.logpm.warehouse.vo.WarehouseScanRecordVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 备货扫描记录 Mapper 接口 @@ -44,14 +45,6 @@ public interface WarehouseStockMapper extends BaseMapper { */ List selectWarehouseStockPage(IPage page,@Param("param") WarehouseScanRecordVO warehouseScanRecordVO); - - /** - * 获取导出数据 - * - * @param queryWrapper - * @return - */ - List exportWarehouseStock(@Param("ew") Wrapper queryWrapper); /** * 库存品自定义分页 * @@ -60,4 +53,6 @@ public interface WarehouseStockMapper extends BaseMapper { * @return */ List selectWarehouseStockInventoryPage(IPage page,@Param("param") WarehouseScanInventoryRecordVO warehouseScanRecordVO); + + List exportWarehouseStock(@Param("paramMap") Map paramMap, @Param("idArr") List idArr); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml index 82e4eb390..fb75a9e4a 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml @@ -44,13 +44,6 @@ - - - - - + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.java index d69ca6dbb..c99e23694 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.java @@ -20,11 +20,15 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.warehouse.entity.WarehouseUpdownGoodsLogEntity; +import com.logpm.warehouse.excel.WarehouseCustomizedExcel; +import com.logpm.warehouse.excel.WarehouseStockedExcel; +import com.logpm.warehouse.excel.WarehouseTemporaryExcel; import com.logpm.warehouse.excel.WarehouseUpdownGoodsLogExcel; import com.logpm.warehouse.vo.WarehouseUpdownGoodsLogVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 上下架记录表 Mapper 接口 @@ -43,14 +47,6 @@ public interface WarehouseUpdownGoodsLogMapper extends BaseMapper selectWarehouseUpdownGoodsLogPage(IPage page,@Param("param") WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLog); - - /** - * 获取导出数据 - * - * @param queryWrapper - * @return - */ - List exportWarehouseUpdownGoodsLog(@Param("ew") Wrapper queryWrapper); /** * 自定义分页库存品 * @@ -67,4 +63,10 @@ public interface WarehouseUpdownGoodsLogMapper extends BaseMapper selectWarehouseUpdownGoodsLogtruckloadpage(IPage page,@Param("param") WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLog); + + List exportCustomized(Map paramMap, List idArr); + + List exportStock(@Param("paramMap") Map paramMap, @Param("idArr") List idArr); + + List exportTemporary(@Param("paramMap") Map paramMap, @Param("idArr") List idArr); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml index fe9137fd2..0d85b4cf5 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml @@ -18,34 +18,27 @@ - - - - + + + + - - - + + + - + - - - - - - SELECT lbm.product_code materialCode, lbm.name materialName, lbm.sku sku, lwup.binding_type bindingType, lwtg.tray_code palletCode, - lwup.area_title areaTitle, + lwup.area_title areaTitle, lwup.allocation_title allocationTitle, lwup.shelf_title shelfTitle, lwup.create_user createUser, @@ -132,7 +126,8 @@ - SELECT ldsa.*, lwup.binding_type bindingType, @@ -166,5 +161,117 @@ + + + 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 8563ddbf3..4d018d029 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 @@ -25,6 +25,7 @@ import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 仓库入库单 Mapper 接口 @@ -52,4 +53,5 @@ public interface WarehouseWarehousingEntryMapper extends BaseMapper exportWarehouseWarehousingEntry(@Param("ew") Wrapper queryWrapper); + List exportWarehouseWarehousing(@Param("paramMap") Map paramMap, @Param("idArr") List idArr); } 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 2d8c0d6de..acfc17c22 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 @@ -3,7 +3,8 @@ - + @@ -29,18 +30,70 @@ - + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java index 0a9672326..2ef4e9034 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java @@ -16,8 +16,10 @@ */ package com.logpm.warehouse.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.warehouse.dto.WarehouseWaybillDTO; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.vo.WarehouseWaybillVO; import org.apache.ibatis.annotations.Param; @@ -42,4 +44,8 @@ public interface WarehouseWaybillMapper extends BaseMapper selectWarehouseWaybillPage(IPage page, WarehouseWaybillVO warehouseWaybill); void submitStockCount(@Param("orderSelfNumbering") String orderSelfNumbering, @Param("allNum") Integer allNum); + + List exportWarehouseWarehousingDetail(@Param("ew") QueryWrapper queryWrapper); + + IPage pageInfo(IPage page,@Param("param") WarehouseWaybillDTO warehouseWaybillDTO); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml index 3b55b0840..92295b9eb 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml @@ -60,6 +60,78 @@ + + + update logpm_warehouse_waybill diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java index 483e0430c..4edbb36cc 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java @@ -66,7 +66,7 @@ public interface ITaskQuestService extends BaseService { List selectallocationList(TaskSearchDTO taskSearchDTO); - IPage selectcontractList(IPage page, TaskSearchDTO taskSearchDTO); + IPage selectcontractList(IPage page, TaskSearchDTO taskSearchDTO); /** * 托盘数据 @@ -74,20 +74,43 @@ public interface ITaskQuestService extends BaseService { * @param taskSearchDTO * @return */ - R selecttrayList(IPage page, TaskSearchDTO taskSearchDTO); + R selecttrayList(IPage page, TaskSearchDTO taskSearchDTO); /** * 合同号扫描 + * + * @param page * @param taskSearchDTO * @return */ - R queryContract(TaskSearchDTO taskSearchDTO); + R queryContract(IPage page,TaskSearchDTO taskSearchDTO); - List allocationDetailByPackage(TaskSearchDTO taskSearchDTO); + /** + * 盘点定制平数据 + * + * @param page + * @param taskSearchDTO + * @return + */ + IPage allocationDetailByPackage(IPage page, TaskSearchDTO taskSearchDTO); - List allocationDetailByZero(TaskSearchDTO taskSearchDTO); + /** + * 盘点零担数据 + * + * @param page + * @param taskSearchDTO + * @return + */ + IPage allocationDetailByZero(IPage page,TaskSearchDTO taskSearchDTO); - List allocationDetailByStock(TaskSearchDTO taskSearchDTO); + /** + * 盘点库存平数据 + * + * @param page + * @param taskSearchDTO + * @return + */ + IPage allocationDetailByStock(IPage page,TaskSearchDTO taskSearchDTO); void updateQuestSetail(TaskSearchDTO taskSearchDTO); @@ -118,10 +141,12 @@ public interface ITaskQuestService extends BaseService { /** * 盘点合同查询详情 + * + * @param page * @param taskSearchDTO * @return */ - R contractQuestDetail(TaskSearchDTO taskSearchDTO); + R contractQuestDetail(IPage page,TaskSearchDTO taskSearchDTO); IPage selectStrip(IPage page,Long id); @@ -132,4 +157,14 @@ public interface ITaskQuestService extends BaseService { R questScanAllcation(TaskSearchDTO taskSearchDTO); R selectPackageInfo(TaskSearchDTO taskSearchDTO); + + /** + * 查询盘点任务数据任务 + * + * @param page + * @param questNum + * @param questDetail + * @return + */ + IPage selectTaskInfo(IPage page, String questNum, QuestDetailEntity questDetail); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionRecordService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionRecordService.java index bcd26b8b6..11d5111e9 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionRecordService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionRecordService.java @@ -19,6 +19,8 @@ package com.logpm.warehouse.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.warehouse.dto.RetentionDTO; +import com.logpm.warehouse.dto.WarehouseRetentionRecordDTO; +import com.logpm.warehouse.dto.WarehouseRetentionScanDTO; import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity; import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel; import com.logpm.warehouse.vo.WarehouseRetentionRecordVO; @@ -27,6 +29,7 @@ import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import java.util.List; +import java.util.Map; /** * 滞留记录 服务类 @@ -44,14 +47,6 @@ public interface IWarehouseRetentionRecordService extends BaseService selectWarehouseRetentionRecordPage(IPage page, WarehouseRetentionRecordVO warehouseRetentionRecord); - - /** - * 导出数据 - * - * @param queryWrapper - * @return - */ - List exportWarehouseRetentionRecord(Wrapper queryWrapper); /** * 滞留运单 * warehouseWaybillDetentionVO @@ -62,4 +57,20 @@ public interface IWarehouseRetentionRecordService extends BaseService retentionPackageList(RetentionDTO retentionDTO); R retentionScanPackage(String orderPackageCode); + + /** + * PDA查询初始化滞留扫描页 + * @param deliveryId + * @return + */ + WarehouseRetentionRecordVO initRetentionList(Long deliveryId); + + /** + * 滞留列表提交 创建滞留任务 + * @param warehouseRetentionScanDTOS + * @return + */ + R saveRetentionList(WarehouseRetentionRecordDTO warehouseRetentionScanDTOS); + + List exportWarehouseRetentionRecord(Map paramMap); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionScanService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionScanService.java index 5c43e2950..4278d6b14 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionScanService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionScanService.java @@ -17,6 +17,8 @@ package com.logpm.warehouse.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.warehouse.dto.WarehouseRetentionRecordDTO; +import com.logpm.warehouse.dto.WarehouseRetentionScanDTO; import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity; import com.logpm.warehouse.entity.WarehouseRetentionScanEntity; import com.logpm.warehouse.excel.WarehouseRetentionScanExcel; @@ -24,6 +26,7 @@ import com.logpm.warehouse.vo.WarehouseRetentionRecordVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.logpm.warehouse.vo.WarehouseRetentionScanVO; +import org.springblade.core.tool.api.R; import java.util.List; @@ -52,4 +55,6 @@ public interface IWarehouseRetentionScanService extends IService exportWarehouseRetentionRecord(Wrapper queryWrapper); +// R saveRetentionList(WarehouseRetentionRecordDTO warehouseRetentionRecordEntity); + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java index 58f6d5356..0aa8bb087 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java @@ -25,6 +25,7 @@ import com.logpm.warehouse.vo.WarehouseScanRecordVO; import org.springblade.core.mp.base.BaseService; import java.util.List; +import java.util.Map; /** * 备货扫描记录 服务类 @@ -42,17 +43,10 @@ public interface IWarehouseStockService extends BaseService selectWarehouseStockPage(IPage page, WarehouseScanRecordVO warehouseScanRecordVO); - - /** - * 导出数据 - * - * @param queryWrapper - * @return - */ - List exportWarehouseStock(Wrapper queryWrapper); - /** * 库存品扫描记录 自定义分页 */ IPage selectWarehouseStockInventoryPage(IPage page, WarehouseScanInventoryRecordVO warehouseScanRecordVO); + + List exportWarehouseStock(Map paramMap); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayTypeService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayTypeService.java index 03a74f126..c7d84beed 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayTypeService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayTypeService.java @@ -89,4 +89,6 @@ public interface IWarehouseTrayTypeService extends BaseService selectWarehouseUpdownGoodsLogPage(IPage page, WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLog); - - /** - * 导出数据 - * - * @param queryWrapper - * @return - */ - List exportWarehouseUpdownGoodsLog(Wrapper queryWrapper); - void saveAllocationAndPackage(WarehouseUpdownTypeEntity updownTypeEntity, DistributionParcelListEntity parcelListEntity, String bindingType,Integer isAlltrays,String remark); /** * 自定义库存品 @@ -69,4 +62,10 @@ public interface IWarehouseUpdownGoodsLogService extends BaseService selectWarehouseUpdownGoodsLogtruckloadpage(IPage page, WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLog); + + List exportCustomized(Map paramMap); + + List exportStock(Map paramMap); + + List exportTemporary(Map paramMap); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java index 35bc1a6a2..d6672e740 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java @@ -39,6 +39,8 @@ public interface IWarehouseUpdownTypeService extends BaseService upShelfPackageList,Long warehouseId); + R downPackageOrDelTray(List upShelfPackageList,Long warehouseId); + R downZeroOrder(List upShelfPackageList,Long warehouseId); R downEnterStock(String code, Integer stockType, Long marketId,Long warehouseId); 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 93f71fe0d..c6ff201ba 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 @@ -22,11 +22,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO; import com.logpm.warehouse.entity.WarehouseWarehouseEntity; import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity; +import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel; import com.logpm.warehouse.excel.WarehousingEntryDetailExcel; import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO; import org.springblade.core.mp.base.BaseService; import java.util.List; +import java.util.Map; /** * 仓库入库单 服务类 @@ -68,4 +70,6 @@ public interface IWarehouseWarehousingEntryService extends BaseService data, Boolean isCovered); + + List exportWarehouseWarehousing(Map paramMap); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java index ac9da04b6..07cdb3e8c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java @@ -6,10 +6,12 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.warehouse.dto.SplitOrderDTO; import com.logpm.warehouse.dto.WaybillDTO; import com.logpm.warehouse.entity.WarehouseWaybillEntity; +import com.logpm.warehouse.excel.WarehouseWaybillExcel; import com.logpm.warehouse.vo.WarehouseWaybillVO; import org.springblade.core.mp.base.BaseService; import java.util.List; +import java.util.Map; /** * 运单;(logpm_mainline_waybill)表服务接口 @@ -36,4 +38,12 @@ public interface IWarehouseWaybillService extends BaseService selectPage(IPage page, QueryWrapper queryWrapper); + /** + * 导出 + * @param warehouseWaybillEntity + * @return + */ + List exportWarehouseWarehousingDetail(Map warehouseWaybillEntity); + + IPage pageInfo(IPage page, Map warehouseWaybill); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 1a6405871..13b157f4f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -16,13 +16,12 @@ */ package com.logpm.warehouse.service.impl; -import cn.hutool.log.Log; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.basicdata.entity.*; import com.logpm.basicdata.feign.*; import com.logpm.distribution.entity.DistributionParcelListEntity; @@ -31,6 +30,7 @@ import com.logpm.distribution.entity.DistributionStockListEntity; import com.logpm.distribution.feign.IDistributionParcelListClient; import com.logpm.distribution.feign.IDistributionStockArticleClient; import com.logpm.distribution.feign.IDistributionStockListClient; +import com.logpm.distribution.vo.DistributionParcelListVO; import com.logpm.distribution.vo.DistributionStockListVO; import com.logpm.warehouse.bean.Resp; import com.logpm.warehouse.dto.QuestDetailDTO; @@ -46,11 +46,12 @@ import com.logpm.warehouse.vo.*; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springblade.common.constant.common.IsOrNoConstant; -import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; import org.springblade.core.log.exception.ServiceException; 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.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; @@ -90,7 +91,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl refId,String questNum,Long taskQuest){ + //查询表存在么 + String s = baseMapper.selectExitsInfo(questNum); + if(ObjectUtils.isNotNull(s)){ + throw new ServiceException("任务表已存在！"); + }else{ + //创建任务明细表 + baseMapper.createdTable(questNum); + //创建任务明细盘点表 + baseMapper.createdTableChild(questNum + "_child"); + } + if(ObjectUtils.isNull(refId) || refId.isEmpty()){ + //全部 + DistributionParcelListVO stockArticleEntity = new DistributionParcelListVO(); + stockArticleEntity.setWarehouseId(warehouseId); + getParcelListNumber(stockArticleEntity,questNum,taskQuest); + }else{ + //部分 + for (Long l : refId) { + DistributionParcelListVO stockArticleEntity = new DistributionParcelListVO(); + stockArticleEntity.setWarehouseId(warehouseId); + stockArticleEntity.setMallId(l); + getParcelListNumber(stockArticleEntity,questNum,taskQuest); + } + + } + + } + + /** + * 查询盘点包件数据 + * @param stockArticleEntity + * @param questNum + * @param taskQuest + */ + public void getParcelListNumber(DistributionParcelListVO stockArticleEntity,String questNum,Long taskQuest){ + List parcelListInfo = distributionParcelListClient.getParcelListInfo(stockArticleEntity); + BladeUser user = AuthUtil.getUser(); + if(!parcelListInfo.isEmpty()){ + List detailEntityList = new ArrayList<>(); + parcelListInfo.stream().forEach( i ->{ + + QuestDetailEntity detailEntity = new QuestDetailEntity(); + detailEntity.setId(getTaskID()); + detailEntity.setCreateTime(new Date()); + detailEntity.setTenantId(user.getTenantId()); + detailEntity.setCreateUser(user.getUserId()); + detailEntity.setCreateDept(Long.valueOf(user.getDeptId())); + detailEntity.setIsDeleted(0); + detailEntity.setStatus(1); + detailEntity.setQuestId(taskQuest); + detailEntity.setOrderCode(i.getOrderCode()); + detailEntity.setOrderId(i.getStockArticleId()); +// detailEntity.setQuestType(); + //盘点对象;1.定制品 2零担 3 库存品 + detailEntity.setQuestTarget(1); + detailEntity.setOrdePackageCode(i.getOrderPackageCode()); + detailEntity.setWaybillNumber(i.getWaybillNumber()); + detailEntity.setOrderPackageId(i.getId()); + detailEntity.setCategoryName(i.getFirsts()); + detailEntity.setStockId(i.getStockId()); //库存品ID + detailEntity.setQuestStatus(0); + detailEntity.setStockNum(ObjectUtils.isNotNull(i.getQuantity()) ? i.getQuantity() : 0); + detailEntity.setWarehouseId(i.getWarehouseId()); + detailEntity.setPositionCode(i.getPositionCode()); + detailEntity.setTrayCode(i.getTrayCode()); +// detailEntity.setGroundingAllocationId(); +// detailEntity.setGroundingPositionCode(); + detailEntity.setTrayId(i.getTrayId()); + detailEntity.setAllocationId(i.getAllocationId()); + detailEntity.setIsNew(0); + + detailEntity.setMaterialCode(i.getMaterialCode()); + detailEntity.setMaterialName(i.getMaterialName()); + detailEntity.setMarketName(i.getMallName()); + detailEntity.setIncomingBatch(i.getOrderCode()); + detailEntityList.add(detailEntity); + + }); + //查询零担数据 + DistributionStockArticleEntity stockArticle = new DistributionStockArticleEntity(); + stockArticle.setWarehouseId(stockArticleEntity.getWarehouseId()); + stockArticle.setMallId(ObjectUtils.isNotNull(stockArticleEntity.getMallId()) ? stockArticleEntity.getMallId() : null); + stockArticle.setIsZero("1"); + List stockArticleInfo = distributionStockArticleClient.getStockArticleInfo(stockArticle); + if(!stockArticleInfo.isEmpty()){ + detailEntityList.addAll(handleIsZeroList(stockArticleInfo,taskQuest)); + } + + //查询库存平数据 + DistributionStockListEntity stockListEntity = new DistributionStockListEntity(); + stockListEntity.setWarehouseId(stockArticleEntity.getWarehouseId()); + stockListEntity.setMarketId(ObjectUtils.isNotNull(stockArticleEntity.getMallId()) ? stockArticleEntity.getMallId() : null); + List stockListInfo = distributionStockListClient.getStockListInfo(stockListEntity); + if(!stockListInfo.isEmpty()){ + detailEntityList.addAll(handleStockList(stockListInfo,taskQuest)); +// stockListInfo.stream().forEach( li ->{ +// QuestDetailEntity detailListEntity = new QuestDetailEntity(); +// detailListEntity.setCreateTime(new Date()); +// detailListEntity.setTenantId(user.getTenantId()); +// detailListEntity.setCreateUser(user.getUserId()); +// detailListEntity.setCreateDept(Long.valueOf(user.getDeptId())); +// detailListEntity.setIsDeleted(0); +// detailListEntity.setStatus(1); +// detailListEntity.setQuestId(taskQuest); +// detailListEntity.setOrderCode(li.getOrderCode()); +// //盘点对象;1.定制品 2零担 3 库存品 +// detailListEntity.setQuestTarget(3); +// detailListEntity.setWaybillNumber(li.getIncomingBatch()); +// detailListEntity.setStockId(li.getId()); //库存品ID +// detailListEntity.setQuestStatus(0); +// detailListEntity.setStockNum(li.getQuantityStock()); +// detailListEntity.setWarehouseId(li.getWarehouseId()); +// detailListEntity.setPositionCode(li.getPositionCode()); +// detailListEntity.setTrayCode(li.getTrayCode()); +// detailListEntity.setTrayId(li.getTrayId()); +// detailListEntity.setAllocationId(li.getAllocationId()); +// detailListEntity.setIsNew(0); +// +// detailListEntity.setMaterialCode(li.getCargoNumber()); +// detailListEntity.setMaterialName(li.getDescriptionGoods()); +// detailListEntity.setMarketName(li.getMallName()); +// detailListEntity.setIncomingBatch(li.getIncomingBatch()); +// detailEntityList.add(detailListEntity); +// }); + } + + if(!detailEntityList.isEmpty()){ + + int batchSize = 1000; // 设置批处理的大小 + int totalSize = detailEntityList.size(); // 获取总数据量 + + for (int i = 0; i < totalSize; i += batchSize) { + int endIndex = Math.min(i + batchSize, totalSize); + List subList = detailEntityList.subList(i, endIndex); + baseMapper.insertQuestDetail(questNum, subList); + } + + } + + } +} + + /** + * 生成Id + * @return + */ + public Long getTaskID(){ + Random random = new Random(); + long min = 100000000000000000L; // 最小值为10的18次方 + long max = 9223372036854775807L; // Long类型的最大值 + return min + (long) (random.nextDouble() * (max - min)); +} + + /** + * 查询零担数据 + */ + public List handleIsZeroList(List stockArticleInfo,Long taskQuest){ + List detailEntityList = new ArrayList<>(); + BladeUser user = AuthUtil.getUser(); + //处理库位，托盘 + stockArticleInfo.stream().forEach( i ->{ + QuestDetailEntity detailEntity = new QuestDetailEntity(); + detailEntity.setId(getTaskID()); + detailEntity.setCreateTime(new Date()); + detailEntity.setTenantId(user.getTenantId()); + detailEntity.setCreateUser(user.getUserId()); + detailEntity.setCreateDept(Long.valueOf(user.getDeptId())); + detailEntity.setIsDeleted(0); + detailEntity.setStatus(1); + detailEntity.setQuestId(taskQuest); + detailEntity.setOrderCode(i.getOrderCode()); + detailEntity.setOrderId(i.getId()); +// detailEntity.setQuestType(); + //盘点对象;1.定制品 2零担 3 库存品 + detailEntity.setQuestTarget(2); +// detailEntity.setOrdePackageCode(i.getOrderPackageCode()); + detailEntity.setWaybillNumber(i.getWaybillNumber()); +// detailEntity.setOrderPackageId(i.getId()); + detailEntity.setCategoryName(i.getDescriptionGoods()); +// detailEntity.setStockId(i.getStockId()); //库存品ID + detailEntity.setQuestStatus(0); + detailEntity.setMarketName(i.getMallName()); + detailEntity.setIncomingBatch(i.getOrderCode()); + detailEntity.setWarehouseId(i.getWarehouseId()); + detailEntity.setIsNew(0); + //查询货位 + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("warehouse_id",i.getWarehouseId()); + qw.eq("association_id",i.getId()); + qw.eq("incoming_batch",i.getOrderCode()); + qw.eq("market_id",i.getMallId()); + List updownGoodsList = warehouseUpdownGoodsMapper.selectList(qw); + if(!updownGoodsList.isEmpty()){ + updownGoodsList.stream().forEach( ii ->{ + QuestDetailEntity qq = new QuestDetailEntity(); + BeanUtil.copyProperties(detailEntity,qq); + qq.setId(getTaskID()); + qq.setPositionCode(ii.getPositionCode()); + qq.setAllocationId(String.valueOf(ii.getAllocationId())); + qq.setMaterialName(ii.getMarketName()); + BasicdataTrayEntity trayByAllocationId = taryAllocationService.getTrayByAllocationId(ii.getAllocationId()); + if(ObjectUtils.isNotNull(trayByAllocationId)){ + List tray = chuLiKuCun(i, trayByAllocationId.getId()); + if(!tray.isEmpty()){ + qq.setTrayCode(tray.get(0).getTrayCode()); + qq.setTrayId(String.valueOf(tray.get(0).getTrayId())); + qq.setStockNum(ObjectUtils.isNotNull(tray.get(0).getNum()) ? tray.get(0).getNum() : 0); + } + } + qq.setStockNum(ObjectUtils.isNotNull(ii.getNum()) ? ii.getNum() : 0); + detailEntityList.add(qq); + }); + }else{ + List warehouseTrayGoodsEntities = chuLiKuCun(i, null); + if(!warehouseTrayGoodsEntities.isEmpty()){ + warehouseTrayGoodsEntities.stream().forEach( ta ->{ + QuestDetailEntity aa = new QuestDetailEntity(); + BeanUtil.copyProperties(detailEntity,aa); + aa.setId(getTaskID()); + aa.setTrayCode(ta.getTrayCode()); + aa.setTrayId(String.valueOf(ta.getTrayId())); + aa.setStockNum(ObjectUtils.isNotNull(ta.getNum()) ? ta.getNum() : 0); + detailEntityList.add(aa); + }); + } + } + detailEntity.setStockNum(ObjectUtils.isNotNull(i.getHandQuantity()) ? i.getHandQuantity() : 0); + detailEntityList.add(detailEntity); + + }); + return detailEntityList; +} + + /** + * 查询库存平数据 + */ + public List handleStockList(List stockListInfo,Long taskQuest){ + List detailEntityList = new ArrayList<>(); + BladeUser user = AuthUtil.getUser(); + //处理库位，托盘 + stockListInfo.stream().forEach( i ->{ + QuestDetailEntity detailEntity = new QuestDetailEntity(); + detailEntity.setId(getTaskID()); + detailEntity.setCreateTime(new Date()); + detailEntity.setTenantId(user.getTenantId()); + detailEntity.setCreateUser(user.getUserId()); + detailEntity.setCreateDept(Long.valueOf(user.getDeptId())); + detailEntity.setIsDeleted(0); + detailEntity.setStatus(1); + detailEntity.setQuestId(taskQuest); + detailEntity.setOrderCode(i.getOrderCode()); + detailEntity.setOrderId(i.getId()); +// detailEntity.setQuestType(); + //盘点对象;1.定制品 2零担 3 库存品 + detailEntity.setQuestTarget(3); +// detailEntity.setOrdePackageCode(i.getOrderPackageCode()); + detailEntity.setWaybillNumber(i.getIncomingBatch()); +// detailEntity.setOrderPackageId(i.getId()); + detailEntity.setCategoryName(i.getDescriptionGoods()); + detailEntity.setStockId(i.getId()); //库存品ID + detailEntity.setQuestStatus(0); + detailEntity.setMarketName(i.getMallName()); + detailEntity.setIncomingBatch(i.getOrderCode()); + detailEntity.setWarehouseId(i.getWarehouseId()); + detailEntity.setIsNew(0); + //查询货位 + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("warehouse_id",i.getWarehouseId()); + qw.eq("association_id",i.getMaterialId()); + qw.eq("incoming_batch",i.getIncomingBatch()); + qw.eq("market_id",i.getMarketId()); + List updownGoodsList = warehouseUpdownGoodsMapper.selectList(qw); + if(!updownGoodsList.isEmpty()){ + updownGoodsList.stream().forEach( ii ->{ + QuestDetailEntity a = new QuestDetailEntity(); + BeanUtil.copyProperties(detailEntity,a); + a.setId(getTaskID()); + a.setPositionCode(ii.getPositionCode()); + a.setAllocationId(String.valueOf(ii.getAllocationId())); + a.setMaterialName(ii.getMarketName()); + BasicdataTrayEntity trayByAllocationId = taryAllocationService.getTrayByAllocationId(ii.getAllocationId()); + if(ObjectUtils.isNotNull(trayByAllocationId)){ + List tray = chuLiKuCunLing(i, trayByAllocationId.getId()); + if(!tray.isEmpty()){ + a.setTrayCode(tray.get(0).getTrayCode()); + a.setTrayId(String.valueOf(tray.get(0).getTrayId())); + a.setStockNum(ObjectUtils.isNotNull(tray.get(0).getNum()) ? tray.get(0).getNum() : 0); + } + } + a.setStockNum(ObjectUtils.isNotNull(ii.getNum()) ? ii.getNum() : 0); + detailEntityList.add(a); + }); + }else{ + List warehouseTrayGoodsEntities = chuLiKuCunLing(i, null); + if(!warehouseTrayGoodsEntities.isEmpty()){ + warehouseTrayGoodsEntities.stream().forEach( ta ->{ + QuestDetailEntity detailEntityTray = new QuestDetailEntity(); + BeanUtil.copyProperties(detailEntity,detailEntityTray); + detailEntityTray.setId(getTaskID()); + detailEntityTray.setTrayCode(ta.getTrayCode()); + detailEntityTray.setTrayId(String.valueOf(ta.getTrayId())); + detailEntityTray.setStockNum(ObjectUtils.isNotNull(ta.getNum() ) ? ta.getNum() : 0); + detailEntityList.add(detailEntityTray); + }); + } + } + detailEntity.setStockNum(ObjectUtils.isNotNull( i.getQuantityStock()) ? i.getQuantityStock() : 0); + detailEntityList.add(detailEntity); + + }); + return detailEntityList; +} + + /** + * 查询零担托盘数据 + * @param distributionStockArticle + * @return + */ + public List chuLiKuCun(DistributionStockArticleEntity distributionStockArticle ,Long id){ + + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("warehouse_id",distributionStockArticle.getWarehouseId()); + qw.eq("association_id",distributionStockArticle.getId()); + qw.eq("incoming_batch",distributionStockArticle.getOrderCode()); + qw.eq("market_id",distributionStockArticle.getMallId()); + if(ObjectUtils.isNotNull(id)){ + qw.eq("tray_id",id); + } + return warehouseTrayGoodsMapper.selectList(qw); + } + /** + * 查询库存托盘数据 + * @param distributionStockArticle + * @return + */ + public List chuLiKuCunLing(DistributionStockListEntity distributionStockArticle ,Long id){ + + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("warehouse_id",distributionStockArticle.getWarehouseId()); + qw.eq("association_id",distributionStockArticle.getMaterialId()); + qw.eq("incoming_batch",distributionStockArticle.getIncomingBatch()); + qw.eq("market_id",distributionStockArticle.getMarketId()); + if(ObjectUtils.isNotNull(id)){ + qw.eq("tray_id",id); + } + return warehouseTrayGoodsMapper.selectList(qw); + } + @Override public R saveCustom(TaskQuestDTO taskQuest) { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); @@ -133,7 +486,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl 0) { @@ -141,9 +498,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl collect = list.stream().map(TaskQuestChildEntity::getRefId).collect(Collectors.toList()); + addQuestDetail(myCurrentWarehouse.getId(),collect,questNum,taskQuest.getId()); + }else{ + addQuestDetail(myCurrentWarehouse.getId(),null,questNum,taskQuest.getId()); } + return save ? R.success("添加成功") : R.fail("添加失败"); } @@ -214,7 +578,15 @@ public class TaskQuestServiceImpl extends BaseServiceImpl selectallocationList(TaskSearchDTO taskSearchDTO) { - List list = baseMapper.selectallocationList(taskSearchDTO); + try { + TaskQuestEntity taskQuestEntity = baseMapper.selectById(taskSearchDTO.getQuestId()); + List list = baseMapper.selectallocationList(taskQuestEntity.getQuestNum(),taskSearchDTO); + return list; + }catch (Exception e){ + log.debug(e.getMessage()); + return new ArrayList<>(); + } + // if (!list.isEmpty()) { // for (TaskallocationVO taskallocationVO : list) { // Long allocationId = taskallocationVO.getAllocationId(); @@ -222,23 +594,27 @@ public class TaskQuestServiceImpl extends BaseServiceImpl selectcontractList(IPage page, TaskSearchDTO taskSearchDTO) { + public IPage selectcontractList(IPage page, TaskSearchDTO taskSearchDTO) { List collect = this.getmyWarehouseList(); baseMapper.setSqlMode(); String goodsType = taskSearchDTO.getGoodsType(); - LambdaQueryWrapper queryWrapper = Wrappers.query().lambda() - .eq(QuestDetailEntity::getQuestType, 3) - .eq(QuestDetailEntity::getQuestId, taskSearchDTO.getTaskId()); +// LambdaQueryWrapper queryWrapper = Wrappers.query().lambda() +// .eq(QuestDetailEntity::getQuestType, 3) +// .eq(QuestDetailEntity::getQuestId, taskSearchDTO.getTaskId()); List list = new ArrayList<>(); - List questDetailEntityList = questDetailService.list(queryWrapper); + TaskQuestEntity taskQuestEntity = baseMapper.selectById(taskSearchDTO.getTaskId()); + QuestDetailEntity questDetail = new QuestDetailEntity(); + questDetail.setQuestId( taskSearchDTO.getTaskId()); + questDetail.setQuestType(3); + IPage taskPageList = new Page<>(); + IPage questDetailEntityList = baseMapper.selectTaskInfo(page,taskQuestEntity.getQuestNum(),questDetail); if (Func.isEmpty(questDetailEntityList)){ return null; } - Map> questDetailMap = questDetailEntityList.stream().collect(Collectors.groupingBy(QuestDetailEntity::getQuestTarget)); + Map> questDetailMap = questDetailEntityList.getRecords().stream().collect(Collectors.groupingBy(QuestDetailEntity::getQuestTarget)); //订制品 List questDetailEntities = questDetailMap.get(1); List zeroQuestDetailEntities = questDetailMap.get(2); @@ -298,12 +674,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl page, TaskSearchDTO taskSearchDTO) { + public R selecttrayList(IPage page, TaskSearchDTO taskSearchDTO) { //todo 验证盘点信息 //先判定盘点任务是否已结束 @@ -328,21 +704,21 @@ public class TaskQuestServiceImpl extends BaseServiceImpl list = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId()); + List list = getQuestDetailList( page,taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId()); // List list = getTaskTrayInfo(page,taskSearchDTO,collect);// 查询有没有当次盘点任务的托盘数据 if (!list.isEmpty()){ //有盘点数据 return R.data(getTaskTrayInfo(list)); }else{ //添加扫描的托盘信息 //添加托盘上面的数据 - int taskInventory = getTaskInventory(taskSearchDTO.getTaskId(), collect.get(0), trayByTrayCode); + int taskInventory = getTaskInventory(taskSearchDTO, collect.get(0), trayByTrayCode); switch (taskInventory){ case 0: log.debug("全仓盘点"); //返回托盘信息 return getTrayInfo(trayByTrayCode.getId(),myCurrentWarehouse.getId(),trayByTrayCode.getPalletCode()); case 1: - List questDetailList = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId()); + List questDetailList = getQuestDetailList(page,taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId()); return R.data(getTaskTrayInfo(questDetailList)); case 2: //返回托盘信息 @@ -356,7 +732,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl list1 = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),null); + List list1 = getQuestDetailList(page,taskSearchDTO,myCurrentWarehouse.getId(),null); if(!list1.isEmpty()){ // int sum = list1.stream().mapToInt(QuestDetailEntity::getStockNum).sum(); //总数 return R.data(getTaskTrayInfo(list1)); @@ -413,7 +789,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl { TaskTrayVO taskTrayVO = new TaskTrayVO(); - taskTrayVO.setTrayId(k); + taskTrayVO.setTrayId(Long.valueOf(k)); AtomicReference num = new AtomicReference<>(0); //总数 AtomicReference unTotal = new AtomicReference<>(0); //盘点数 v.forEach( p ->{ @@ -452,18 +828,21 @@ public class TaskQuestServiceImpl extends BaseServiceImpl{ - taskTrayVO.setTrayId(k); + taskTrayVO.setTrayId(Long.valueOf(k)); AtomicReference num = new AtomicReference<>(0); //总数 AtomicReference unTotal = new AtomicReference<>(0); //盘点数 List detailVOS = new ArrayList<>(); + v.forEach( p ->{ + TaskQuestEntity taskQuestEntity = baseMapper.selectById(p.getQuestId()); + taskTrayVO.setTrayCode(p.getTrayCode()); num.set(num.get() + p.getStockNum()); if(p.getQuestStatus().equals(1) && p.getIsNew().equals(0)){ - List list = questDetailChildService.list(Wrappers.query().lambda() - .eq(QuestDetailChildEntity::getQuestDetailId, p.getId()) - .eq(QuestDetailChildEntity::getWarehouseId, warehouseId) - ); + QuestDetailChildEntity questDetailChildEntity = new QuestDetailChildEntity(); + questDetailChildEntity.setQuestDetailId(p.getId()); + questDetailChildEntity.setWarehouseId(warehouseId); + List list = getQuestDetailInfo(taskQuestEntity.getQuestNum()+"_child",questDetailChildEntity); if(!list.isEmpty()){ int sum = list.stream().mapToInt(QuestDetailChildEntity::getQuestNum).sum(); unTotal.set(unTotal.get() + sum); @@ -490,11 +869,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl list = questDetailChildService.list(Wrappers.query().lambda() - .eq(QuestDetailChildEntity::getQuestDetailId, p.getId()) - .eq(QuestDetailChildEntity::getWarehouseId, p.getWarehouseId()) - .eq(QuestDetailChildEntity::getWarehouseId, p.getWarehouseId()) - ); + QuestDetailChildEntity questDetailChildEntity = new QuestDetailChildEntity(); + questDetailChildEntity.setQuestDetailId(p.getId()); + questDetailChildEntity.setWarehouseId(p.getWarehouseId()); + + List list = getQuestDetailInfo(taskQuestEntity.getQuestNum()+"_child",questDetailChildEntity); questDetailVO.setList(list); detailVOS.add(questDetailVO); }); @@ -506,6 +885,13 @@ public class TaskQuestServiceImpl extends BaseServiceImpl getQuestDetailInfo(String questNum, QuestDetailChildEntity questDetailChildEntity){ + + return baseMapper.selectQuestDetailChildInfo(questNum,questDetailChildEntity); + } + + + /** * 查询托盘里面的信息 * @@ -514,13 +900,21 @@ public class TaskQuestServiceImpl extends BaseServiceImpl getQuestDetailList(TaskSearchDTO taskSearchDTO,Long warehouseId,Long trayId){ - return questDetailService.list(Wrappers.query().lambda() - .eq(QuestDetailEntity::getWarehouseId, warehouseId) - .eq(QuestDetailEntity::getQuestId, taskSearchDTO.getTaskId()) - .eq(ObjectUtils.isNotNull(trayId),QuestDetailEntity::getTrayId, trayId) - .eq(QuestDetailEntity::getQuestType, 4) - ); + private List getQuestDetailList(IPage page,TaskSearchDTO taskSearchDTO,Long warehouseId,Long trayId){ + TaskQuestEntity taskQuestEntity = baseMapper.selectById(taskSearchDTO.getTaskId()); +// Wrappers.query().lambda() +// .eq(QuestDetailEntity::getWarehouseId, warehouseId) +// .eq(QuestDetailEntity::getQuestId, taskSearchDTO.getTaskId()) +// .eq(c,QuestDetailEntity::getTrayId, trayId) +// .eq(QuestDetailEntity::getQuestType, 4); + QuestDetailEntity questDetail = new QuestDetailEntity(); + questDetail.setWarehouseId(warehouseId); + questDetail.setQuestId(taskSearchDTO.getTaskId()); + questDetail.setQuestType(4); + if(ObjectUtils.isNotNull(trayId)){ + questDetail.setTrayId(String.valueOf(trayId)); + } + return baseMapper.selectTaskTrayInfo( page,taskQuestEntity.getQuestNum(),questDetail); } /** @@ -533,7 +927,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl page, TaskSearchDTO taskSearchDTO) { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - List questDetailList = getQuestDetailList(taskSearchDTO, myCurrentWarehouse.getId(), taskSearchDTO.getTrayId()); + List questDetailList = getQuestDetailList(page,taskSearchDTO, myCurrentWarehouse.getId(), taskSearchDTO.getTrayId()); @@ -544,16 +938,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl list = taskQuestChildService.list(Wrappers.query().lambda() - .eq(TaskQuestChildEntity::getQuestId, taskId) + .eq(TaskQuestChildEntity::getQuestId, taskSearchDTO.getTaskId()) ); if (!list.isEmpty()) { boolean b = list.stream().anyMatch(t -> ObjectUtils.isNotNull(t.getRefId())); @@ -567,7 +961,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl queryData1 = Optional.ofNullable(queryData); if(queryData1.isPresent()){ @@ -653,14 +1047,15 @@ public class TaskQuestServiceImpl extends BaseServiceImpl allocationDetailByPackage(TaskSearchDTO taskSearchDTO) { + public IPage allocationDetailByPackage(IPage page, TaskSearchDTO taskSearchDTO) { Long allocationId = taskSearchDTO.getAllocationId(); Long warehouseId = taskSearchDTO.getWarehouseId(); @@ -754,34 +1149,42 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questDetailEntityQueryWrapper = new QueryWrapper<>(); - questDetailEntityQueryWrapper.eq("quest_id", questId) - .eq("quest_type", 2) - .eq("quest_target", 1) - .eq("warehouse_id", warehouseId) - .eq("allocation_id", allocationId) - .eq("is_deleted", 0); - List questDetailEntities = questDetailService.list(questDetailEntityQueryWrapper); - if (!questDetailEntities.isEmpty()) { +// QueryWrapper questDetailEntityQueryWrapper = new QueryWrapper<>(); +// questDetailEntityQueryWrapper.eq("quest_id", questId) +// .eq("quest_type", 2) +// .eq("quest_target", 1) +// .eq("warehouse_id", warehouseId) +// .eq("allocation_id", allocationId) +// .eq("is_deleted", 0); + TaskQuestEntity byId = baseMapper.selectById(questId); + QuestDetailEntity questDetail = new QuestDetailEntity(); + questDetail.setQuestId(questId); +// questDetail.setQuestType(2); + questDetail.setQuestTarget(1); + questDetail.setWarehouseId(warehouseId); + questDetail.setAllocationId(String.valueOf(allocationId)); + IPage questDetailEntities = baseMapper.selectTaskInfo(page,byId.getQuestNum(),questDetail); +// List questDetailEntities = questDetailService.list(questDetailEntityQueryWrapper); + if (!questDetailEntities.getRecords().isEmpty()) { return questDetailEntities; } - + return null; //如果还没有存入 //查询货位上的所有包条 //然后存入detail表 - List list = warehouseUpdownGoodsMapper.allocationDetailByPackage(taskSearchDTO); +// List list = warehouseUpdownGoodsMapper.allocationDetailByPackage(taskSearchDTO); // if(list.isEmpty()){ // log.warn("###########allocationDetailByPackage: 未有数据在盘点计划中 questId={}",questId); // throw new CustomerException(403,"未有数据在盘点计划中"); // } - questDetailService.saveList(list, questId); - - return list; +// questDetailService.saveList(list, questId); +// +// return list; } @Override - public List allocationDetailByZero(TaskSearchDTO taskSearchDTO) { + public IPage allocationDetailByZero(IPage page, TaskSearchDTO taskSearchDTO) { Long questId = taskSearchDTO.getQuestId(); Long allocationId = taskSearchDTO.getAllocationId(); Long warehouseId = taskSearchDTO.getWarehouseId(); @@ -804,33 +1207,42 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questDetailEntityQueryWrapper = new QueryWrapper<>(); - questDetailEntityQueryWrapper.eq("quest_id", questId) - .eq("quest_type", 2) - .eq("quest_target", 2) - .eq("warehouse_id", warehouseId) - .eq("allocation_id", allocationId) - .eq("is_deleted", 0); - List questDetailEntities = questDetailService.list(questDetailEntityQueryWrapper); - if (!questDetailEntities.isEmpty()) { +// QueryWrapper questDetailEntityQueryWrapper = new QueryWrapper<>(); +// questDetailEntityQueryWrapper.eq("quest_id", questId) +// .eq("quest_type", 2) +// .eq("quest_target", 2) +// .eq("warehouse_id", warehouseId) +// .eq("allocation_id", allocationId) +// .eq("is_deleted", 0); + TaskQuestEntity byId = baseMapper.selectById(questId); + QuestDetailEntity questDetail = new QuestDetailEntity(); + questDetail.setQuestId(questId); +// questDetail.setQuestType(2); + questDetail.setQuestTarget(2); + questDetail.setWarehouseId(warehouseId); + questDetail.setAllocationId(String.valueOf(allocationId)); + IPage questDetailEntities = baseMapper.selectTaskInfo(page,byId.getQuestNum(),questDetail); +// List questDetailEntities = questDetailService.list(questDetailEntityQueryWrapper); + if (!questDetailEntities.getRecords().isEmpty()) { return questDetailEntities; } - + return null; //如果还没有存入 //查询货位上的所有包条 //然后存入detail表 - List list = warehouseUpdownGoodsMapper.allocationDetailByZero(taskSearchDTO); +// List list = warehouseUpdownGoodsMapper.allocationDetailByZero(taskSearchDTO); + // if(list.isEmpty()){ // log.warn("###########allocationDetailByZero: 未有数据在盘点计划中 questId={}",questId); // throw new CustomerException(403,"未有数据在盘点计划中"); // } - questDetailService.saveList(list,questId); +// questDetailService.saveList(list,questId); - return list; +// return list; } @Override - public List allocationDetailByStock(TaskSearchDTO taskSearchDTO) { + public IPage allocationDetailByStock(IPage page, TaskSearchDTO taskSearchDTO) { Long questId = taskSearchDTO.getQuestId(); Long allocationId = taskSearchDTO.getAllocationId(); Long warehouseId = taskSearchDTO.getWarehouseId(); @@ -853,29 +1265,36 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questDetailEntityQueryWrapper = new QueryWrapper<>(); - questDetailEntityQueryWrapper.eq("quest_id", questId) - .eq("quest_type", 2) - .eq("quest_target", 3) - .eq("warehouse_id", warehouseId) - .eq("allocation_id", allocationId) - .eq("is_deleted", 0); - List questDetailEntities = questDetailService.list(questDetailEntityQueryWrapper); - if (!questDetailEntities.isEmpty()) { +// QueryWrapper questDetailEntityQueryWrapper = new QueryWrapper<>(); +// questDetailEntityQueryWrapper.eq("quest_id", questId) +// .eq("quest_type", 2) +// .eq("quest_target", 3) +// .eq("warehouse_id", warehouseId) +// .eq("allocation_id", allocationId) +// .eq("is_deleted", 0); + TaskQuestEntity byId = baseMapper.selectById(questId); + QuestDetailEntity questDetail = new QuestDetailEntity(); + questDetail.setQuestId(questId); +// questDetail.setQuestType(2); + questDetail.setQuestTarget(3); + questDetail.setWarehouseId(warehouseId); + questDetail.setAllocationId(String.valueOf(allocationId)); + IPage questDetailEntities = baseMapper.selectTaskInfo(page,byId.getQuestNum(),questDetail); + if (!questDetailEntities.getRecords().isEmpty()) { return questDetailEntities; } - + return null; //如果还没有存入 //查询货位上的所有包条 //然后存入detail表 - List list = warehouseUpdownGoodsMapper.allocationDetailByStock(taskSearchDTO); +// List list = warehouseUpdownGoodsMapper.allocationDetailByStock(taskSearchDTO); // if(list.isEmpty()){ // log.warn("###########allocationDetailByStock: 未有数据在盘点计划中 questId={}",questId); // throw new CustomerException(403,"未有数据在盘点计划中"); // } - questDetailService.saveList(list,questId); +// questDetailService.saveList(list,questId); - return list; +// return list; } @Transactional @@ -883,14 +1302,17 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questDetailList = taskSearchDTO.getQuestDetailList(); for (QuestDetailDTO questDetailDTO : questDetailList) { Long questDetaiId = questDetailDTO.getId();//明细id - QuestDetailEntity detailEntity = questDetailService.getById(questDetaiId); +// QuestDetailEntity detailEntity = questDetailService.getById(questDetaiId); + QuestDetailEntity questDetail = new QuestDetailEntity(); + questDetail.setId(questDetaiId); + QuestDetailEntity detailEntity = baseMapper.selectOneTaskInfo(taskQuestEntity.getQuestNum(),questDetail); if(Objects.isNull(detailEntity)){ log.warn("###########updateQuestSetail: 盘点明细不存在 questDetaiId={}",questDetaiId); throw new CustomerException(403,"盘点明细不存在"); @@ -901,16 +1323,24 @@ public class TaskQuestServiceImpl extends BaseServiceImpl childList = new ArrayList<>(); - childList.add(addQuestDetailChild(stockNum,"10",questDetaiId,warehouseId)); - childList.add(addQuestDetailChild(wornNum,"20",questDetaiId,warehouseId)); - childList.add(addQuestDetailChild(lossNum,"30",questDetaiId,warehouseId)); - childList.add(addQuestDetailChild(noRepairNum,"40",questDetaiId,warehouseId)); - childList.add(addQuestDetailChild(deliveNum,"50",questDetaiId,warehouseId)); - childList.add(addQuestDetailChild(noReceivedNum,"60",questDetaiId,warehouseId)); - questDetailChildService.saveOrUpdateBatch(childList); + childList.add(addQuestDetailChild(stockNum,"10",questDetaiId,warehouseId,taskQuestEntity.getQuestNum())); + childList.add(addQuestDetailChild(wornNum,"20",questDetaiId,warehouseId,taskQuestEntity.getQuestNum())); + childList.add(addQuestDetailChild(lossNum,"30",questDetaiId,warehouseId,taskQuestEntity.getQuestNum())); + childList.add(addQuestDetailChild(noRepairNum,"40",questDetaiId,warehouseId,taskQuestEntity.getQuestNum())); + childList.add(addQuestDetailChild(deliveNum,"50",questDetaiId,warehouseId,taskQuestEntity.getQuestNum())); + childList.add(addQuestDetailChild(noReceivedNum,"60",questDetaiId,warehouseId,taskQuestEntity.getQuestNum())); + //修改 + baseMapper.updetaQuestDetailChildList(taskQuestEntity.getQuestNum(),childList); +// questDetailChildService.saveOrUpdateBatch(childList); detailEntity.setQuestStatus(1); - questDetailService.updateById(detailEntity); + //修改状态 + QuestDetailEntity q = new QuestDetailEntity(); + q.setQuestStatus(1); + q.setId(detailEntity.getId()); + baseMapper.updateQuestDetailQuestStatus(taskQuestEntity.getQuestNum(),q); } } @@ -955,16 +1385,20 @@ public class TaskQuestServiceImpl extends BaseServiceImpl ls = new ArrayList<>(); for (QuestDetailDTO questDetailDTO : questDetailList) { Long questDetaiId = questDetailDTO.getId();//明细id - QuestDetailEntity detailEntity = questDetailService.getById(questDetaiId); + QuestDetailEntity questDetail = new QuestDetailEntity(); + questDetail.setId(questDetaiId); + QuestDetailEntity detailEntity = baseMapper.selectOneTaskInfo(taskSearchDTO.getQuestNum(),questDetail); if (Objects.isNull(detailEntity)) { log.warn("###########updateQuestSetail: 存在不在盘点计划中的数据 questDetaiId={}", questDetaiId); throw new CustomerException(403, "存在不在盘点计划中的数据"); } detailEntity.setGroundingAllocationId(allocationId); detailEntity.setGroundingPositionCode(goodsAreaEntity.getHeadline() + "-" + basicdataGoodsShelfEntity.getGoodsShelfName() + "-" + goodsAllocationEntity.getGoodsAllocationName()); + detailEntity.setId(questDetaiId); ls.add(detailEntity); } - questDetailService.updateBatchById(ls); +// questDetailService.updateBatchById(ls); + baseMapper.updatePositionCodeList(taskSearchDTO.getQuestNum(),ls); } @@ -981,15 +1415,19 @@ public class TaskQuestServiceImpl extends BaseServiceImpl ls = new ArrayList<>(); for (QuestDetailDTO questDetailDTO : questDetailList) { Long questDetaiId = questDetailDTO.getId();//明细id - QuestDetailEntity detailEntity = questDetailService.getById(questDetaiId); + QuestDetailEntity questDetail = new QuestDetailEntity(); + questDetail.setId(questDetaiId); + QuestDetailEntity detailEntity = baseMapper.selectOneTaskInfo(taskSearchDTO.getQuestNum(),questDetail); +// QuestDetailEntity detailEntity = questDetailService.getById(,detailEntity); if (Objects.isNull(detailEntity)) { log.warn("###########deleteQuestDetail: 存在不在盘点计划中的数据 questDetaiId={}", questDetaiId); throw new CustomerException(403, "存在不在盘点计划中的数据"); } detailEntity.setQuestStatus(3); + detailEntity.setId(questDetaiId); ls.add(detailEntity); } - questDetailService.updateBatchById(ls); + baseMapper.updatePositionCodeList(taskSearchDTO.getQuestNum(),ls); } @Override @@ -1121,12 +1559,14 @@ public class TaskQuestServiceImpl extends BaseServiceImpl list = new ArrayList<>(); + list.add(questDetailEntity); + baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(),list); Long questDetailId = questDetailEntity.getId(); Integer stockNum = questDetailEntity.getStockNum(); Integer lossNum = 0; @@ -1135,13 +1575,15 @@ public class TaskQuestServiceImpl extends BaseServiceImpl childList = new ArrayList<>(); - childList.add(addQuestDetailChild(stockNum,"10",questDetailId,warehouseId)); - childList.add(addQuestDetailChild(wornNum,"20",questDetailId,warehouseId)); - childList.add(addQuestDetailChild(lossNum,"30",questDetailId,warehouseId)); - childList.add(addQuestDetailChild(noRepairNum,"40",questDetailId,warehouseId)); - childList.add(addQuestDetailChild(deliveNum,"50",questDetailId,warehouseId)); - childList.add(addQuestDetailChild(noReceivedNum,"60",questDetailId,warehouseId)); - questDetailChildService.saveOrUpdateBatch(childList); + childList.add(addQuestDetailChild(stockNum,"10",questDetailId,warehouseId,taskSearchDTO.getQuestNum())); + childList.add(addQuestDetailChild(wornNum,"20",questDetailId,warehouseId,taskSearchDTO.getQuestNum())); + childList.add(addQuestDetailChild(lossNum,"30",questDetailId,warehouseId,taskSearchDTO.getQuestNum())); + childList.add(addQuestDetailChild(noRepairNum,"40",questDetailId,warehouseId,taskSearchDTO.getQuestNum())); + childList.add(addQuestDetailChild(deliveNum,"50",questDetailId,warehouseId,taskSearchDTO.getQuestNum())); + childList.add(addQuestDetailChild(noReceivedNum,"60",questDetailId,warehouseId,taskSearchDTO.getQuestNum())); + //新增 + baseMapper.insertQuestDetailChildList(taskSearchDTO.getQuestNum(),childList); +// questDetailChildService.saveOrUpdateBatch(childList); } @Override @@ -1150,7 +1592,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl page, TaskSearchDTO taskSearchDTO) { if (Func.isEmpty(taskSearchDTO.getTaskId())){ log.error("#####################TaskId参数缺失:{}",taskSearchDTO.getTaskId()); return null; @@ -1164,18 +1606,22 @@ public class TaskQuestServiceImpl extends BaseServiceImpl queryWrapper = Wrappers.query().lambda() - .eq(QuestDetailEntity::getQuestId, taskSearchDTO.getTaskId()) - .eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId()) - .eq(QuestDetailEntity::getQuestType, 3); + QuestDetailEntity detailEntity = new QuestDetailEntity(); + detailEntity.setQuestId(taskSearchDTO.getTaskId()); + detailEntity.setWarehouseId(taskSearchDTO.getWarehouseId()); + detailEntity.setQuestType(3); + +// LambdaQueryWrapper queryWrapper = Wrappers.query().lambda() +// .eq(QuestDetailEntity::getQuestId, taskSearchDTO.getTaskId()) +// .eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId()) +// .eq(QuestDetailEntity::getQuestType, 3); if (Func.equals(isInventory,1)){ - queryWrapper - .eq(QuestDetailEntity::getIncomingBatch, taskSearchDTO.getOrderCode()); + detailEntity.setIncomingBatch(taskSearchDTO.getOrderCode()); }else { - queryWrapper.eq(QuestDetailEntity::getOrderCode, taskSearchDTO.getOrderCode()); + detailEntity.setOrderCode(taskSearchDTO.getOrderCode()); } - List questDetailEntities = questDetailService.list(queryWrapper); - List type = questDetailEntities.stream().filter(f -> Func.isNotEmpty(f.getQuestTarget())).map(QuestDetailEntity::getQuestTarget).distinct().collect(Collectors.toList()); + IPage questDetailEntities = baseMapper.selectTaskInfo(page,taskSearchDTO.getQuestNum(),detailEntity); + List type = questDetailEntities.getRecords().stream().filter(f -> Func.isNotEmpty(f.getQuestTarget())).map(QuestDetailEntity::getQuestTarget).distinct().collect(Collectors.toList()); if (Func.isEmpty(type)){ return null; } @@ -1187,12 +1633,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl taskPackagelistVOS = new ArrayList<>(); - List orderCode = questDetailEntities.stream().map(QuestDetailEntity::getOrderCode).distinct().collect(Collectors.toList()); + List orderCode = questDetailEntities.getRecords().stream().map(QuestDetailEntity::getOrderCode).distinct().collect(Collectors.toList()); if (orderCode.size() != 1){ log.error("###################orderId查询类型异常:{}",taskSearchDTO.getOrderId()); return null; } - for (QuestDetailEntity questDetailEntity : questDetailEntities) { + for (QuestDetailEntity questDetailEntity : questDetailEntities.getRecords()) { TaskPackagelistVO packagelistVO = new TaskPackagelistVO(); total.getAndAdd(questDetailEntity.getStockNum()); if (questDetailEntity.getQuestStatus().equals(1)){ @@ -1221,20 +1667,20 @@ public class TaskQuestServiceImpl extends BaseServiceImpl orderId = questDetailEntities.stream().map(QuestDetailEntity::getOrderId).distinct().collect(Collectors.toList()); + List orderId = questDetailEntities.getRecords().stream().map(QuestDetailEntity::getOrderId).distinct().collect(Collectors.toList()); if (type.get(0).equals(1)){ contractVO.setOrderId(orderId.get(0)); contractVO.setOrderCode(orderCode.get(0)); contractVO.setIsZero(0); contractVO.setIsInventory(0); }else if (type.get(0).equals(2)){ - List zeroOrderCode = questDetailEntities.stream().map(QuestDetailEntity::getOrderCode).distinct().collect(Collectors.toList()); + List zeroOrderCode = questDetailEntities.getRecords().stream().map(QuestDetailEntity::getOrderCode).distinct().collect(Collectors.toList()); contractVO.setOrderId(orderId.get(0)); contractVO.setOrderCode(zeroOrderCode.get(0)); contractVO.setIsZero(1); contractVO.setIsInventory(0); }else if (type.get(0).equals(3)){ - List inventoryOrderId = questDetailEntities.stream().map(QuestDetailEntity::getStockId).distinct().collect(Collectors.toList()); + List inventoryOrderId = questDetailEntities.getRecords().stream().map(QuestDetailEntity::getStockId).distinct().collect(Collectors.toList()); contractVO.setOrderId(inventoryOrderId.get(0)); contractVO.setIsZero(0); contractVO.setIsInventory(1); @@ -1250,14 +1696,20 @@ public class TaskQuestServiceImpl extends BaseServiceImpl selectStrip(IPage page,Long id) { - List questDetailVOList = baseMapper.selectStripListByQuestId(page,id); + TaskQuestEntity taskQuestEntity = baseMapper.selectById(id); + + List questDetailVOList = baseMapper.selectStripListByQuestId(page,id,taskQuestEntity.getQuestNum()); if (!questDetailVOList.isEmpty()){ for (QuestDetailVO questDetailVO : questDetailVOList) { //查询子表 - List list = questDetailChildService.list(new QueryWrapper().lambda() - .eq(QuestDetailChildEntity::getIsDeleted,0) - .eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId()) - ); +// TaskQuestEntity taskQuestEntity = baseMapper.selectById(); + QuestDetailChildEntity questDetailChildEntity = new QuestDetailChildEntity(); + questDetailChildEntity.setQuestDetailId(questDetailVO.getId()); + List list =baseMapper.selectQuestDetailChildInfo(taskQuestEntity.getQuestNum(),questDetailChildEntity); +// List list = questDetailChildService.list(new QueryWrapper().lambda() +// .eq(QuestDetailChildEntity::getIsDeleted,0) +// .eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId()) +// ); questDetailVO.setList(list); } } @@ -1266,14 +1718,18 @@ public class TaskQuestServiceImpl extends BaseServiceImpl selectInventory(IPage page,Long id) { - List questDetailVOList = baseMapper.selectInventoryListByQuestId(page,id); + TaskQuestEntity taskQuestEntity = baseMapper.selectById(id); + List questDetailVOList = baseMapper.selectInventoryListByQuestId(page,id,taskQuestEntity.getQuestNum() ); if (!questDetailVOList.isEmpty()){ for (QuestDetailVO questDetailVO : questDetailVOList) { //查询子表 - List list = questDetailChildService.list(new QueryWrapper().lambda() - .eq(QuestDetailChildEntity::getIsDeleted,0) - .eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId()) - ); + QuestDetailChildEntity questDetailChildEntity = new QuestDetailChildEntity(); + questDetailChildEntity.setQuestDetailId(questDetailVO.getId()); + List list =baseMapper.selectQuestDetailChildInfo(taskQuestEntity.getQuestNum(),questDetailChildEntity); +// questDetailChildService.list(new QueryWrapper().lambda() +// .eq(QuestDetailChildEntity::getIsDeleted,0) +// .eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId()) +// ); questDetailVO.setList(list); } } @@ -1282,14 +1738,18 @@ public class TaskQuestServiceImpl extends BaseServiceImpl selectZero(IPage page,Long id) { - List questDetailVOList = baseMapper.selectZeroListByQuestId(page,id); + TaskQuestEntity taskQuestEntity = baseMapper.selectById(id); + List questDetailVOList = baseMapper.selectZeroListByQuestId(page,id,taskQuestEntity.getQuestNum() ); if (!questDetailVOList.isEmpty()){ for (QuestDetailVO questDetailVO : questDetailVOList) { //查询子表 - List list = questDetailChildService.list(new QueryWrapper().lambda() - .eq(QuestDetailChildEntity::getIsDeleted,0) - .eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId()) - ); + QuestDetailChildEntity questDetailChildEntity = new QuestDetailChildEntity(); + questDetailChildEntity.setQuestDetailId(questDetailVO.getId()); + List list =baseMapper.selectQuestDetailChildInfo(taskQuestEntity.getQuestNum(),questDetailChildEntity); +// List list = questDetailChildService.list(new QueryWrapper().lambda() +// .eq(QuestDetailChildEntity::getIsDeleted,0) +// .eq(QuestDetailChildEntity::getQuestDetailId,questDetailVO.getId()) +// ); questDetailVO.setList(list); } } @@ -1358,17 +1818,35 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questDetailEntity = baseMapper.selectQuestDetailList(taskSearchDTO.getQuestNum(), questDetail); +// if(Objects.isNull(questDetailEntity)){ +// questDetailEntity = new QuestDetailEntity(); +// questDetailEntity.setOrdePackageCode(orderPackageCode); +// } return R.data(questDetailEntity); } + /** + * 查询盘点任务数据 + * + * @param page + * @param questNum + * @param questDetail + * @return + */ + @Override + public IPage selectTaskInfo(IPage page, String questNum, QuestDetailEntity questDetail) { + return baseMapper.selectTaskInfo(page,questNum,questDetail); + } - private QuestDetailChildEntity addQuestDetailChild(Integer num,String cargoName,Long questDetaiId,Long warehouseId){ + + private QuestDetailChildEntity addQuestDetailChild(Integer num,String cargoName,Long questDetaiId,Long warehouseId,String qu){ if(Objects.isNull(questDetaiId)){ log.warn("###########addQuestDetailChild: 明细id不存在 questDetaiId={}",questDetaiId); @@ -1384,7 +1862,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl page, TaskSearchDTO taskSearchDTO) { // String goodsType = taskSearchDTO.getGoodsType(); Integer type = taskSearchDTO.getType(); if (Func.isEmpty(type)){ @@ -1431,9 +1912,13 @@ public class TaskQuestServiceImpl extends BaseServiceImpl taskQuestChildEntityList = taskQuestChildService.list(Wrappers.query().lambda() .eq(TaskQuestChildEntity::getQuestId, taskQuestId) .eq(TaskQuestChildEntity::getRefType, 1)); + List stockArticleEntity = null; List marketNames = null; if (Func.isNotEmpty(taskQuestChildEntityList)){ @@ -1449,7 +1934,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl taskContractVOS = new ArrayList<>(); + List taskContractVOS = new ArrayList<>(); String goodsType = taskSearchDTO.getGoodsType(); if (Func.isEmpty(goodsType)){ log.error("####################参数异常:{}",goodsType); @@ -1457,15 +1942,24 @@ public class TaskQuestServiceImpl extends BaseServiceImpl questDetailEntityList = questDetailService.list(Wrappers.query().lambda() - .eq(QuestDetailEntity::getQuestId, taskQuestId) - .like(QuestDetailEntity::getOrderCode, incomingBatch) - .eq(QuestDetailEntity::getQuestType, 3) - .in(QuestDetailEntity::getQuestTarget, 1,2) - .eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId())); - if (Func.isNotEmpty(questDetailEntityList) && questDetailEntityList.size()>0){ +// List questDetailEntityList = questDetailService.list(Wrappers.query().lambda() +// .eq(QuestDetailEntity::getQuestId, taskQuestId) +// .like(QuestDetailEntity::getOrderCode, incomingBatch) +// .eq(QuestDetailEntity::getQuestType, 3) +// .in(QuestDetailEntity::getQuestTarget, 1,2) +// .eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId())); + + QuestDetailEntity questDetail = new QuestDetailEntity(); + questDetail.setQuestId(taskQuestId); + questDetail.setQuestType(3); + questDetail.setWarehouseId(taskSearchDTO.getWarehouseId()); + questDetail.setOrderCode(incomingBatch); + IPage questDetailEntityList = baseMapper.selectTaskInfo(page,taskSearchDTO.getQuestNum(),questDetail); + + + if (Func.isNotEmpty(questDetailEntityList) && questDetailEntityList.getRecords().size()>0){ TaskContractVO taskContractVO = new TaskContractVO(); - Map> orderMap = questDetailEntityList.stream().collect(Collectors.groupingBy(QuestDetailEntity::getOrderCode)); + Map> orderMap = questDetailEntityList.getRecords().stream().collect(Collectors.groupingBy(QuestDetailEntity::getOrderCode)); orderMap.forEach((k,v)->{ List questDetailEntities = orderMap.get(k); taskContractVO.setTotal(v.stream().mapToInt(QuestDetailEntity::getStockNum).sum()); @@ -1491,12 +1985,24 @@ public class TaskQuestServiceImpl extends BaseServiceImplquery().lambda() - .eq(QuestDetailEntity::getOrderId, distributionStockArticleEntity.getId()) - .eq(QuestDetailEntity::getQuestId, taskQuestId) - .eq(QuestDetailEntity::getQuestType, 3) - .eq(QuestDetailEntity::getQuestStatus, 1)); - taskContractVO.setUnTotal(count.intValue()); + QuestDetailEntity questDetai = new QuestDetailEntity(); + questDetai.setOrderId(distributionStockArticleEntity.getId()); + questDetai.setQuestId(taskQuestId); + questDetai.setQuestType(3); + questDetai.setQuestStatus(1); + List questDetailEntities = baseMapper.selectQuestDetailList(taskSearchDTO.getQuestNum(), questDetai); + if(questDetailEntities.isEmpty()){ + taskContractVO.setUnTotal(0); + }else{ + long count = questDetailEntities.stream().filter(w -> w.getQuestStatus().equals(1)).count(); + taskContractVO.setUnTotal((int) count); + } +// Long count = questDetailService.count(Wrappers.query().lambda() +// .eq(QuestDetailEntity::getOrderId, distributionStockArticleEntity.getId()) +// .eq(QuestDetailEntity::getQuestId, taskQuestId) +// .eq(QuestDetailEntity::getQuestType, 3) +// .eq(QuestDetailEntity::getQuestStatus, 1)); +// taskContractVO.setUnTotal(count.intValue()); taskContractVOS.add(taskContractVO); List parcelList = distributionParcelListClient.getParcelListByStockArticleId(distributionStockArticleEntity.getId()); if (Func.isEmpty(parcelList)) { @@ -1504,17 +2010,17 @@ public class TaskQuestServiceImpl extends BaseServiceImpl { + /*parcelList.forEach(p -> { QuestDetailEntity questDetailEntity = new QuestDetailEntity(); if (!p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yichuku.getValue()) && !p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) { WarehouseTrayEntity warehouseTrayEntity = baseMapper.selectTratInfo(p.getId(), taskSearchDTO.getWarehouseId()); WarehouseUpdownGoodsEntity updownGoodsPack = getUpdownGoodsPack(p.getId(), "3", p.getOrderPackageCode(), taskSearchDTO.getWarehouseId()); if (Func.isNotEmpty(warehouseTrayEntity)) { questDetailEntity.setTrayCode(warehouseTrayEntity.getPalletCode()); - questDetailEntity.setTrayId(warehouseTrayEntity.getId()); + questDetailEntity.setTrayId(String.valueOf(warehouseTrayEntity.getId())); } if (Func.isNotEmpty(updownGoodsPack)) { - questDetailEntity.setAllocationId(updownGoodsPack.getId()); + questDetailEntity.setAllocationId(String.valueOf(updownGoodsPack.getId())); } questDetailEntity.setOrdePackageCode(p.getOrderPackageCode()); questDetailEntity.setOrderCode(p.getOrderCode()); @@ -1528,20 +2034,31 @@ public class TaskQuestServiceImpl extends BaseServiceImpl detailEntities = new ArrayList<>(); + detailEntities.add(questDetailEntity); + baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(),detailEntities); +// questDetailService.save(questDetailEntity); } - }); + });*/ taskContractVO.setZktotal(libNum.get()); taskContractVO.setIsZero(0); taskContractVO.setIsInventory(0); } else { //查询任务表 是否需要进行盘点任务数据的插入 - List zeroQuestDetailEntityList = questDetailService.list(Wrappers.query().lambda() - .eq(QuestDetailEntity::getQuestId, taskQuestId) - .like(QuestDetailEntity::getOrderCode, incomingBatch) - .eq(QuestDetailEntity::getQuestType, 3) - .eq(QuestDetailEntity::getQuestTarget, 2) - .eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId())); +// List zeroQuestDetailEntityList = questDetailService.list(Wrappers.query().lambda() +// .eq(QuestDetailEntity::getQuestId, taskQuestId) +// .like(QuestDetailEntity::getOrderCode, incomingBatch) +// .eq(QuestDetailEntity::getQuestType, 3) +// .eq(QuestDetailEntity::getQuestTarget, 2) +// .eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId())); + QuestDetailEntity detail = new QuestDetailEntity(); + detail.setQuestId(taskQuestId); + detail.setOrderCode(incomingBatch); + detail.setQuestType(3); + detail.setQuestTarget(2); + detail.setWarehouseId(taskSearchDTO.getWarehouseId()); + List zeroQuestDetailEntityList = baseMapper.selectQuestDetailList(taskSearchDTO.getQuestNum(),detail); + if (Func.isNotEmpty(zeroQuestDetailEntityList)){ for (QuestDetailEntity questDetailEntity : zeroQuestDetailEntityList) { TaskContractVO contractVO = new TaskContractVO(); @@ -1560,7 +2077,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl detailEntities = new ArrayList<>(); + detailEntities.add(questDetailEntity); + baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(),detailEntities); +// questDetailService.save(questDetailEntity); taskContractVO.setIsZero(1); taskContractVO.setIsInventory(0); taskContractVOS.add(taskContractVO); - } + }*/ } } } @@ -1596,12 +2117,23 @@ public class TaskQuestServiceImpl extends BaseServiceImpl inventoryQuestDetailEntityList = questDetailService.list(Wrappers.query().lambda() + /*List inventoryQuestDetailEntityList = questDetailService.list(Wrappers.query().lambda() .eq(QuestDetailEntity::getQuestId, taskQuestId) .eq(QuestDetailEntity::getIncomingBatch,incomingBatch) .eq(QuestDetailEntity::getQuestType, 3) .eq(QuestDetailEntity::getQuestTarget, 3) - .eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId())); + .eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId()));*/ + + QuestDetailEntity detail = new QuestDetailEntity(); + detail.setQuestId(taskQuestId); + detail.setOrderCode(incomingBatch); + detail.setQuestType(3); + detail.setQuestTarget(3); + detail.setWarehouseId(taskSearchDTO.getWarehouseId()); + List inventoryQuestDetailEntityList = baseMapper.selectQuestDetailList(taskSearchDTO.getQuestNum(),detail); + + + if (Func.isNotEmpty(inventoryQuestDetailEntityList) && inventoryQuestDetailEntityList.size()>0){ int sum = inventoryQuestDetailEntityList.stream().filter(iqd -> Func.equals(iqd.getQuestStatus(), 1)).mapToInt(QuestDetailEntity::getStockNum).sum(); inventoryQuestDetailEntityList.forEach(iqd->{ @@ -1615,7 +2147,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl stockListByWarehouseIdAndMarketAndStockListInfo = distributionStockListClient.getStockListByWarehouseIdAndMarketAndStockListInfo(incomingBatch, marketNames, taskSearchDTO.getWarehouseId()); if (Func.isEmpty(stockListByWarehouseIdAndMarketAndStockListInfo)){ return Resp.scanFail("操作失败","该库存品不存在此任务中"); @@ -1636,7 +2169,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl detailEntities = new ArrayList<>(); + detailEntities.add(questDetailEntity); + baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(),detailEntities); + +// questDetailService.save(questDetailEntity); TaskContractVO taskContractVO = new TaskContractVO(); taskContractVO.setOrderId(questDetailEntity.getStockId()); taskContractVO.setOrderCode(questDetailEntity.getOrderCode()); @@ -1645,7 +2182,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl implements IWarehouseRetentionRecordService { private final IDistributionLoadscanClient distributionLoadscanClient; private final IDistributionParcelListClient distributionParcelListClient; + private final IWarehouseRetentionScanService warehouseRetentionScanService; + private final IDistributionDeliveryListClient deliveryListClient; + private final IBasicdataWarehouseClient warehouseClient; + private final IDistributionReservationClient reservationClient; @Override public IPage selectWarehouseRetentionRecordPage(IPage page, WarehouseRetentionRecordVO warehouseRetentionRecord) { return page.setRecords(baseMapper.selectWarehouseRetentionRecordPage(page, warehouseRetentionRecord)); } - - @Override - public List exportWarehouseRetentionRecord(Wrapper queryWrapper) { - List warehouseRetentionRecordList = baseMapper.exportWarehouseRetentionRecord(queryWrapper); - //warehouseRetentionRecordList.forEach(warehouseRetentionRecord -> { - // warehouseRetentionRecord.setTypeName(DictCache.getValue(DictEnum.YES_NO, WarehouseRetentionRecord.getType())); - //}); - return warehouseRetentionRecordList; - } - @Override public IPage selectWarehouseRetentionWaybillPage(IPage page, WarehouseWaybillDetentionVO warehouseWaybillDetentionVO) { List warehouseRetentionRecordVOS = baseMapper.selectWarehouseWaybillRecordPage(page,warehouseWaybillDetentionVO); @@ -117,4 +137,85 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImplquery().lambda() + .eq(WarehouseRetentionRecordEntity::getRetentionType, RetentionTypeConstant.peisongzhiliu.getValue()) + .eq(WarehouseRetentionRecordEntity::getTaskId, deliveryId)); + if (Func.isEmpty(retentionRecordEntity)){ + return null; + } + WarehouseRetentionRecordVO warehouseRetentionRecordVO = WarehouseRetentionRecordWrapper.build().entityVO(retentionRecordEntity); + //查询是否存在有对应的扫描列表 + List retentionScanEntityList = warehouseRetentionScanService.list(Wrappers.query().lambda() + .eq(WarehouseRetentionScanEntity::getDeliveryId, retentionRecordEntity.getTaskId()) + .eq(WarehouseRetentionScanEntity::getRefId, retentionRecordEntity.getId())); + if (Func.isNotEmpty(retentionScanEntityList)){ + warehouseRetentionRecordVO.setRetentionScanVOList(WarehouseRetentionScanWrapper.build().listVO(retentionScanEntityList)); + } + return warehouseRetentionRecordVO; + } + + @Override + public R saveRetentionList(WarehouseRetentionRecordDTO warehouseRetentionRecordDTO) { + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if (Func.isEmpty(myCurrentWarehouse)){ + return null; + } + List warehouseRetentionScanDTOS = warehouseRetentionRecordDTO.getWarehouseRetentionScanDTOS(); + if (Func.isEmpty(warehouseRetentionScanDTOS)){ + log.error("############用户提交空滞留列表"); + return Resp.scanFail("操作失败","无滞留包件信息"); + } + BladeUser user = AuthUtil.getUser(); + //TODO 保存车次数据还需要处理 + WarehouseRetentionRecordEntity warehouseRetentionRecordEntity = new WarehouseRetentionRecordEntity(); + warehouseRetentionRecordEntity.setTaskId(warehouseRetentionRecordDTO.getDeliveryId()); + warehouseRetentionRecordEntity.setRemark(warehouseRetentionRecordDTO.getRemark()); + warehouseRetentionRecordEntity.setRetentionCarNo(warehouseRetentionRecordDTO.getTrainNumber()); + warehouseRetentionRecordEntity.setRetentionCarId(warehouseRetentionRecordDTO.getLoadingId()); + warehouseRetentionRecordEntity.setRetentionWarehouseId(myCurrentWarehouse.getId()); + warehouseRetentionRecordEntity.setRetentionWarehouseName(myCurrentWarehouse.getName()); + warehouseRetentionRecordEntity.setRetentionWarehouseName(myCurrentWarehouse.getName()); + warehouseRetentionRecordEntity.setRetentionCreateUserId(user.getUserId()); + warehouseRetentionRecordEntity.setRetentionCreateUserName(user.getUserName()); + this.save(warehouseRetentionRecordEntity); + warehouseRetentionScanDTOS.forEach(r->{ + r.setRetentionScanTime(new Date()); + r.setRetentionScanUserId(user.getUserId()); + r.setRetentionScanUsername(user.getUserName()); + r.setDeliveryId(warehouseRetentionRecordDTO.getDeliveryId()); + r.setRefId(warehouseRetentionRecordEntity.getId()); + warehouseRetentionScanService.save(Func.copy(r,WarehouseRetentionScanEntity.class)); + //进行滞留操作的包件需要和原来订单 预约进行绑定解除 + //TODO 需要一个取消配送包件的方法 + }); + return Resp.scanSuccess("操作成功","操作成功"); + } + + @Override + public List exportWarehouseRetentionRecord(Map paramMap) { + + // 获取当前登录的仓库信息 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(ObjectUtils.isNull(myCurrentWarehouse)){ + throw new ServiceException("没有仓库信息！"); + } + // 用户勾选数据的ids + Object ids = paramMap.get("ids"); + List idArr = null; + if (null != ids && !ids.toString().equals("")){ + idArr = Arrays.asList(paramMap.get("ids").toString().split(",")); + } + + String tenantId = AuthUtil.getTenantId(); + paramMap.put("warehouseId", myCurrentWarehouse.getId()); + paramMap.put("tenantId", tenantId); + List list = baseMapper.exportWarehouseRetentionRecord(paramMap, idArr); + list.forEach(li -> { + li.setRetentionType(DictBizCache.getValue(DictBizConstant.WAREHOUSE_RETENTION_TYPE, li.getRetentionType())); + }); + return list; + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionScanServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionScanServiceImpl.java index 5b1e2265d..85be65a06 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionScanServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionScanServiceImpl.java @@ -16,18 +16,31 @@ */ package com.logpm.warehouse.service.impl; +import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; +import com.logpm.warehouse.bean.Resp; +import com.logpm.warehouse.dto.WarehouseRetentionRecordDTO; +import com.logpm.warehouse.dto.WarehouseRetentionScanDTO; import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity; import com.logpm.warehouse.entity.WarehouseRetentionScanEntity; import com.logpm.warehouse.excel.WarehouseRetentionScanExcel; import com.logpm.warehouse.mapper.WarehouseRetentionScanMapper; +import com.logpm.warehouse.service.IWarehouseRetentionRecordService; import com.logpm.warehouse.service.IWarehouseRetentionScanService; import com.logpm.warehouse.vo.WarehouseRetentionRecordVO; import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel; import com.logpm.warehouse.vo.WarehouseRetentionScanVO; +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.api.R; +import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.Date; import java.util.List; /** @@ -37,8 +50,14 @@ import java.util.List; * @since 2023-11-03 */ @Service +@AllArgsConstructor public class WarehouseRetentionScanServiceImpl extends BaseServiceImpl implements IWarehouseRetentionScanService { + + private IBasicdataWarehouseClient warehouseClient; + +// private IWarehouseRetentionRecordService retentionRecordService; + @Override public IPage selectWarehouseRetentionRecordPage(IPage page, WarehouseRetentionScanVO warehouseRetentionScanVO) { return page.setRecords(baseMapper.selectWarehouseRetentionRecordPage(page, warehouseRetentionScanVO)); @@ -54,4 +73,38 @@ public class WarehouseRetentionScanServiceImpl extends BaseServiceImpl warehouseRetentionScanDTOS = warehouseRetentionRecordDTO.getWarehouseRetentionScanDTOS(); +// if (Func.isEmpty(warehouseRetentionScanDTOS)){ +// log.error("############用户提交空滞留列表"); +// return Resp.scanFail("操作失败","无滞留包件信息"); +// } +// BladeUser user = AuthUtil.getUser(); +// //TODO 保存车次数据还需要处理 +// WarehouseRetentionRecordEntity warehouseRetentionRecordEntity = new WarehouseRetentionRecordEntity(); +// warehouseRetentionRecordEntity.setTaskId(warehouseRetentionRecordDTO.getDeliveryId()); +// warehouseRetentionRecordEntity.setRemark(warehouseRetentionRecordDTO.getRemark()); +// warehouseRetentionRecordEntity.setRetentionCarNo(warehouseRetentionRecordDTO.getTrainNumber()); +// warehouseRetentionRecordEntity.setRetentionCarId(warehouseRetentionRecordDTO.getLoadingId()); +// warehouseRetentionRecordEntity.setRetentionWarehouseId(myCurrentWarehouse.getId()); +// warehouseRetentionRecordEntity.setRetentionWarehouseName(myCurrentWarehouse.getName()); +// warehouseRetentionRecordEntity.setRetentionWarehouseName(myCurrentWarehouse.getName()); +// warehouseRetentionRecordEntity.setRetentionCreatedUserId(user.getUserId()); +// warehouseRetentionRecordEntity.setRetentionCreatedUserName(user.getUserName()); +// retentionRecordService.save(warehouseRetentionRecordEntity); +// warehouseRetentionScanDTOS.forEach(r->{ +// r.setRetentionScanTime(new Date()); +// r.setRetentionScanUserId(user.getUserId()); +// r.setRetentionScanUsername(user.getUserName()); +// r.setDeliveryId(warehouseRetentionRecordDTO.getDeliveryId()); +// r.setRefId(warehouseRetentionRecordEntity.getId()); +// this.save(Func.copy(r,WarehouseRetentionScanEntity.class)); +// }); +// return Resp.scanSuccess("操作成功","操作成功"); +// } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java index 5e3e05c91..bbc1da23d 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java @@ -18,6 +18,7 @@ package com.logpm.warehouse.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.warehouse.entity.WarehouseStockEntity; @@ -28,12 +29,20 @@ import com.logpm.warehouse.vo.WarehouseScanInventoryRecordVO; import com.logpm.warehouse.vo.WarehouseScanRecordVO; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springblade.common.constant.DictBizConstant; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.SpringUtil; +import org.springblade.system.cache.DictBizCache; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -48,6 +57,9 @@ import java.util.stream.Collectors; public class WarehouseStockServiceImpl extends BaseServiceImpl implements IWarehouseStockService { private final IBasicdataWarehouseClient basicdataWarehouseClient; + + private IBasicdataWarehouseClient warehouseClient; + @Override public IPage selectWarehouseStockPage(IPage page, WarehouseScanRecordVO warehouseScanRecordVO) { warehouseScanRecordVO.setWarehouseIdList(this.loginPerson()); @@ -59,22 +71,47 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl exportWarehouseStock(Wrapper queryWrapper) { - List WarehouseStockList = baseMapper.exportWarehouseStock(queryWrapper); - //WarehouseStockList.forEach(WarehouseStock -> { - // WarehouseStock.setTypeName(DictCache.getValue(DictEnum.YES_NO, WarehouseStock.getType())); - //}); - return WarehouseStockList; - } - @Override public IPage selectWarehouseStockInventoryPage(IPage page, WarehouseScanInventoryRecordVO warehouseScanRecordVO) { warehouseScanRecordVO.setWarehouseIdList(this.loginPerson()); List warehouseScanInventoryRecordVOList = baseMapper.selectWarehouseStockInventoryPage(page,warehouseScanRecordVO); return page.setRecords(warehouseScanInventoryRecordVOList); } + + @Override + public List exportWarehouseStock(Map paramMap) { + + // 获取当前登录的仓库信息 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(ObjectUtils.isNull(myCurrentWarehouse)){ + throw new ServiceException("没有仓库信息！"); + } + // 用户勾选数据的ids + Object ids = paramMap.get("ids"); + List idArr = null; + if (null != ids && !ids.toString().equals("")){ + idArr = Arrays.asList(paramMap.get("ids").toString().split(",")); + } + + String tenantId = AuthUtil.getTenantId(); + paramMap.put("warehouseId", myCurrentWarehouse.getId()); + paramMap.put("tenantId", tenantId); + + List list = baseMapper.exportWarehouseStock(paramMap, idArr); + List excelList = new ArrayList<>(); + list.forEach(li -> { + WarehouseStockExcel excel = new WarehouseStockExcel(); + BeanUtil.copy(li, excel); + excel.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS,li.getOrderPackageStatusName())); + excel.setOrderPackageFreezeStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, li.getOrderPackageFreezeStatusName())); + excel.setOrderPackageStockupStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STOCKUP_STATUS, li.getOrderPackageStockupStatusName())); + excel.setOrderPackageGroundingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_GROUNDING_STATUS, li.getOrderPackageGroundingStatusName())); + excel.setOrderPackageLoadingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_LOADING_STATUS, li.getOrderPackageLoadingStatusName())); + excelList.add(excel); + }); + return excelList; + } + public List loginPerson(){ //获取当前登录人仓库 List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index c6b27ddab..a4e030d4d 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -2621,6 +2621,86 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryTrayTypeWrapper = new QueryWrapper<>(); + queryTrayTypeWrapper.eq("is_deleted",0) + .eq("tray_code",trayCode); + WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryTrayTypeWrapper); + if(Objects.isNull(trayTypeEntity)){ + //没有查询到托盘打托信息 + return null; + } + String type = trayTypeEntity.getType();//类型 1扫码分拣（订制品） 2人工分拣（零担） 3库存品 + Long trayTypeId = trayTypeEntity.getId();//打托方式id + String trayType = trayTypeEntity.getTrayType(); + Long wId = trayTypeEntity.getWarehouseId();//托盘打托仓库 + + TrayTypeDataVO trayTypeDataVO = new TrayTypeDataVO(); + trayTypeDataVO.setTrayTypeId(trayTypeId); + trayTypeDataVO.setType(type); + trayTypeDataVO.setTrayCode(trayTypeEntity.getTrayCode()); + trayTypeDataVO.setTrayNum(trayTypeEntity.getTotalNum()); + trayTypeDataVO.setName(trayTypeEntity.getFilterValue()); + trayTypeDataVO.setOrderTotalNum(trayTypeEntity.getOrderTotalNum()); + trayTypeDataVO.setTrayType(trayType); + trayTypeDataVO.setMarketId(trayTypeEntity.getMarketId()); + trayTypeDataVO.setMarketName(trayTypeEntity.getMarketName()); + trayTypeDataVO.setReamrk(trayTypeEntity.getRemark()); + trayTypeDataVO.setWarehosueId(wId); + + QueryWrapper queryWrapper =new QueryWrapper<>(); + queryWrapper.eq("tray_type_id",trayTypeId); + + List goodsList = warehouseTrayGoodsService.list(queryWrapper); + trayTypeDataVO.setGoodsLsit(goodsList); + +// if(PalletProductTypeConstant.CUSTOMIZED.equals(type)){//订制品打托 +// String trayTypeName = DictBizCache.getValue(DictBizConstant.PALLET_ORDER_TYPE, trayTypeEntity.getTrayType()); +// trayTypeDataVO.setTrayTypeName(trayTypeName); +// List list = warehouseTrayGoodsService.getListByTrayTypeId(trayTypeId); +// trayTypeDataVO.setList(list); +// }else if(PalletProductTypeConstant.ARTIFICIAL.equals(type)){ +// String trayTypeName = DictBizCache.getValue(DictBizConstant.PALLET_ZERO_TYPE, trayTypeEntity.getTrayType()); +// trayTypeDataVO.setTrayTypeName(trayTypeName); +// List list = warehouseTrayGoodsService.getZeroListByTrayTypeId(trayTypeId); +// trayTypeDataVO.setList(list); +// }else if(PalletProductTypeConstant.STOCKDATA.equals(type)){ +// String trayTypeName = DictBizCache.getValue(DictBizConstant.PALLET_STOCK_TYPE, trayTypeEntity.getTrayType()); +// trayTypeDataVO.setTrayTypeName(trayTypeName); +// List list = warehouseTrayGoodsService.getStockListByTrayTypeId(trayTypeId); +// trayTypeDataVO.setList(list); +// }else if(PalletProductTypeConstant.STOCKNODATA.equals(type)){ +// String trayTypeName = DictBizCache.getValue(DictBizConstant.PALLET_STOCKNODATA_TYPE, trayTypeEntity.getTrayType()); +// trayTypeDataVO.setTrayTypeName(trayTypeName); +// List list = warehouseTrayGoodsService.getStockListByTrayTypeId(trayTypeId); +// trayTypeDataVO.setList(list); +// }else { +// log.warn("##################getEntityByTrayCode: 未知的打托类型"); +// } +// return trayTypeDataVO; + return trayTypeDataVO; + } + + private R moveTrayOrderPackageCode(WarehouseTrayTypeEntity trayTypeEntity, String orderPackageCode) { Long wid = trayTypeEntity.getWarehouseId(); DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,wid); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java index bdb3d8e55..ce9f2a015 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java @@ -18,22 +18,30 @@ package com.logpm.warehouse.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.warehouse.entity.WarehouseUpdownGoodsLogEntity; import com.logpm.warehouse.entity.WarehouseUpdownTypeEntity; +import com.logpm.warehouse.excel.WarehouseCustomizedExcel; +import com.logpm.warehouse.excel.WarehouseStockedExcel; +import com.logpm.warehouse.excel.WarehouseTemporaryExcel; import com.logpm.warehouse.excel.WarehouseUpdownGoodsLogExcel; import com.logpm.warehouse.mapper.WarehouseUpdownGoodsLogMapper; import com.logpm.warehouse.service.IWarehouseUpdownGoodsLogService; import com.logpm.warehouse.vo.WarehouseUpdownGoodsLogVO; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.system.feign.IUserSearchClient; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -51,6 +59,8 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl selectWarehouseUpdownGoodsLogPage(IPage page, WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLog) { //获取当前登录人仓库 @@ -68,16 +78,6 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl exportWarehouseUpdownGoodsLog(Wrapper queryWrapper) { - List warehouseUpdownGoodsLogList = baseMapper.exportWarehouseUpdownGoodsLog(queryWrapper); - //warehouseUpdownGoodsLogList.forEach(warehouseUpdownGoodsLog -> { - // warehouseUpdownGoodsLog.setTypeName(DictCache.getValue(DictEnum.YES_NO, WarehouseUpdownGoodsLog.getType())); - //}); - return warehouseUpdownGoodsLogList; - } - @Override public void saveAllocationAndPackage(WarehouseUpdownTypeEntity updownTypeEntity, DistributionParcelListEntity parcelListEntity, String bindingType,Integer isAlltrays,String remark) { WarehouseUpdownGoodsLogEntity warehouseUpdownGoodsLogEntity = new WarehouseUpdownGoodsLogEntity(); @@ -124,4 +124,82 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl exportCustomized(Map paramMap) { + + // 获取当前登录的仓库信息 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(ObjectUtils.isNull(myCurrentWarehouse)){ + throw new ServiceException("没有仓库信息！"); + } + // 用户勾选数据的ids + Object ids = paramMap.get("ids"); + List idArr = null; + if (null != ids && !ids.toString().equals("")){ + idArr = Arrays.asList(paramMap.get("ids").toString().split(",")); + } + + String tenantId = AuthUtil.getTenantId(); + paramMap.put("warehouseId", myCurrentWarehouse.getId()); + paramMap.put("tenantId", tenantId); + List list = baseMapper.exportCustomized(paramMap, idArr); + list.forEach( li -> { + li.setBindingType(li.getBindingType().equals("1") ? "上架" : "下架"); + }); + return list; + } + + @Override + public List exportStock(Map paramMap) { + + // 获取当前登录的仓库信息 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(ObjectUtils.isNull(myCurrentWarehouse)){ + throw new ServiceException("没有仓库信息！"); + } + // 用户勾选数据的ids + Object ids = paramMap.get("ids"); + List idArr = null; + if (null != ids && !ids.toString().equals("")){ + idArr = Arrays.asList(paramMap.get("ids").toString().split(",")); + } + + String tenantId = AuthUtil.getTenantId(); + paramMap.put("warehouseId", myCurrentWarehouse.getId()); + paramMap.put("tenantId", tenantId); + + List list = baseMapper.exportStock(paramMap, idArr); + list.forEach(li -> { + li.setBindingType(li.getBindingType().equals("1") ? "上架" : "下架"); + }); + + return list; + } + + @Override + public List exportTemporary(Map paramMap) { + + // 获取当前登录的仓库信息 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(ObjectUtils.isNull(myCurrentWarehouse)){ + throw new ServiceException("没有仓库信息！"); + } + // 用户勾选数据的ids + Object ids = paramMap.get("ids"); + List idArr = null; + if (null != ids && !ids.toString().equals("")){ + idArr = Arrays.asList(paramMap.get("ids").toString().split(",")); + } + + String tenantId = AuthUtil.getTenantId(); + paramMap.put("warehouseId", myCurrentWarehouse.getId()); + paramMap.put("tenantId", tenantId); + + List list = baseMapper.exportTemporary(paramMap, idArr); + list.forEach(li -> { + li.setBindingType("1".equals(li.getBindingType()) ? "上架" : "下架"); + }); + return list; + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index d9c8958fb..61a38dd38 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -1174,6 +1174,68 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl upShelfPackageList,Long warehouseId) { + int num = 0; + for (UpShelfPackageDTO upShelfPackageDTO:upShelfPackageList){ + String orderPackageCode = upShelfPackageDTO.getOrderPackageCode(); + //查询包件在哪个库位上 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("association_type","3") + .eq("warehouse_id",warehouseId) + .eq("association_value",orderPackageCode); + WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(queryWrapper); + if(Objects.isNull(updownGoodsEntity)){ + log.warn("##############downPackage: 包件没有上架记录 orderPackageCode={}",orderPackageCode); + //判断是否有打托记录 + QueryWrapper trayGoodsEntityQueryWrapper = new QueryWrapper<>(); + trayGoodsEntityQueryWrapper.eq("association_type","3") + .eq("warehouse_id",warehouseId) + .eq("association_value",orderPackageCode); + WarehouseTrayGoodsEntity warehouseTrayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsEntityQueryWrapper); + if(!Objects.isNull(warehouseTrayGoodsEntity)){ + //有托盘，托盘下托 + warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件下架:同步下托",warehouseId); + } + continue; + } + Long allocationId = updownGoodsEntity.getAllocationId(); + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId); + Integer quantity = parcelListEntity.getQuantity(); + Long updownGoodsId = updownGoodsEntity.getId(); + Long updownTypeId = updownGoodsEntity.getUpdownTypeId(); + WarehouseUpdownTypeEntity updownTypeEntity = baseMapper.selectById(updownTypeId); + QueryWrapper taryAllocationEntityQueryWrapper = new QueryWrapper<>(); + taryAllocationEntityQueryWrapper.eq("allocation_id",allocationId) + .eq("is_deleted",0); + WarehouseTaryAllocationEntity taryAllocationEntity = warehouseTaryAllocationService.getOne(taryAllocationEntityQueryWrapper); +// BasicdataTrayEntity trayEntity = warehouseTaryAllocationService.getTrayByAllocationId(allocationId); + if(!Objects.isNull(taryAllocationEntity)){ + //有托盘，托盘下托 + warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件下架:同步下托",warehouseId); + } + Integer residue = warehouseUpdownGoodsService.deleteByUpdownGoodsId(updownGoodsId); + if(residue == 0){ + //删除上架方式 + removeById(updownTypeId); + //修改库位状态为空闲 + basicdataGoodsAllocationClient.updateAllocationStatus(allocationId,"1"); + //如果有托盘还要删除托盘与库位的绑定 + if(!Objects.isNull(taryAllocationEntity)){ + warehouseTaryAllocationService.deleteById(taryAllocationEntity); + } + } + warehouseUpdownGoodsLogService.saveAllocationAndPackage(updownTypeEntity,parcelListEntity,"2",0,"包件下架:包件下架"); + updatePackageGroundingStatus(orderPackageCode,"10",warehouseId); + updateUpdownTypeNum(updownTypeEntity); + + num = num + quantity; + warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString()); + } + return Resp.scanSuccess("下架成功","成功下架"+num+"件"); + } + @Override public R downZeroOrder(List upShelfPackageList,Long warehouseId) { StringBuffer stringBuffer = new StringBuffer("下架零担订单成功"); 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 b406d88b5..1d8f79240 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 @@ -41,6 +41,7 @@ import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO; import com.logpm.warehouse.entity.WarehouseWarehouseEntity; import com.logpm.warehouse.entity.WarehouseWarehousingDetailEntity; import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity; +import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel; import com.logpm.warehouse.excel.WarehousingEntryDetailExcel; import com.logpm.warehouse.mapper.WarehouseWarehousingEntryMapper; import com.logpm.warehouse.service.IWarehouseWarehousingDetailService; @@ -83,6 +84,8 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl exportWarehouseWarehousing(Map paramMap) { + // 获取当前登录的仓库信息 + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(ObjectUtils.isNull(myCurrentWarehouse)){ + throw new ServiceException("没有仓库信息！"); + } + // 用户勾选数据的ids + Object ids = paramMap.get("ids"); + List idArr = null; + if (null != ids && !ids.toString().equals("")){ + idArr = Arrays.asList(paramMap.get("ids").toString().split(",")); + } + + paramMap.put("warehouseId", myCurrentWarehouse.getId()); + + List list = baseMapper.exportWarehouseWarehousing(paramMap, idArr); + List listExcel = new ArrayList<>(); + list.forEach(s->{ + WarehouseWarehousingEntryExcel excel = new WarehouseWarehousingEntryExcel(); + switch (s.getConditions()){ + case "1": + s.setConditions("待确定"); + break; + case "2": + s.setConditions("部分确定"); + break; + case "3": + s.setConditions("已确定"); + break; + } + BeanUtil.copyProperties(s,excel); + listExcel.add(excel); + }); + + return listExcel; + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index 3be4b1940..6c65546f8 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -1,6 +1,8 @@ package com.logpm.warehouse.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; @@ -22,28 +24,33 @@ import com.logpm.oldproject.feign.IWayBillClient; import com.logpm.oldproject.feign.IWaybillDesClient; import com.logpm.warehouse.dto.ProductDTO; import com.logpm.warehouse.dto.SplitOrderDTO; +import com.logpm.warehouse.dto.WarehouseWaybillDTO; import com.logpm.warehouse.dto.WaybillDTO; import com.logpm.warehouse.entity.WarehouseWayBillDetail; import com.logpm.warehouse.entity.WarehouseWaybillEntity; +import com.logpm.warehouse.excel.WarehouseWaybillExcel; import com.logpm.warehouse.mapper.WarehouseWaybillMapper; import com.logpm.warehouse.service.IWarehouseWayBillDetailService; import com.logpm.warehouse.service.IWarehouseWaybillService; import com.logpm.warehouse.vo.WarehouseWaybillVO; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.TenantNum; import org.springblade.common.constant.order.*; import org.springblade.common.exception.CustomerException; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.StringUtil; +import org.springblade.system.cache.DictBizCache; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; +import java.util.stream.Collectors; /** * 运单;(logpm_mainline_waybill)表服务实现类 @@ -607,4 +614,72 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl exportWarehouseWarehousingDetail(Map warehouseWaybillEntity) { + + Object o = warehouseWaybillEntity.get("ids"); + if(ObjectUtils.isNotNull(o)){ + warehouseWaybillEntity.remove("ids"); + } +// BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); +// if(ObjectUtils.isNull()){ +// throw new ServiceException("请选择仓库！"); +// } + QueryWrapper queryWrapper = Condition.getQueryWrapper(warehouseWaybillEntity, WarehouseWaybillEntity.class); +// if(ObjectUtils.isNotNull(o)){ +// queryWrapper.in("id",String.valueOf(o).split(",")); +// } + + //获取当前登录人仓库 + List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); + List collect = myWatchWarehouse.stream() + .map(BasicdataWarehouseEntity::getId) + .collect(Collectors.toList()); + queryWrapper.lambda() + .in(collect.size() > 0, WarehouseWaybillEntity::getDepartureWarehouseId, collect) + .in(ObjectUtils.isNotNull(o), WarehouseWaybillEntity::getId,String.valueOf(o).split(",")) + .or() + .in(collect.size() > 0, WarehouseWaybillEntity::getDestinationWarehouseId, collect) + .in(ObjectUtils.isNotNull(o), WarehouseWaybillEntity::getId,String.valueOf(o).split(",")); + queryWrapper.lambda().eq(WarehouseWaybillEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = new ArrayList<>(); + List warehouseWaybillVOS = baseMapper.exportWarehouseWarehousingDetail(queryWrapper); + warehouseWaybillVOS.forEach( w ->{ + WarehouseWaybillExcel waybillExcel = new WarehouseWaybillExcel(); + BeanUtil.copyProperties(w,waybillExcel); + String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, w.getServiceType()); + waybillExcel.setServiceTypeName(value); + String value1 = DictBizCache.getValue(DictBizConstant.FREEZE_STATUS, w.getFreezeStatus()); + waybillExcel.setFreezeStatusName(value1); + + list.add(waybillExcel); + }); + return list; + } + + @Override + public IPage pageInfo(IPage page, Map warehouseWaybill) { + WarehouseWaybillDTO warehouseWaybillDTO = JSON.parseObject(JSONObject.toJSONString(warehouseWaybill), WarehouseWaybillDTO.class); +// QueryWrapper queryWrapper = Condition.getQueryWrapper(warehouseWaybill, WarehouseWaybillEntity.class); + //获取当前登录人仓库 + List myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse(); + List collect = myWatchWarehouse.stream() + .map(BasicdataWarehouseEntity::getId) + .collect(Collectors.toList()); +// queryWrapper.lambda() +// .in(collect.size() > 0, WarehouseWaybillEntity::getDepartureWarehouseId, collect) +// .or() +// .in(collect.size() > 0, WarehouseWaybillEntity::getDestinationWarehouseId, collect); + if(!collect.isEmpty()){ + warehouseWaybillDTO.setDepartureWarehouseIds(collect); + warehouseWaybillDTO.setDestinationWarehouseIds(collect); + } + return baseMapper.pageInfo(page,warehouseWaybillDTO); + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseRetentionRecordWrapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseRetentionRecordWrapper.java index 4f3dfcea2..dda16518b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseRetentionRecordWrapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseRetentionRecordWrapper.java @@ -18,8 +18,10 @@ package com.logpm.warehouse.wrapper; import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity; import com.logpm.warehouse.vo.WarehouseRetentionRecordVO; +import org.springblade.common.constant.DictBizConstant; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.system.cache.DictBizCache; import java.util.Objects; @@ -38,7 +40,7 @@ public class WarehouseRetentionRecordWrapper extends BaseEntityWrapper { + + public static WarehouseRetentionScanWrapper build() { + return new WarehouseRetentionScanWrapper(); + } + + @Override + public WarehouseRetentionScanVO entityVO(WarehouseRetentionScanEntity warehouseRetentionScanEntity) { + WarehouseRetentionScanVO warehouseRetentionScanVO = Objects.requireNonNull(BeanUtil.copy(warehouseRetentionScanEntity, WarehouseRetentionScanVO.class)); +// warehouseRetentionRecordVO.setRetentionTypeName(DictBizCache.getValue(DictBizConstant.WAREHOUSE_TRAY_BINDING_TYPE, warehouseRetentionRecord.getRetentionType())); + //User createUser = UserCache.getUser(warehouseRetentionRecord.getCreateUser()); + //User updateUser = UserCache.getUser(warehouseRetentionRecord.getUpdateUser()); + //warehouseRetentionRecordVO.setCreateUserName(createUser.getName()); + //warehouseRetentionRecordVO.setUpdateUserName(updateUser.getName()); + + return warehouseRetentionScanVO; + } + + +} diff --git a/blade-service/pom.xml b/blade-service/pom.xml index f1c7a59aa..7624a7b3a 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -49,6 +49,11 @@ blade-biz-common ${bladex.project.version} + + + org.springblade + blade-starter-metrics + org.springblade blade-starter-tenant