diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java index 461dd4926..ccd03c30b 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java @@ -47,6 +47,6 @@ public interface IBasicdataStoreBusinessClient { BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); @GetMapping(API_PREFIX+"/findByClientIdAndTypeService") - BasicdataStoreBusinessEntity findByClientIdAndTypeService(Long clientEntityId, Integer typeService); + BasicdataStoreBusinessEntity findByClientIdAndTypeService(@RequestParam Long clientEntityId,@RequestParam Integer typeService); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java index 58059b946..5c373c9e5 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java @@ -71,7 +71,7 @@ public class DistributionDeliveryChargeEntity extends TenantEntity { * 费用类型 */ @ApiModelProperty(value = "费用类型") - private Integer cost; + private String cost; /** * 金额 */ @@ -81,6 +81,6 @@ public class DistributionDeliveryChargeEntity extends TenantEntity { * 类型 */ @ApiModelProperty(value = "类型") - private Integer genre; + private String genre; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java new file mode 100644 index 000000000..e7fbfde97 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java @@ -0,0 +1,80 @@ +/* + * 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.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 提货订单明细 实体类 + * + * @author cyz + * @since 2023-06-28 + */ +@Data +@TableName("logpm_distribution_delivery_details") +@ApiModel(value = "DistributionDeliveryDetails对象", description = "提货订单明细") +@EqualsAndHashCode(callSuper = true) +public class DistributionDeliveryDetailsEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 提货ID + */ + @ApiModelProperty(value = "提货ID") + private Long billLadingId; + /** + * 库存品ID + */ + @ApiModelProperty(value = "库存品ID") + private Long stockId; + /** + * 数量 + */ + @ApiModelProperty(value = "数量") + private Integer quantity; + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPrintEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPrintEntity.java index 557c072a1..7337dd434 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPrintEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPrintEntity.java @@ -65,7 +65,7 @@ public class DistributionPrintEntity extends TenantEntity { * 提货单ID */ @ApiModelProperty(value = "提货单ID") - private String billLadingId; + private Long billLadingId; /** * 类型;1.提货证件 2.文员确认 3.库管签收 */ @@ -76,5 +76,10 @@ public class DistributionPrintEntity extends TenantEntity { */ @ApiModelProperty(value = "图片地址") private String site; + /** + * 图片名称 + */ + @ApiModelProperty(value = "图片名称") + private String siteName; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index f8ea6f9c2..9c4269a9c 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -193,6 +193,27 @@ public class DistributionStockArticleEntity extends TenantEntity { */ @ApiModelProperty(value = "预约数量") private Integer reservationNum; + /** + * 运单号 + */ + @ApiModelProperty(value = "运单号") + private Integer waybillNumber; + /** + * 收货单位 + */ + @ApiModelProperty(value = "收货单位") + private Integer consigneeUnit; + /** + * 预约数量 + */ + @ApiModelProperty(value = "到付费用") + private BigDecimal collectFee; + /** + * 仓储费 + */ + @ApiModelProperty(value = "仓储费") + private BigDecimal storageFee; + diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryDetailsClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryDetailsClient.java new file mode 100644 index 000000000..15f66aba2 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryDetailsClient.java @@ -0,0 +1,49 @@ +/* + * 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.feign; + +import org.springblade.core.mp.support.BladePage; +import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 提货订单明细 Feign接口类 + * + * @author cyz + * @since 2023-06-28 + */ +@FeignClient( + value = "blade-distributionDeliveryDetails" +) +public interface IDistributionDeliveryDetailsClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/to234p"; + + /** + * 获取提货订单明细列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryDetailsVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryDetailsVO.java new file mode 100644 index 000000000..c3cabf6fa --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryDetailsVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.vo; + +import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 提货订单明细 视图实体类 + * + * @author cyz + * @since 2023-06-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionDeliveryDetailsVO extends DistributionDeliveryDetailsEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java index 1b555ce74..28361ce9f 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java @@ -18,6 +18,9 @@ package com.logpm.distribution.vo; import com.logpm.distribution.entity.DistributionAddvalueEntity; import com.logpm.distribution.entity.DistributionReservationEntity; +import com.logpm.distribution.entity.DistributionStockArticleEntity; +import com.logpm.distribution.entity.DistributionStockListEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,10 +37,19 @@ import java.util.List; public class DistributionReservationVO extends DistributionReservationEntity { private static final long serialVersionUID = 1L; - //增值服务信息 - List addvalueEntityList; - //订单信息 - List orderInfos; + /** + * 库存品信息列表 + */ + @ApiModelProperty(value = "库存品信息列表") + private List inventoryList; + + /** + * 订单信息列表 + */ + @ApiModelProperty(value = "订单信息列表") + private List stockArticleList; + + } 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 bf4281968..9778ab51f 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 @@ -16,11 +16,14 @@ */ package com.logpm.distribution.vo; +import com.logpm.distribution.entity.DistributionDeliveryChargeEntity; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 提货单 视图实体类 * @@ -32,4 +35,20 @@ import lombok.EqualsAndHashCode; public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity { private static final long serialVersionUID = 1L; + private String serviceNumber; + private String waybillNumber; + private String consigneeUnit; + private String customerName; + private String customerTelephone; + private String warehouse; + private String warehouseEntryTime; + private String storageFee; + private String totalNumber; + private String brand; + private String typeService; + private String transport; //搬运 + private String forklift; //叉车 + + private List list; + } 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 a7183d26e..7dd43267a 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 @@ -102,7 +102,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl detail(DistributionDeliveryDetailsEntity distributionDeliveryDetails) { + DistributionDeliveryDetailsEntity detail = distributionDeliveryDetailsService.getOne(Condition.getQueryWrapper(distributionDeliveryDetails)); + return R.data(detail); + } + /** + * 提货订单明细 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionDeliveryDetails") + public R> list(@ApiIgnore @RequestParam Map distributionDeliveryDetails, Query query) { + IPage pages = distributionDeliveryDetailsService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionDeliveryDetails, DistributionDeliveryDetailsEntity.class)); + return R.data(pages); + } + + /** + * 提货订单明细 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入distributionDeliveryDetails") + public R> page(DistributionDeliveryDetailsVO distributionDeliveryDetails, Query query) { + IPage pages = distributionDeliveryDetailsService.selectDistributionDeliveryDetailsPage(Condition.getPage(query), distributionDeliveryDetails); + return R.data(pages); + } + + /** + * 提货订单明细 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入distributionDeliveryDetails") + public R save(@Valid @RequestBody DistributionDeliveryDetailsEntity distributionDeliveryDetails) { + return R.status(distributionDeliveryDetailsService.save(distributionDeliveryDetails)); + } + + /** + * 提货订单明细 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入distributionDeliveryDetails") + public R update(@Valid @RequestBody DistributionDeliveryDetailsEntity distributionDeliveryDetails) { + return R.status(distributionDeliveryDetailsService.updateById(distributionDeliveryDetails)); + } + + /** + * 提货订单明细 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入distributionDeliveryDetails") + public R submit(@Valid @RequestBody DistributionDeliveryDetailsEntity distributionDeliveryDetails) { + return R.status(distributionDeliveryDetailsService.saveOrUpdate(distributionDeliveryDetails)); + } + + /** + * 提货订单明细 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(distributionDeliveryDetailsService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-distributionDeliveryDetails") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入distributionDeliveryDetails") + public void exportDistributionDeliveryDetails(@ApiIgnore @RequestParam Map distributionDeliveryDetails, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionDeliveryDetails, DistributionDeliveryDetailsEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(DistributionDeliveryDetails::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(DistributionDeliveryDetailsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = distributionDeliveryDetailsService.exportDistributionDeliveryDetails(queryWrapper); + ExcelUtil.export(response, "提货订单明细数据" + DateUtil.time(), "提货订单明细数据表", list, DistributionDeliveryDetailsExcel.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 06926e97c..997342712 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 @@ -194,4 +194,16 @@ public class DistributionReservationController extends BladeController { R result = reservationService.deliveryTask(deliveryInfo); return result; } + + + /** + * 获取指定预约信息 + */ + @GetMapping("/getReservationInfo") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "批量预约转备货任务") + public R getReservationInfo(@RequestParam String reservationId) { + R result = reservationService.getReservationInfo(reservationId); + return result; + } } 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 9ef74c6bc..b4879d9f5 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 @@ -16,6 +16,7 @@ */ package com.logpm.distribution.controller; +import com.logpm.distribution.dto.DistrilbutionBillLadingDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -79,6 +80,18 @@ public class DistrilbutionBillLadingController extends BladeController { return R.data(pages); } + + /** + * 提货单 分页 + */ + @GetMapping("/listOwn") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distrilbutionBillLading") + public R> listOwn(@ApiIgnore @RequestParam Map distrilbutionBillLading, Query query) { + IPage pages = distrilbutionBillLadingService.pageList(Condition.getPage(query), distrilbutionBillLading); + return R.data(pages); + } + /** * 提货单 自定义分页 */ @@ -116,7 +129,7 @@ public class DistrilbutionBillLadingController extends BladeController { @PostMapping("/submit") @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入distrilbutionBillLading") - public R submit(@Valid @RequestBody DistrilbutionBillLadingEntity distrilbutionBillLading) { + public R submit(@Valid @RequestBody DistrilbutionBillLadingDTO distrilbutionBillLading) { return R.status(distrilbutionBillLadingService.ownSaveOrUpdate(distrilbutionBillLading)); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryDetailsDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryDetailsDTO.java new file mode 100644 index 000000000..8de2a0028 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryDetailsDTO.java @@ -0,0 +1,34 @@ +/* + * 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.dto; + +import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 提货订单明细 数据传输对象实体类 + * + * @author cyz + * @since 2023-06-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionDeliveryDetailsDTO extends DistributionDeliveryDetailsEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockListDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockListDTO.java index 374a933bc..48330c2ce 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockListDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockListDTO.java @@ -31,4 +31,9 @@ import lombok.EqualsAndHashCode; public class DistributionStockListDTO extends DistributionStockListEntity { private static final long serialVersionUID = 1L; + /** + * 添加数量 + */ + private Integer inventoryQuantity; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java index 9d603013d..dd3209359 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java @@ -20,6 +20,8 @@ import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 提货单 数据传输对象实体类 * @@ -31,4 +33,28 @@ import lombok.EqualsAndHashCode; public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity { private static final long serialVersionUID = 1L; + /** + * + */ + private String name; + /** + * 订单Id + */ + private String stockArticleId; + /** + * 库存品 + */ + private List stockDTOList; + + private List printList; + + @Data + public class print{ + + private String state; + private String name; + private String url; + + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryDetailsExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryDetailsExcel.java new file mode 100644 index 000000000..6b4f7c50f --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryDetailsExcel.java @@ -0,0 +1,105 @@ +/* + * 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 lombok.Data; + +import java.util.Date; +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 java.io.Serializable; + + +/** + * 提货订单明细 Excel实体类 + * + * @author cyz + * @since 2023-06-28 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class DistributionDeliveryDetailsExcel 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 String billLadingId; + /** + * 库存品ID + */ + @ColumnWidth(20) + @ExcelProperty("库存品ID") + private String stockId; + /** + * 数量 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private Integer quantity; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryDetailsClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryDetailsClient.java new file mode 100644 index 000000000..00b05d625 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryDetailsClient.java @@ -0,0 +1,53 @@ +/* + * 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.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; +import com.logpm.distribution.service.IDistributionDeliveryDetailsService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 提货订单明细 Feign实现类 + * + * @author cyz + * @since 2023-06-28 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class DistributionDeliveryDetailsClient implements IDistributionDeliveryDetailsClient { + + private final IDistributionDeliveryDetailsService distributionDeliveryDetailsService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = distributionDeliveryDetailsService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.java new file mode 100644 index 000000000..c3a371df0 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.java @@ -0,0 +1,54 @@ +/* + * 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.mapper; + +import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; +import com.logpm.distribution.vo.DistributionDeliveryDetailsVO; +import com.logpm.distribution.excel.DistributionDeliveryDetailsExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 提货订单明细 Mapper 接口 + * + * @author cyz + * @since 2023-06-28 + */ +public interface DistributionDeliveryDetailsMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param distributionDeliveryDetails + * @return + */ + List selectDistributionDeliveryDetailsPage(IPage page, DistributionDeliveryDetailsVO distributionDeliveryDetails); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportDistributionDeliveryDetails(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml new file mode 100644 index 000000000..84d6f5eef --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 4e4625569..bf71a59a8 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 @@ -36,8 +36,8 @@ - - + + 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 30fdb906b..91c4096de 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 @@ -31,7 +31,7 @@ - + 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 cc1264244..62be454b1 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 @@ -51,4 +51,5 @@ public interface DistrilbutionBillLadingMapper extends BaseMapper exportDistrilbutionBillLading(@Param("ew") Wrapper queryWrapper); + IPage pageList(IPage page, DistrilbutionBillLadingEntity distrilbutionBillLadingEntity); } 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 8723df113..aa71b6a66 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 @@ -25,7 +25,15 @@ +