From a68114e758fbe28a5d17d3df654eef47009f32d3 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Tue, 15 Aug 2023 14:48:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=EF=BC=8C=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/DictBizConstant.java | 2 + .../billLading/BillLadingStatusConstant.java | 50 ++++++ .../DistributionDeliveryChargeEntity.java | 7 + .../DistributionDeliveryDetailsEntity.java | 5 + .../entity/DistrilbutionBillLadingEntity.java | 5 + .../entity/DistrilbutionBillStockEntity.java | 5 + .../vo/DistributionBillInventoryVO.java | 20 +++ .../vo/DistributionBillOrderPackVO.java | 22 +++ .../vo/DistributionBillOrderVO.java | 23 +++ .../vo/DistrilbutionBillLadingDetailsVO.java | 7 +- .../vo/DistrilbutionBillLadingVO.java | 4 + .../vo/DistrilbutionBillLadingViewVO.java | 22 +++ ...DistributionDeliveryDetailsController.java | 11 ++ .../DistributionStockArticleController.java | 6 + .../DistrilbutionBillLadingController.java | 84 +++++---- .../DistrilbutionBillStockController.java | 27 ++- .../dto/DistrilbutionBillLadingDTO.java | 13 ++ .../DistributionDeliveryDetailsMapper.java | 3 + .../DistributionDeliveryDetailsMapper.xml | 13 ++ .../mapper/DistrilbutionBillLadingMapper.java | 9 +- .../mapper/DistrilbutionBillLadingMapper.xml | 40 ++++- .../mapper/DistrilbutionBillStockMapper.java | 6 + .../mapper/DistrilbutionBillStockMapper.xml | 32 ++++ .../IDistributionDeliveryDetailsService.java | 4 + .../IDistrilbutionBillLadingService.java | 24 ++- .../IDistrilbutionBillStockService.java | 14 ++ ...istributionDeliveryDetailsServiceImpl.java | 9 + .../DistrilbutionBillLadingServiceImpl.java | 163 +++++++++++++++++- .../DistrilbutionBillStockServiceImpl.java | 34 ++++ 29 files changed, 604 insertions(+), 60 deletions(-) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/billLading/BillLadingStatusConstant.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillInventoryVO.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingViewVO.java 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 6d9af25be..f17c077a3 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 @@ -25,6 +25,8 @@ public class DictBizConstant { public static final String ORDER_PACKAGE_GROUNDING_STATUS = "order_package_grounding_status";//包间上架状态 public static final String ORDER_PACKAGE_RESERVATION_STATUS = "order_package_reservation_status";//包件预约状态 public static final String STOCK_ALLOCATION = "stock_assign_status";//包间上架状态 + public static final String CERTIFICATE_TYPE = "certificate_type";//证件类型 + public static final String DELIVERY_COST = "delivery_cost";//证件类型 public static final String LOGPM_UNIT = "logpm_unit";//包间上架状态 diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/billLading/BillLadingStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/billLading/BillLadingStatusConstant.java new file mode 100644 index 000000000..0c4c83d9f --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/billLading/BillLadingStatusConstant.java @@ -0,0 +1,50 @@ +package org.springblade.common.constant.billLading; + +public enum BillLadingStatusConstant { + ZC("正常","1"), + TJ("添加","2"), + QX("取消","3"), + WTZ("未通知","1"), + YTZ("已通知","2"), + DBH("待备货","3"), + BHZ("备货中","4"), + BHWC("备货完成","5"), + YTH("已提货","6"), + YQS("已签收","7"), + YWC("已完成","8"); + + + + + /** + * 状态 + */ + private String name; + + /** + * 值 + */ + private String value; + + + private BillLadingStatusConstant(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} 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 5c373c9e5..5efd39625 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 @@ -16,6 +16,7 @@ */ package com.logpm.distribution.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; @@ -72,6 +73,12 @@ public class DistributionDeliveryChargeEntity extends TenantEntity { */ @ApiModelProperty(value = "费用类型") private String cost; + /** + * 费用类型 + */ + @ApiModelProperty(value = "费用类型") + @TableField(exist = false) + private String costName; /** * 金额 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java index ff550bdbc..69e46b639 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java @@ -81,5 +81,10 @@ public class DistributionDeliveryDetailsEntity extends TenantEntity { */ @ApiModelProperty(value = "状态") private String conditions; + /** + * 状态 + */ + @ApiModelProperty(value = "状态") + private String inventoryStatus; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java index 2b25230de..af5c6a970 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillLadingEntity.java @@ -102,6 +102,11 @@ public class DistrilbutionBillLadingEntity extends TenantEntity { */ @ApiModelProperty(value = "证件类型") private String certificateType; + /** + * 证件类型 + */ + @ApiModelProperty(value = "证件类型") + private String certificateTypeName; /** * 费用合计 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillStockEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillStockEntity.java index dda3abccb..f8568378b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillStockEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionBillStockEntity.java @@ -76,6 +76,11 @@ public class DistrilbutionBillStockEntity extends TenantEntity { */ @ApiModelProperty(value = "状态") private String conditions; + /** + * 订单状态 + */ + @ApiModelProperty(value = "订单状态") + private String orderStatus; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillInventoryVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillInventoryVO.java new file mode 100644 index 000000000..a59aa2f1b --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillInventoryVO.java @@ -0,0 +1,20 @@ +package com.logpm.distribution.vo; + +import lombok.Data; + +/** + * @program: LogisticsPlatform-Service + * @description: + * @author: cyz + * @create: 2023-08-15 11:42 + **/ +@Data +public class DistributionBillInventoryVO { + private String sku; + private String descriptionGoods; + private String quantity; + private String cargoNumber; + private String cargoUnit; + private String allocation; + private String preparedQuantity; //以扫 +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java new file mode 100644 index 000000000..ab943a3e3 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java @@ -0,0 +1,22 @@ +package com.logpm.distribution.vo; + +import lombok.Data; + +/** + * @program: LogisticsPlatform-Service + * @description: + * @author: cyz + * @create: 2023-08-15 11:13 + **/ +@Data +public class DistributionBillOrderPackVO { + private String orderPackageCode; + private String warehouse; + private String firsts; + private String second; + private String thirdProduct; + private String materialCode; + private String materialName; + private String pallet; + private String goodsAllocation; +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java new file mode 100644 index 000000000..4e0690f90 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java @@ -0,0 +1,23 @@ +package com.logpm.distribution.vo; + +import lombok.Data; + +/** + * @program: LogisticsPlatform-Service + * @description: + * @author: cyz + * @create: 2023-08-15 09:52 + **/ +@Data +public class DistributionBillOrderVO { + private String orderCode; + private String descriptionGoods; + private String stockupStatus; + private String stockupStatusName; + private String handQuantity; + private String materialName; + private String preparedQuantity; + private String goodsAllocation; + private String pallet; + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingDetailsVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingDetailsVO.java index 2052acc39..6fe1b77e5 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingDetailsVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingDetailsVO.java @@ -16,10 +16,7 @@ */ package com.logpm.distribution.vo; -import com.logpm.distribution.entity.DistributionDeliveryChargeEntity; -import com.logpm.distribution.entity.DistributionParcelListEntity; -import com.logpm.distribution.entity.DistributionPrintEntity; -import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; +import com.logpm.distribution.entity.*; import lombok.Data; import lombok.EqualsAndHashCode; @@ -38,7 +35,7 @@ public class DistrilbutionBillLadingDetailsVO extends DistrilbutionBillLadingEnt /** * 订单数据 */ - private List stockArticleVOS; + private List stockArticleVOS; /** * 库存品数据 */ 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 56cc7e075..cbf998019 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 @@ -18,6 +18,7 @@ package com.logpm.distribution.vo; import com.logpm.distribution.entity.DistributionDeliveryChargeEntity; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; +import io.swagger.models.auth.In; import lombok.Data; import lombok.EqualsAndHashCode; @@ -55,6 +56,9 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity { private String stockupStatusName; private String assignStatusName; + private Integer treatNum; //待 + private Integer stopNum; //已 + private List list; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingViewVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingViewVO.java new file mode 100644 index 000000000..560a80cb8 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingViewVO.java @@ -0,0 +1,22 @@ +package com.logpm.distribution.vo; + +import lombok.Data; + +/** + * @program: LogisticsPlatform-Service + * @description: + * @author: cyz + * @create: 2023-08-14 21:02 + **/ +@Data +public class DistrilbutionBillLadingViewVO { + + private String pickupBatch; + private String waybillNumber; + private String serviceNumber; + private String consigneeUnit; + private String customerName; + private String customerTelephone; + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryDetailsController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryDetailsController.java index 66587f202..31c984e1b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryDetailsController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryDetailsController.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.controller; +import com.logpm.distribution.vo.DistributionBillInventoryVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -78,6 +79,16 @@ public class DistributionDeliveryDetailsController extends BladeController { IPage pages = distributionDeliveryDetailsService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionDeliveryDetails, DistributionDeliveryDetailsEntity.class)); return R.data(pages); } + /** + * 提货订单明细 分页 + */ + @GetMapping("/billOrderInventory") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionDeliveryDetails") + public R> getBillOrderInventory(@ApiIgnore @RequestParam Map distributionDeliveryDetails, Query query) { + IPage pages = distributionDeliveryDetailsService.getBillOrderInventory(Condition.getPage(query),distributionDeliveryDetails); + return R.data(pages); + } /** * 提货订单明细 自定义分页 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 c135f9ccc..88fb1539b 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 @@ -89,10 +89,16 @@ public class DistributionStockArticleController extends BladeController { Object o2 = distributionStockArticle.get("startDate"); Object o1 = distributionStockArticle.get("entDate"); Object d = distributionStockArticle.get("id"); + Object reservation = distributionStockArticle.get("reservation"); distributionStockArticle.remove("id"); distributionStockArticle.remove("startDate"); + distributionStockArticle.remove("reservation"); distributionStockArticle.remove("entDate"); QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class); + if(Func.isNotEmpty(reservation)){ + queryWrapper.in("reservation_status","10"); + + } if(Func.isNotEmpty(o)){ queryWrapper.in("order_self_numbering",String.valueOf(o).split(",")); } 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 c31d627b7..99092111b 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 @@ -24,15 +24,14 @@ import com.logpm.distribution.dto.DistrilbutionBillLadingDTO; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import com.logpm.distribution.excel.DistrilbutionBillLadingExcel; import com.logpm.distribution.service.IDistrilbutionBillLadingService; -import com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO; -import com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO; -import com.logpm.distribution.vo.DistrilbutionBillLadingVO; +import com.logpm.distribution.vo.*; import com.logpm.distribution.wrapper.DistrilbutionBillLadingWrapper; 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 org.springblade.common.constant.billLading.BillLadingStatusConstant; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; @@ -51,9 +50,11 @@ import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Stream; /** * 提货单 控制器 @@ -82,6 +83,27 @@ public class DistrilbutionBillLadingController extends BladeController { DistrilbutionBillLadingDetailsVO detail = distrilbutionBillLadingService.getDetailOne(distrilbutionBillLading); return R.data(detail); } + /** + * 提货单 详情 + */ + @GetMapping("/listNum") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distrilbutionBillLading") + public R listNum(@ApiIgnore @RequestParam Map distrilbutionBillLading) { + DistrilbutionBillLadingVO detail = distrilbutionBillLadingService.listNum(distrilbutionBillLading); + return R.data(detail); + } + /** + * 提货单 详情 + */ + @GetMapping("/viewDetailOwn") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distrilbutionBillLading") + public R> getViewDetailOwn(@RequestParam String id) { + List detail = distrilbutionBillLadingService.getViewDetailOwn(id); + return R.data(detail); + } + /** * 提货单 分页 */ @@ -97,6 +119,7 @@ public class DistrilbutionBillLadingController extends BladeController { } QueryWrapper queryWrapper = Condition.getQueryWrapper(distrilbutionBillLading, DistrilbutionBillLadingEntity.class); queryWrapper.between(StringUtils.isNotEmpty((CharSequence) o),"pick_up_time",o,o1); + queryWrapper.orderByDesc("create_time"); IPage pages = distrilbutionBillLadingService.page(Condition.getPage(query),queryWrapper ); return R.data(DistrilbutionBillLadingWrapper.build().pageVO(pages)); } @@ -112,41 +135,22 @@ public class DistrilbutionBillLadingController extends BladeController { IPage pages = distrilbutionBillLadingService.pageList(Condition.getPage(query), distrilbutionBillLading); List records = pages.getRecords(); records.forEach( i ->{ - String typeService = i.getTypeService(); - String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService()); - i.setTypeServiceName(value); + i.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService())); + i.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, i.getCertificateType())); // dictBizClient.getList("distribution_type"); - if(!Objects.isNull(i.getTypeService())){ - if(Func.isNotEmpty(typeService)){ - - switch (Integer.parseInt(i.getConditions())){ - case 1: - i.setConditionName("未通知"); - break; - case 2: - i.setConditionName("已通知"); - break; - case 3: - i.setConditionName("待备货"); - break; - case 4: - i.setConditionName("备货中"); - break; - case 5: - i.setConditionName("备货完成"); - break; - case 6: - i.setConditionName("已提货"); - break; - case 7: - i.setConditionName("已完成"); - break; - default: - i.setConditionName("无"); - break; + /* Stream.of(BillLadingStatusConstant.values()).forEach( + ii ->{ + if(i.getConditions().equals(ii.getValue())){ + i.setConditionName(BillLadingStatusConstant.WTZ.getName()); } } - } + );*/ + // 遍历BillLadingStatusConstant的所有枚举值 + Arrays.stream(BillLadingStatusConstant.values()) + .filter(ii -> i.getConditions().equals(ii.getValue())) // 根据条件过滤 + .findFirst() // 找到第一个匹配的枚举值 + .ifPresent(ii -> i.setConditionName(ii.getName())); // 修改属性值（如果有匹配的枚举值） + } ); return R.data(pages); @@ -236,6 +240,16 @@ public class DistrilbutionBillLadingController extends BladeController { public R update(@Valid @RequestBody DistrilbutionBillLadingEntity distrilbutionBillLading) { return R.status(distrilbutionBillLadingService.updateById(distrilbutionBillLading)); } + /** + * 提货单 自己修改 + */ + @PostMapping("/updateOwn") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入distrilbutionBillLading") + public R updateOwn(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + Boolean st = distrilbutionBillLadingService.updateOwn(ids); + return R.status(st); + } /** * 提货单 新增或修改 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java index 7990ecd69..0d61d39e7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java @@ -16,6 +16,9 @@ */ package com.logpm.distribution.controller; +import com.logpm.distribution.vo.DistributionBillOrderPackVO; +import com.logpm.distribution.vo.DistributionBillOrderVO; +import com.logpm.distribution.vo.DistributionStockArticleVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -52,7 +55,7 @@ import javax.servlet.http.HttpServletResponse; */ @RestController @AllArgsConstructor -@RequestMapping("blade-distrilbutionBillStock/distrilbutionBillStock") +@RequestMapping("/distrilbutionBillStock") @Api(value = "提货单订单信息关联", tags = "提货单订单信息关联接口") public class DistrilbutionBillStockController extends BladeController { @@ -68,6 +71,28 @@ public class DistrilbutionBillStockController extends BladeController { DistrilbutionBillStockEntity detail = distrilbutionBillStockService.getOne(Condition.getQueryWrapper(distrilbutionBillStock)); return R.data(detail); } + + /** + * 提货单 详情 + */ + @GetMapping("/billOrderDetail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distrilbutionBillLading") + public R> getBillOrderDetail(@ApiIgnore @RequestParam Map distrilbutionBillStock, Query query) { + IPage detail = distrilbutionBillStockService.getBillOrderDetail(distrilbutionBillStock,Condition.getPage(query)); + return R.data(detail); + } + /** + * 提货单 详情 + */ + @GetMapping("/billOrderPack") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distrilbutionBillLading") + public R> getBillOrderPack(@ApiIgnore @RequestParam Map distrilbutionBillStock, Query query) { + IPage detail = distrilbutionBillStockService.getBillOrderPack(distrilbutionBillStock,Condition.getPage(query)); + return R.data(detail); + } + /** * 提货单订单信息关联 分页 */ 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 23c104457..402f7d610 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 @@ -17,6 +17,7 @@ package com.logpm.distribution.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -96,6 +97,14 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity { * 提货人 */ private String consignee; + /** + * 开始时间 + */ + private String startDate; + /** + * 结束时间 + */ + private String entDate; /** * 提货车牌 */ @@ -116,6 +125,10 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity { * 库存品 */ private List stockDTOList; + /** + * 订单数据 + */ + private List stockArticleList; private List printList; 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 index 19cdf5b3f..ecc3fefec 100644 --- 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 @@ -17,6 +17,7 @@ package com.logpm.distribution.mapper; import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; +import com.logpm.distribution.vo.DistributionBillInventoryVO; import com.logpm.distribution.vo.DistributionDeliveryDetailsVO; import com.logpm.distribution.excel.DistributionDeliveryDetailsExcel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -65,4 +66,6 @@ public interface DistributionDeliveryDetailsMapper extends BaseMapper getBillOrderInventory(IPage page, @Param("param") DistributionDeliveryDetailsEntity deliveryDetails); } 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 index 3bbbbe904..33d844666 100644 --- 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 @@ -48,5 +48,18 @@ from logpm_distribution_delivery_details lddd LEFT JOIN logpm_distribution_stock lds on lddd.stock_list_id = lds.stock_list_id where lddd.is_deleted = 0 and lddd.bill_lading_id = #{billLadingId} and lds.coding = #{coding} + 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 8182ca9e8..8ce2b3cb5 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 @@ -23,10 +23,7 @@ import com.logpm.distribution.dto.DistrilbutionBillLadingDTO; import com.logpm.distribution.dto.app.BillLadingAppDTO; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import com.logpm.distribution.excel.DistrilbutionBillLadingExcel; -import com.logpm.distribution.vo.DistrilbutionBillLadingAppVO; -import com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO; -import com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO; -import com.logpm.distribution.vo.DistrilbutionBillLadingVO; +import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -85,4 +82,8 @@ public interface DistrilbutionBillLadingMapper extends BaseMapper getInventory(IPage page,@Param("param") DistrilbutionBillLadingEntity distrilbutionBillLadingEntity); + + DistrilbutionBillLadingVO getBillLadingNum(@Param("param") DistrilbutionBillLadingDTO billLadingEntity); + + List getViewDetailOwn(String id); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index b17ac8bf4..10f78ea19 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 @@ -28,8 +28,9 @@ + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java index 45a897017..100c33ba1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java @@ -17,6 +17,9 @@ package com.logpm.distribution.mapper; import com.logpm.distribution.entity.DistrilbutionBillStockEntity; +import com.logpm.distribution.vo.DistributionBillOrderPackVO; +import com.logpm.distribution.vo.DistributionBillOrderVO; +import com.logpm.distribution.vo.DistributionStockArticleVO; import com.logpm.distribution.vo.DistrilbutionBillStockVO; import com.logpm.distribution.excel.DistrilbutionBillStockExcel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -51,4 +54,7 @@ public interface DistrilbutionBillStockMapper extends BaseMapper exportDistrilbutionBillStock(@Param("ew") Wrapper queryWrapper); + IPage getBillOrderDetail(IPage page,@Param("param") DistrilbutionBillStockEntity distrilbutionBillStock); + + IPage getBillOrderPack(IPage page,@Param("param") DistrilbutionBillStockEntity billStock); } 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 8471845b1..29117eedd 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 @@ -15,5 +15,37 @@ + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java index 22b21b1d1..9797a4db1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java @@ -18,6 +18,7 @@ package com.logpm.distribution.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; +import com.logpm.distribution.vo.DistributionBillInventoryVO; import com.logpm.distribution.vo.DistributionDeliveryDetailsVO; import com.logpm.distribution.excel.DistributionDeliveryDetailsExcel; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -25,6 +26,7 @@ import com.logpm.distribution.vo.DistrilbutionBillLadingAppVO; import com.logpm.distribution.vo.app.DistrilbutionBillLadingInventoryAppVO; import org.springblade.core.mp.base.BaseService; import java.util.List; +import java.util.Map; /** * 提货订单明细 服务类 @@ -59,4 +61,6 @@ public interface IDistributionDeliveryDetailsService extends BaseService getBillOrderInventory(IPage page, Map distributionDeliveryDetails); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java index fcbd1030c..23f55a81a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java @@ -22,13 +22,9 @@ import com.logpm.distribution.dto.DistrilbutionBillLadingDTO; import com.logpm.distribution.dto.app.BillLadingAppDTO; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import com.logpm.distribution.excel.DistrilbutionBillLadingExcel; -import com.logpm.distribution.vo.DistrilbutionBillLadingAppVO; -import com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO; -import com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO; -import com.logpm.distribution.vo.DistrilbutionBillLadingVO; +import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderMainVO; import org.springblade.core.mp.base.BaseService; -import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import java.util.List; @@ -122,4 +118,22 @@ public interface IDistrilbutionBillLadingService extends BaseService getInventoryNum(IPage page, Map distrilbutionBillLading); + + Boolean updateOwn(String ids); + + /** + * 查询数据 + * @param distrilbutionBillLading + * @return + */ + DistrilbutionBillLadingVO listNum(Map distrilbutionBillLading); + + /** + * 查询详情详细 + * @param id + * @return + */ + List getViewDetailOwn(String id); + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java index 78c9a068d..7b18e46a3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java @@ -18,11 +18,15 @@ package com.logpm.distribution.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.logpm.distribution.entity.DistrilbutionBillStockEntity; +import com.logpm.distribution.vo.DistributionBillOrderPackVO; +import com.logpm.distribution.vo.DistributionBillOrderVO; +import com.logpm.distribution.vo.DistributionStockArticleVO; import com.logpm.distribution.vo.DistrilbutionBillStockVO; import com.logpm.distribution.excel.DistrilbutionBillStockExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import java.util.List; +import java.util.Map; /** * 提货单订单信息关联 服务类 @@ -31,6 +35,15 @@ import java.util.List; * @since 2023-07-25 */ public interface IDistrilbutionBillStockService extends BaseService { + + /** + * 查询订单 + * + * @param distrilbutionBillStock + * @param page + * @return + */ + IPage getBillOrderDetail(Map distrilbutionBillStock,IPage page); /** * 自定义分页 * @@ -49,4 +62,5 @@ public interface IDistrilbutionBillStockService extends BaseService exportDistrilbutionBillStock(Wrapper queryWrapper); + IPage getBillOrderPack(Map distrilbutionBillStock, IPage page); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryDetailsServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryDetailsServiceImpl.java index d3afeabeb..c70435ca8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryDetailsServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryDetailsServiceImpl.java @@ -16,7 +16,9 @@ */ package com.logpm.distribution.service.impl; +import com.alibaba.fastjson.JSON; import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity; +import com.logpm.distribution.vo.DistributionBillInventoryVO; import com.logpm.distribution.vo.DistributionDeliveryDetailsVO; import com.logpm.distribution.excel.DistributionDeliveryDetailsExcel; import com.logpm.distribution.mapper.DistributionDeliveryDetailsMapper; @@ -27,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; +import java.util.Map; /** * 提货订单明细 服务实现类 @@ -67,4 +70,10 @@ public class DistributionDeliveryDetailsServiceImpl extends BaseServiceImpl getBillOrderInventory(IPage page, Map distributionDeliveryDetails) { + DistributionDeliveryDetailsEntity deliveryDetails = JSON.parseObject(JSON.toJSONString(distributionDeliveryDetails), DistributionDeliveryDetailsEntity.class); + return baseMapper.getBillOrderInventory(page,deliveryDetails); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 4d7a137a4..32d696ec9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -36,18 +37,22 @@ import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO; import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderMainVO; import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderVO; import com.logpm.distribution.vo.app.DistrilbutionBillLadingInventoryAppVO; +import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; import lombok.AllArgsConstructor; +import org.springblade.common.constant.DictBizConstant; +import org.springblade.common.constant.billLading.BillLadingStatusConstant; import org.springblade.common.constant.order.OrderReservationStatusConstant; import org.springblade.common.constant.order.OrderStatusConstant; import org.springblade.common.constant.stockup.StockAssignStatusConstant; import org.springblade.common.constant.stockup.StockupStatusConstant; -import org.springblade.common.serviceConstant.ServiceConstant; +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.Func; import org.springblade.core.tool.utils.StringUtil; +import org.springblade.system.cache.DictBizCache; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -142,8 +147,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl 0){ + boolean order = getOrder(distrilbutionBillLading.getStockArticleList(), distrilbutionBillLading.getId()); + if(!order){ + throw new ServiceException("修改失败！！"); + } + } //修改库存品 if (distrilbutionBillLading.getStockDTOList().size() > 0) { //全部库存品数据 @@ -218,6 +228,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl orderList,Long id){ + //查询已有的数据 + List list = distrilbutionBillStockService.list(Wrappers.query().lambda() + .eq(DistrilbutionBillStockEntity::getBillLadingId, id) + .eq(DistrilbutionBillStockEntity::getOrderStatus, "1") + .or(wp -> wp.eq(DistrilbutionBillStockEntity::getBillLadingId, id).eq(DistrilbutionBillStockEntity::getOrderStatus, "2")) + ); + List deList = new ArrayList<>(); + list.forEach( i ->{ + boolean b = orderList.stream().anyMatch(o -> o.getId().equals(i.getStockArticleId())); + if(b){ + //存在 + Iterator iterator = orderList.iterator(); + while (iterator.hasNext()){ + DistributionStockArticleEntity next = iterator.next(); + if(next.getId().equals( i.getStockArticleId())){ + iterator.remove(); + } + } + }else{ + //不存在 + DistrilbutionBillStockEntity stockEntity = new DistrilbutionBillStockVO(); + stockEntity.setId(i.getId()); + stockEntity.setOrderStatus(BillLadingStatusConstant.QX.getValue()); + stockEntity.setConditions(i.getConditions()); + stockEntity.setStockArticleId(i.getStockArticleId()); + deList.add(stockEntity); + } + + }); + //删除提货订单状态 + deList.forEach( i ->{ + //查询数据是否已备货 + if(!i.getConditions().equals("2")){ + //未 + List list1 = distributionStockService.list(Wrappers.query().lambda().eq(DistributionStockEntity::getStockArticle, i.getStockArticleId())); + if(list1.size() == 0){ + //取消 + DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity(); + stockArticleEntity.setId(i.getStockArticleId()); + stockArticleEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue()); + stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue()); + distributionStockArticleService.updateById(stockArticleEntity); + } + distrilbutionBillStockService.updateById(i); + } + }); + List list1 = new ArrayList<>(); + //添加订单关联 + orderList.forEach( i ->{ + DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity(); + stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue()); + stockArticleEntity.setStockupStatus(StockupStatusConstant.daibeihuo.getValue()); + stockArticleEntity.setId(i.getId()); + distributionStockArticleService.updateById(stockArticleEntity); + + DistrilbutionBillStockEntity distrilbutionBillStock = new DistrilbutionBillStockVO(); + distrilbutionBillStock.setBillLadingId(id); + distrilbutionBillStock.setOrderStatus(BillLadingStatusConstant.TJ.getValue()); + distrilbutionBillStock.setStockArticleId(i.getId()); + distrilbutionBillStock.setConditions("1"); + list1.add(distrilbutionBillStock); + + }); + distrilbutionBillStockService.saveBatch(list1); + //查询当前备货任务 + DistrilbutionBillLadingEntity billLading = baseMapper.selectById(id); + if(billLading.getConditions().equals("5")){ + //修改 + billLading.setConsignee("4"); + baseMapper.updateById(billLading); + } + return true; + }; + @Override public IPage pageList(IPage page, Map distrilbutionBillLading) { DistrilbutionBillLadingDTO distrilbutionBillLadingDTO = JSONObject.parseObject(JSONObject.toJSONString(distrilbutionBillLading), DistrilbutionBillLadingDTO.class); @@ -271,6 +363,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list = distributionDeliveryChargeService.list(Wrappers.query().lambda() .eq(DistributionDeliveryChargeEntity::getBillLading, i.getId()) ); + list.forEach( ii ->{ + ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST,ii.getCost())); + }); i.setList(list); }); distrilbutionBillLadingVOIPage.setRecords(records); @@ -644,7 +739,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list1 = new ArrayList<>(); + List list1 = new ArrayList<>(); List stockListEntities = new ArrayList<>(); //查询提货费用 List list4 = distributionDeliveryChargeService.list(Wrappers.query().lambda() @@ -654,11 +749,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list = distrilbutionBillStockService.list(Wrappers.query().lambda() .eq(DistrilbutionBillStockEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()) + .eq(DistrilbutionBillStockEntity::getOrderStatus,"1") + .or( eq ->eq.eq(DistrilbutionBillStockEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()).eq(DistrilbutionBillStockEntity::getOrderStatus,"2")) ); list.forEach( i ->{ - List list2 = distributionParcelListService.list(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId, i.getStockArticleId())); + List list2 = distributionStockArticleService.list(Wrappers.query().lambda().eq(DistributionStockArticleEntity::getId, i.getStockArticleId())); if(list2.size() > 0){ - list1.addAll(list2); + list1.addAll(DistributionStockArticleWrapper.build().listVO(list2)); } }); @@ -889,5 +986,59 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list = distrilbutionBillStockService.list(Wrappers.query().lambda() + .eq(DistrilbutionBillStockEntity::getBillLadingId, s) + .eq(DistrilbutionBillStockEntity::getOrderStatus, "1") + .or(ew -> ew.eq(DistrilbutionBillStockEntity::getBillLadingId, s).eq(DistrilbutionBillStockEntity::getOrderStatus, "2")) + ); + if(list.size() > 0){ + list.forEach( li ->{ + DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity(); + stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue()); + stockArticleEntity.setId(li.getStockArticleId()); + distributionStockArticleService.updateById(stockArticleEntity); + }); + } + + } + return true; + } + + @Override + public DistrilbutionBillLadingVO listNum(Map distrilbutionBillLading) { + DistrilbutionBillLadingDTO billLadingEntity = JSONObject.parseObject(JSONObject.toJSONString(distrilbutionBillLading), DistrilbutionBillLadingDTO.class); + + DistrilbutionBillLadingVO billLadingVO = baseMapper.getBillLadingNum(billLadingEntity); //查询 + + return billLadingVO; + } + + /** + * 查询详细信息 + * @param id + * @return + */ + @Override + public List getViewDetailOwn(String id) { + + return baseMapper.getViewDetailOwn(id); + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java index 303937c77..7d2340653 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java @@ -16,16 +16,25 @@ */ package com.logpm.distribution.service.impl; +import cn.hutool.json.JSONObject; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.logpm.distribution.entity.DistrilbutionBillStockEntity; +import com.logpm.distribution.vo.DistributionBillOrderPackVO; +import com.logpm.distribution.vo.DistributionBillOrderVO; import com.logpm.distribution.vo.DistrilbutionBillStockVO; import com.logpm.distribution.excel.DistrilbutionBillStockExcel; import com.logpm.distribution.mapper.DistrilbutionBillStockMapper; import com.logpm.distribution.service.IDistrilbutionBillStockService; +import org.springblade.common.constant.DictBizConstant; +import org.springblade.common.constant.stockup.StockupStatusConstant; +import org.springblade.system.cache.DictBizCache; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; +import java.util.Map; /** * 提货单订单信息关联 服务实现类 @@ -41,6 +50,25 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl getBillOrderDetail(Map distrilbutionBillStock, IPage page) { + DistrilbutionBillStockEntity billStock = JSON.parseObject(JSON.toJSONString(distrilbutionBillStock), DistrilbutionBillStockEntity.class); + IPage billOrderDetail = baseMapper.getBillOrderDetail(page, billStock); + billOrderDetail.getRecords().forEach( i ->{ + if(StringUtils.isNotBlank(i.getStockupStatus())){ + i.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,i.getStockupStatus())); + } + }); + return billOrderDetail; + } + @Override public List exportDistrilbutionBillStock(Wrapper queryWrapper) { @@ -51,4 +79,10 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl getBillOrderPack(Map distrilbutionBillStock, IPage page) { + DistrilbutionBillStockEntity billStock = JSON.parseObject(JSON.toJSONString(distrilbutionBillStock), DistrilbutionBillStockEntity.class); + return baseMapper.getBillOrderPack(page,billStock); + } + }