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 a1f1a2b01..d8e7ed9f3 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 @@ -14,6 +14,11 @@ public class DictBizConstant { public static final String DELIVERY_ORDER_STATUS = "order_status";//配送订单状态 public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态 public static final String BASIC_GROUNDING = "basic_grounding";//上架状态 + public static final String STOCKUP_STATUS = "stockup_status";//备货状态 + public static final String RESERVATION_STATUS = "reservation_status";//预约状态 + + + public static final String PDA_AUDIO = "pda_audio";//PDA扫码语音 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java index 285de034e..99f321ad7 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -238,6 +238,13 @@ public class DistributionDeliveryListEntity extends TenantEntity { private Integer source; + /** + * 定位打卡地址 + */ + @ApiModelProperty(value = "定位打卡地址") + private String deliveryState; + + } 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 034377395..d31805b5b 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 @@ -24,6 +24,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; +import java.math.BigInteger; + /** * 在库订单包件清单 实体类 * @@ -167,7 +169,7 @@ public class DistributionParcelListEntity extends TenantEntity { * 品牌ID */ @ApiModelProperty(value = "品牌ID") - private String brandId; + private Long brandId; /** * 品牌名称 */ 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 a586db6b5..64f0c8b31 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 @@ -203,17 +203,13 @@ public class DistributionStockArticleEntity extends TenantEntity { */ @ApiModelProperty(value = "类型;1 预约单 2库存单") private Integer genre; - /** - * 状态;1 配送 2 待配送 3部分入库 4已入库 - */ - @ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库") - private String orderStatus; - /** - * 状态;1 配送 2 待配送 3部分入库 4已入库 - */ - @ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库") - @TableField(exist = false) - private String stateName; + +// /** +// * 状态;1 配送 2 待配送 3部分入库 4已入库 +// */ +// @ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库") +// @TableField(exist = false) +// private String stateName; /** * 状态;1 已通知 2 未通知 @@ -267,17 +263,9 @@ public class DistributionStockArticleEntity extends TenantEntity { - /** - * 包件数量 - */ - @TableField(exist = false) - private List packageList; - /** - * 订单是否出现包件修改 - */ - @TableField(exist = false) - private Boolean isUpdate = false; + + //-------------2023-07-16 新增在库订单字段 @@ -351,11 +339,7 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "签收件数") private Integer signinQuantity; - /** - * 上架状态（0未上架 1部分上架 2已上架 3已下架） - */ - @ApiModelProperty(value = "上架状态") - private Integer groundingStatus; + /** * 货位信息 @@ -400,11 +384,27 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "盘点人id") private Long inventoryPersonId; + @ApiModelProperty(value = "冻结状态") + private String freezeStatus; /** - * 冻结状态0未冻结 1已冻结 + * 上架状态 */ - @ApiModelProperty(value = "冻结状态0未冻结 1已冻结") - private Integer freezeStatus; + @ApiModelProperty(value = "上架状态") + private String groundingStatus; + + + @ApiModelProperty(value = "订单状态") + private String orderStatus; + + @ApiModelProperty(value = "预约状态") + private String reservationStatus; + + @ApiModelProperty(value = "备货状态") + private String stockupStatus; + + + + /** * 有无数据源 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 5d2084d40..216e278fb 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 @@ -70,11 +70,28 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity { @ApiModelProperty(value = "服务类型 商 市 自") private String typeServerName; - @ApiModelProperty(value = "订单状态") - private String orderStateName; + @ApiModelProperty(value = "上架状态名称") private String groundingStatusName; + + @ApiModelProperty(value = "冻结状态名称") + private String freezeStatusName; + /** + * 上架状态 + */ + @ApiModelProperty(value = "上架状态名称") + private String groundingStatus; + + @ApiModelProperty(value = "订单状态名称") + private String orderStatusName; + + @ApiModelProperty(value = "预约状态名称") + private String reservationStatusName; + + @ApiModelProperty(value = "备货状态名称") + private String stockupStatusName; + /** * 是否齐套名称 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 72078d567..a1cc2a66e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -102,7 +102,8 @@ public class DistributionStockupAppController extends BladeController { DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId); map.put("consignee",reservationEntity.getConsignee()); - map.put("goodsAreaName",reservationEntity.getGoodsAreaName()); + String stockupArea = distributionStockupService.selectStockupAreaByReservationId(reservationEntity.getId()); + map.put("goodsAreaName",stockupArea); if(orderStatus.equals(1)) { //查询客户订单对应的 List list = distributionStockupService.selectStockupOrderList(stockupDTO); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java index f9508c365..b357b8eda 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java @@ -40,7 +40,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; import springfox.documentation.annotations.ApiIgnore; -import wrapper.DistributionParcelListWrapper; +import com.logpm.distribution.wrapper.DistributionParcelListWrapper; import java.util.Map; import java.util.List; 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 bd95cc01b..86395b05e 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 @@ -244,7 +244,7 @@ public class DistributionReservationController extends BladeController { } /** - * 预约列表 详情 + * 查询预约单订单列表 */ @GetMapping("/getReservationPackage") @ApiOperationSupport(order = 1) @@ -255,7 +255,7 @@ public class DistributionReservationController extends BladeController { } /** - * 预约列表 详情 + * 查询预约单包件信息列表 */ @GetMapping("/getReservationPackageList") @ApiOperationSupport(order = 1) @@ -264,4 +264,15 @@ public class DistributionReservationController extends BladeController { R reservationPackage = reservationService.getReservationPackageList(reservationId); return reservationPackage; } + + /** + * 预约列表 详情 + */ + @GetMapping("/getReservationStockListInfo") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distrbutionReservation") + public R getReservationStockListInfo(@RequestParam String reservationId) { + R reservationPackage = reservationService.getReservationStockListInfo(reservationId); + return reservationPackage; + } } 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 39952419b..27ce2fc51 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 @@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.dto.DistributionStockArticleDTO; import com.logpm.distribution.entity.DistributionStockArticleEntity; -import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.service.IDistributionStockArticleService; import com.logpm.distribution.vo.DistributionStockArticleVO; @@ -39,19 +38,15 @@ import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; -import org.springblade.system.cache.DictBizCache; -import org.springblade.system.entity.DictBiz; -import org.springblade.system.entity.User; import org.springblade.system.feign.IDictBizClient; import org.springblade.system.feign.IUserClient; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; -import wrapper.DistributionStockArticleWrapper; +import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; -import java.util.stream.Collectors; /** * 配送在库订单 控制器 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java index 056219aa8..e152705a6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java @@ -54,13 +54,13 @@ public class DistributionReservationDTO extends DistributionReservationEntity { * 库存品信息列表 */ @ApiModelProperty(value = "库存品信息列表") - private List inventoryList; + private List inventoryList; /** * 订单信息列表 */ @ApiModelProperty(value = "订单信息列表") - private List stockArticleList; + private List stockArticleList; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java index ac1324a19..bfc6ecb05 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java @@ -16,7 +16,9 @@ */ package com.logpm.distribution.dto; +import com.baomidou.mybatisplus.annotation.TableField; import com.logpm.distribution.entity.DistributionAddvalueEntity; +import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -38,12 +40,24 @@ public class DistributionStockArticleDTO extends DistributionStockArticleEntity private String ids; +// +// /** +// * 包件信息 +// */ +// @ApiModelProperty(value = "包件信息") +// private List distributionParcelListDTO; /** - * 包件信息 + * 订单是否出现包件修改 */ - @ApiModelProperty(value = "包件信息") - private List distributionParcelListDTO; + @TableField(exist = false) + private Boolean isUpdate = false; + + /** + * 包件数量 + */ + @TableField(exist = false) + private List packageList; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index aad71f231..af98a6783 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionReservationDTO; import com.logpm.distribution.entity.DistributionReservationEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; +import com.logpm.distribution.entity.DistributionStockListEntity; import com.logpm.distribution.excel.DistributionReservationExcel; import com.logpm.distribution.vo.DistributionReservationVO; import com.logpm.distribution.vo.DistributionStockArticleVO; @@ -106,4 +107,11 @@ public interface DistributionReservationMapper extends BaseMapper getReservationStockListInfo(@Param("reservationId") String reservationId); } 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 964b4ea05..14feceb70 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 @@ -114,7 +114,7 @@ ldsa.customer_telephone, ldsa.customer_address, ldsa.genre, - ldsa.state, + ldsa.order_status, ldsa.notification, ldsa.fee, ldsa.rate, @@ -422,5 +422,69 @@ + 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 0773a05a7..560bbf5a4 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 @@ -38,7 +38,11 @@ - + + + + + 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 2aff5b83e..a1a2f4696 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 @@ -104,7 +104,7 @@ ldsl.storage_location warehouseArea, ldsl.tray_name trays, ldsl.sku sku, - ldsl.unit unit, + ldsl.cargo_unit unit, count(s.id) scanNum from logpm_distribution_reservation ldr left join logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id = ldr.id and ldrs.is_deleted = 0 @@ -120,7 +120,7 @@ ldsl.storage_location, ldsl.tray_name, ldsl.sku, - ldsl.unit + ldsl.cargo_unit diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java index 9730c3be9..039b50955 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java @@ -28,7 +28,6 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** * 备货信息表 Mapper 接口 @@ -111,4 +110,5 @@ public interface DistributionStockupMapper extends BaseMapper + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java index cab0aaac4..8b11d369f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java @@ -157,4 +157,11 @@ public interface IDistributionReservationService extends BaseService getReservationStockListInfo(String reservationId); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java index a594e5b28..16bba6866 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java @@ -100,4 +100,5 @@ public interface IDistributionStockupService extends BaseService createPackageCode(Long reservationId, Long stockListId, Integer packageNum); + String selectStockupAreaByReservationId(Long id); } 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 8976bf1ea..d4b9996eb 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 @@ -202,9 +202,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl stockArticleList = distributionReservationDTO.getStockArticleList(); + List stockArticleList = distributionReservationDTO.getStockArticleList(); //获取库存品列表信息 - List inventoryList = distributionReservationDTO.getInventoryList(); + List inventoryList = distributionReservationDTO.getInventoryList(); //订单数量统计 AtomicInteger stockArticleCount = new AtomicInteger(); @@ -252,6 +252,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl initTotal = new AtomicReference<>(BigDecimal.ZERO); //订单自编号拼接 HashSet hashSet = new HashSet<>(); - List stockArticleList = distributionReservationDTO.getStockArticleList(); + List stockArticleList = distributionReservationDTO.getStockArticleList(); if (!Func.isEmpty(stockArticleList)) { //这里判断修改内容是否存在订单信息，如果存在则进行中间表数据的重新插入 stockArticleList.forEach(s -> { List packageList = s.getPackageList(); AtomicInteger packageNum = new AtomicInteger(); - if (packageList.size() == 0) { + if (Func.isEmpty(packageList)) { Map map = new HashMap<>(); map.put("stockArticleId", s.getId()); QueryWrapper qw = Condition.getQueryWrapper(map, DistributionParcelListEntity.class); @@ -787,7 +804,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl inventoryList = distributionReservationDTO.getInventoryList(); + List inventoryList = distributionReservationDTO.getInventoryList(); AtomicInteger stockListNum = new AtomicInteger(); if (!Func.isEmpty(inventoryList)) { //重新构建预约和库存之间的关系 @@ -1125,4 +1141,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl getReservationStockListInfo(String reservationId) { + List stockListEntityList = baseMapper.getReservationStockListInfo(reservationId); + return R.data(stockListEntityList); + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 68ecdd134..4c5507f3a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -90,7 +90,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl selectDistributionStockArticlePage(IPage page, DistributionStockArticleVO distributionStockArticle) { List distributionStockArticleVOS = baseMapper.selectDistributionStockArticlePage(page, distributionStockArticle); distributionStockArticleVOS.forEach(t->{ - t.setOrderStateName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, t.getOrderStatus())); + t.setOrderStatusName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, t.getOrderStatus())); }); return page.setRecords(distributionStockArticleVOS); @@ -308,7 +308,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl