From 45cfa4d0ce2ae291f9a484fe3acca7bbc87c1fae Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 3 Aug 2023 10:29:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/utils/CommonUtil.java | 2 +- .../vo/DistrilbutionBillLadingOwnVO.java | 7 +- .../DistrilbutionAppBillLadingDetailVO.java | 4 +- .../mapper/DistributionDeliveryListMapper.xml | 12 ++-- .../mapper/DistributionParcelListMapper.xml | 8 +-- .../mapper/DistributionReservationMapper.xml | 4 +- .../mapper/DistributionStockArticleMapper.xml | 4 +- .../mapper/DistrilbutionBillLadingMapper.java | 3 +- .../mapper/DistrilbutionBillLadingMapper.xml | 68 +++++++++---------- .../DistrilbutionBillLadingServiceImpl.java | 2 +- 10 files changed, 55 insertions(+), 59 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java index 6afaff719..552fc31dc 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java @@ -55,7 +55,7 @@ public class CommonUtil { public static String datoLongToString(Long dateTime,String format,String timeZone){ - if (StringUtils.isEmpty(timeZone)) { + if (!StringUtils.hasLength(timeZone)) { timeZone = "Asia/Shanghai"; } if (dateTime != null) { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingOwnVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingOwnVO.java index bc03f94ae..04e4eb65b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingOwnVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingOwnVO.java @@ -16,13 +16,10 @@ */ package com.logpm.distribution.vo; -import com.logpm.distribution.entity.DistributionDeliveryChargeEntity; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 提货单 视图实体类 * @@ -34,7 +31,7 @@ import java.util.List; public class DistrilbutionBillLadingOwnVO extends DistrilbutionBillLadingEntity { private static final long serialVersionUID = 1L; - private String orderSelfNumbering; + private String orderCode; private String descriptionGoods; private Integer totalNumber; private String stockupStatus; @@ -42,7 +39,7 @@ public class DistrilbutionBillLadingOwnVO extends DistrilbutionBillLadingEntity private String stockipAllocation; private Integer esau; - private String packetBarCode; + private String orderPackageCode; private String firsts; private String second; private String thirdProduct; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingDetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingDetailVO.java index 88a17dce5..e3bd1b1ef 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingDetailVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingDetailVO.java @@ -31,9 +31,9 @@ public class DistrilbutionAppBillLadingDetailVO implements Serializable { private static final long serialVersionUID = 1L; private Long stockArticleId; - private String orderSelfNumbering; + private String orderCode; - private String packetBarCode; + private String orderPackageCode; private Integer scanStatus;//扫码状态 private String scanStatusStr;//扫码状态 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 a7c26cdbd..22298368e 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 @@ -722,7 +722,7 @@ select DISTINCT ldrp.packet_bar_code packetBarCode, - ldsa.order_self_numbering orderSelfNumbering, + ldsa.order_code orderCode, ldl.scan_status scanStatus FROM logpm_distribution_reservation_package ldrp @@ -746,15 +746,15 @@ LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id =ldpl.id lds.delivery_id = #{param.id} - - and ldsa.order_self_numbering = #{param.orderSelfNumbering} + + and ldsa.order_code = #{param.orderCode} SELECT - ldsa.order_self_numbering orderSelfNumbering, + ldsa.order_code orderCode, ldsa.complete_set completeSet, ldrs.reservation_num reservationNum, (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 and ldl.signfor_state =2 ) signNub 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 2f1500e89..9d364581d 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 @@ -53,15 +53,15 @@ select CONCAT(ldpl.cargo_title,'-',ldpl.shelf_title,'-',ldpl.goods_allocation) allocation, - ldsa.order_self_numbering orderCode, + ldsa.order_code orderCode, ldrs.stock_article_id stockArticleId, ldpl.pallet pallet, count(ldpl.id) planNum, @@ -184,7 +184,7 @@ group by ldpl.cargo_title, ldpl.shelf_title, ldpl.goods_allocation, - ldrs.stock_article_code, + ldsa.order_code, ldrs.stock_article_id, ldpl.pallet 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 cbd11f5ce..6b1ba75ef 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 @@ -81,8 +81,8 @@ ) and ldsa.is_deleted = 0 and ldsa.type_service ='2' - - and ldsa.order_self_numbering == #{distributionStockArticleVO.orderSelfNumbering} + + and ldsa.order_code == #{distributionStockArticleVO.orderCode} 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 ecb4b3c58..4d6666db9 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 @@ -29,7 +29,6 @@ import com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO; import com.logpm.distribution.vo.DistrilbutionBillLadingVO; import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO; import org.apache.ibatis.annotations.Param; -import org.springblade.core.mp.support.Query; import java.util.List; @@ -65,7 +64,7 @@ public interface DistrilbutionBillLadingMapper extends BaseMapper selectDetailList(@Param("stockArticleId") Long stockArticleId, @Param("scanStatus") Integer scanStatus,@Param("orderSelfNumbering") String orderSelfNumbering); + List selectDetailList(@Param("stockArticleId") Long stockArticleId, @Param("scanStatus") Integer scanStatus,@Param("orderCode") String orderSelfNumbering); DistrilbutionBillLadingVO getOneOwn(@Param("id") Long id); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index 3acc8f0d1..57831642e 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 @@ -64,38 +64,38 @@ - select s.coding packageCode, s.goods_name name @@ -136,13 +136,7 @@ where ldr.is_deleted = 0 and s.id is not null and ldr.id = #{reservationId} - and ldsl.description_goods = #{descriptionGoods} - and ldsl.storage_location = #{allocation} - and ldsl.tray_name = #{pallet} - and ldsl.sku = #{sku} - and ldsl.cargo_norms = #{cargoNorms} - and ldsl.cargo_unit = #{cargoUnit} - + and ldrs.stocklist_id = #{stockListId} select lad.id billLadingId, 3 carType, - lad.`condition` `condition`, + lad.`conditions` `conditions`, lad.Pick_up_plate pickUpPlate, lad.consignee consignee, lad.create_time, From 0da7613b534f4493fb22383e006c99e7afd99406 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 3 Aug 2023 11:55:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E4=BB=B6?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/DictBizConstant.java | 2 ++ .../entity/DistributionParcelListEntity.java | 6 ++++ .../entity/DistributionStockListEntity.java | 5 ++++ .../vo/DistributionParcelListVO.java | 8 +++++ .../vo/DistributionStockArticleVO.java | 6 +--- .../vo/DistrilbutionBillLadingAppVO.java | 30 ++++++++++++++----- .../DistributionBillLadingAppController.java | 11 ++++++- .../DistributionStockupController.java | 8 +++-- .../mapper/DistributionStockupMapper.xml | 5 +++- .../mapper/DistrilbutionBillLadingMapper.xml | 4 ++- .../DistributionParcelListWrapper.java | 3 ++ 11 files changed, 71 insertions(+), 17 deletions(-) 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 89719ca7a..7f40efa13 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 @@ -20,6 +20,8 @@ public class DictBizConstant { public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态 public static final String ORDER_PACKAGE_FREEZE_STATUS = "order_package_freeze_status";//包间冻结状态 + public static final String ORDER_PACKAGE_STOCKUP_STATUS = "order_package_stockup_status";//包间备货状态 + public static final String ORDER_PACKAGE_GROUNDING_STATUS = "order_package_grounding_status";//包间上架状态 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 0be56b338..fa3670584 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 @@ -189,6 +189,12 @@ public class DistributionParcelListEntity extends TenantEntity { private String orderPackageFreezeStatus; + @ApiModelProperty(value = "备货状态") + private String orderPackageStockupStatus; + @ApiModelProperty(value = "上架状态") + private String orderPackageGroundingStatus; + + 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 b51a701c2..eb1271086 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 @@ -125,6 +125,11 @@ public class DistributionStockListEntity extends TenantEntity { */ @ApiModelProperty(value = "入库时间") private Date warehousingTime; + /** + * 上架时间 + */ + @ApiModelProperty(value = "上架时间") + private Date groundingTime; /** * 拆包数 */ 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 0f800bb16..e7066a0d0 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 @@ -48,6 +48,14 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { * 包件冻结状态 */ private String orderPackageFreezeStatusName; + /** + * 包件上架状态 + */ + private String orderPackageGroundingStatusName; + /** + * 包件备货状态 + */ + private String orderPackageStockupStatusName; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java index 216e278fb..410e675b6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java @@ -77,11 +77,7 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity { @ApiModelProperty(value = "冻结状态名称") private String freezeStatusName; - /** - * 上架状态 - */ - @ApiModelProperty(value = "上架状态名称") - private String groundingStatus; + @ApiModelProperty(value = "订单状态名称") private String orderStatusName; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java index 0b3e984e2..2e54f7c6b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java @@ -18,6 +18,8 @@ package com.logpm.distribution.vo; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -33,6 +35,7 @@ import java.util.List; */ @Data @EqualsAndHashCode(callSuper = true) +@ApiModel(value="自提实体", description="自提实体") public class DistrilbutionBillLadingAppVO extends DistrilbutionBillLadingEntity { private static final long serialVersionUID = 1L; @@ -42,33 +45,46 @@ public class DistrilbutionBillLadingAppVO extends DistrilbutionBillLadingEntity private Integer carType; private String carTypeStr; - + @ApiModelProperty(value = "提货状态") private String condition;//提货状态 + @ApiModelProperty(value = "提货状态") private String conditionStr;//提货状态 - + @ApiModelProperty(value = "车牌号") private String pickUpPlate;//车牌号 - + @ApiModelProperty(value = "提货人") private String consignee;//提货人 - + @ApiModelProperty(value = "备货状态") private String stockupStatus;//备货状态 +// @ApiModelProperty(value = "分类") private String stockupStatusStr; - + @ApiModelProperty(value = "制单时间") private Date createTime;//制单时间 + @ApiModelProperty(value = "提货时间") private Date pickUpTime;//提货时间 - + @ApiModelProperty(value = "订单总数") private Integer orderNum;//订单总数 + @ApiModelProperty(value = "自提件数") private Integer planNum;//自提件数 + @ApiModelProperty(value = "签收总数") private Integer signedNum;//签收总数 + @ApiModelProperty(value = "签收总数") private Integer inventoryNum;//签收总数 - + @ApiModelProperty(value = "齐套总数") private Integer completeNum;//齐套总数 + @ApiModelProperty(value = "库存品id") private String stockListId;//库存品id + @ApiModelProperty(value = "库存数量") private Integer quantity;//库存数量 + @ApiModelProperty(value = "物品名称") private String descriptionGoods;//物品名称 + @ApiModelProperty(value = "单位") private String cargoUnit;//单位 + @ApiModelProperty(value = "sku") private String sku;//sku + @ApiModelProperty(value = "备货数量") private Integer deliveryNum;//备货数量 + @ApiModelProperty(value = "以扫备货数量") private Integer esauInventoryNum;//以扫备货数量 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java index 92874bdb5..aea0c76fc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java @@ -23,6 +23,8 @@ import com.logpm.distribution.service.IDistrilbutionBillLadingService; import com.logpm.distribution.vo.DistrilbutionBillLadingAppVO; import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderMainVO; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; @@ -92,6 +94,7 @@ public class DistributionBillLadingAppController extends BladeController { @ApiOperation(value = "自提订单列表库存品",notes = "自提订单列表库存品") @GetMapping("/getInventory") @ApiOperationSupport(order = 1) + @ApiImplicitParam(name = "id",value ="自提单ID") public R> getInventory(@ApiIgnore @RequestParam Map distrilbutionBillLading, Query query){ IPage ladingAppVOIPage = distrilbutionBillLadingService.getInventory(Condition.getPage(query),distrilbutionBillLading); return R.data(ladingAppVOIPage); @@ -100,13 +103,19 @@ public class DistributionBillLadingAppController extends BladeController { @ApiOperation(value = "自提订单列表库存品详细包件",notes = "自提订单列表库存品详细包件") @GetMapping("/getInventoryNum") @ApiOperationSupport(order = 1) + @ApiImplicitParam(name = "id",value ="自提单ID") public R> getInventoryNum(@ApiIgnore @RequestParam Map distrilbutionBillLading, Query query){ IPage ladingAppVOIPage = distrilbutionBillLadingService.getInventoryNum(Condition.getPage(query),distrilbutionBillLading); return R.data(ladingAppVOIPage); } - @ApiOperation(value = "扫描id") + @ApiOperation(value = "自提扫描id") @PutMapping("/scan") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "自提单ID", required = true), + @ApiImplicitParam(name = "coding", value = "包条码", required = true), + @ApiImplicitParam(name = "type", value = "类型 4 订单 3 库存品", required = true) + }) public R getScan(@ApiIgnore @RequestParam Map distrilbutionBillLading){ R scan = distrilbutionBillLadingService.getScan(distrilbutionBillLading); return scan; 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 30f5773cf..06cd48a4a 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 @@ -29,6 +29,7 @@ import org.springblade.core.mp.support.Query; 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.ObjectUtil; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -86,8 +87,11 @@ public class DistributionStockupController extends BladeController { @ApiOperation(value = "详情", notes = "传入distributionStockup") public R> detailReservationOwn(@ApiIgnore @RequestParam Map distributionStockup, Query query) { Object o = distributionStockup.get("id"); - IPage detail = distributionStockupService.detailReservationOwn(Condition.getPage(query),Long.parseLong((String) o)); - return R.data(detail); + if(ObjectUtil.isNotEmpty(o)){ + IPage detail = distributionStockupService.detailReservationOwn(Condition.getPage(query),Long.parseLong((String) o)); + return R.data(detail); + } + return R.data(null); } /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 93f15e739..0df365040 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -48,6 +48,7 @@ LEFT JOIN logpm_warehouse_goods_area lwga ON lds.stockup_area = lwga.id LEFT JOIN logpm_basicdata_team_group btg ON lds.loader_id = btg.id + lds.is_deleted = 0 and lds.type_service = #{param.typeService} and TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate}) @@ -181,6 +182,7 @@ ldr.id in (select reservation_id from logpm_distribution_stockup_info ) and ldsi.stockup_id = #{id} + and ldr.is_deleted = 0 @@ -204,12 +206,13 @@ LEFT JOIN logpm_distribution_stockup lds on lds.id = ldsi.stockup_id ldsi.stockup_id = #{ id } + and ldsi.is_deleted = 0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java index 777671889..4b9d8482d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java @@ -28,6 +28,9 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper Date: Thu, 3 Aug 2023 13:47:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceConstant/ServiceConstant.java | 10 +++++++ .../DistributionParcelDetailsEntity.java | 2 ++ .../entity/DistributionParcelListEntity.java | 5 ++++ .../vo/DistributionParcelListVO.java | 5 ++++ .../mapper/DistributionReservationMapper.xml | 2 +- .../DistributionReservationPackageMapper.xml | 3 +-- .../DistributionReservationServiceImpl.java | 26 ++++++++----------- .../DistributionParcelListWrapper.java | 1 + 8 files changed, 36 insertions(+), 18 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java b/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java index f44f3ae07..6ec8cb871 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java @@ -243,6 +243,16 @@ public interface ServiceConstant { //已签收 String ORDER_STATE_SEVEN = "70"; + /** + * 订单预约状态 + */ + //未预约 + String ORDER_RESERVATION_STATE_NOT="10"; + //部分预约 + String ORDER_RESERVATION_STATE_PART="20"; + //已预约 + String ORDER_RESERVATION_STATE_RESERVED="30"; + diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelDetailsEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelDetailsEntity.java index 44074a8fd..55df4f3eb 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelDetailsEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelDetailsEntity.java @@ -108,4 +108,6 @@ public class DistributionParcelDetailsEntity extends TenantEntity { @ApiModelProperty(value = "货位") private String goodsAllocation; + + } 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 fa3670584..3507afd80 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 @@ -188,9 +188,14 @@ public class DistributionParcelListEntity extends TenantEntity { @ApiModelProperty(value = "包件冻结状态") private String orderPackageFreezeStatus; + @ApiModelProperty(value = "包件冻结状态") + private String orderPackageReservationStatus; + + @ApiModelProperty(value = "备货状态") private String orderPackageStockupStatus; + @ApiModelProperty(value = "上架状态") private String orderPackageGroundingStatus; 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 e7066a0d0..c1c02fb48 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 @@ -57,5 +57,10 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { */ private String orderPackageStockupStatusName; + /** + * 包件预约状态 + */ + private String orderPackageReservationStatusName; + } 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 17249d90d..e514a3290 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 @@ -439,7 +439,7 @@ ldsl.reserve3, ldsl.reserve4, ldsl.reserve5, - ldsl.order_self_numbering, + ldsl.order_code, ldsl.incoming_batch, ldsl.service_number, ldsl.material_id, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml index 4c52b2002..ca8a8cfd8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml @@ -93,7 +93,6 @@ ldpl.warehouse_id, ldpl.warehouse, ldpl.conditions, - ldpl.packet_bar_code, ldpl.cargo_title, ldpl.shelf_title, ldpl.goods_allocation, @@ -105,7 +104,7 @@ ldpl.quantity, ldpl.train_number, ldpl.stock_article_id, - ldpl.order_self_numbering, + ldpl.order_code, ldpl.service_number, ldpl.material_name, ldpl.material_code, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index b43adbf47..f9243be46 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -17,6 +17,7 @@ package com.logpm.distribution.service.impl; 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.extension.toolkit.SqlHelper; @@ -241,6 +242,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl qw = new QueryWrapper().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId()); + List parcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw); + if (packageList.size() == parcelListEntities.size()){ + //这里就是表示进行了包件选取的操作，但是选取的包件数量为全部 + s.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_RESERVED); + } } distributionReservationStockarticleEntity.setReservationNum(packageNum.get()); //订单无数据源，不需要进行包件信息维护 //修改订单状态为已预约 // s.setOrderStatus(ServiceConstant.ORDER_STATE_ALREADY_RESERVATION); s.setReservationStatus(30+"");// TODO 需要根据订单预约的包件数量是否等于订单总包件数量，存入 部分预约和已预约的状态值 + stockArticleCount.getAndAdd(s.getReservationNum()); DistributionStockArticleEntity stockArticleEntity = Func.copy(s, DistributionStockArticleEntity.class); -// if (stockArticleEntity.getStoreId()==-1){ -// -// } -// if (stockArticleEntity.getMallId()==-1){ -// -// } -// if (stockArticleEntity.getFee().equals(-1)){ -// -// } -// if (stockArticleEntity.getStoreId()==-1){ -// -// } -// if (stockArticleEntity.getStoreId()==-1){ -// -// } distributionStockArticleService.updateById(s); //拼接订单自编号 arrayList.add(s.getOrderCode()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java index 4b9d8482d..7254e4d37 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java @@ -31,6 +31,7 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper