diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java index f811ed5eb..497bc719f 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionAddvalueVO.java @@ -44,8 +44,11 @@ public class DistributionAddvalueVO extends DistributionAddvalueEntity { private Integer num; + private Integer floolNum; + private BigDecimal fee; + private Double distance; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStocklistVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStocklistVO.java index 3a4c84c22..e913898f2 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStocklistVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStocklistVO.java @@ -21,6 +21,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 预约库存中间表 视图实体类 * @@ -73,6 +75,12 @@ public class DistributionReservationStocklistVO extends DistributionReservationS @ApiModelProperty(value = "所属商场") private String shoppingMall; + /** + * 库存品装车数 + */ + @ApiModelProperty(value = "库存品装车数") + private Integer loadedinNumber; + /** * 商场名称 */ @@ -124,4 +132,11 @@ public class DistributionReservationStocklistVO extends DistributionReservationS @ApiModelProperty(value = "签收时间") private String signTime; + + /** + * 签收时间 + */ + @ApiModelProperty(value = "签收时间") + private List detailVOS; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionAddvalueAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionAddvalueAppController.java index 584bcd2f5..65eadaccd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionAddvalueAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionAddvalueAppController.java @@ -84,7 +84,7 @@ public class DistributionAddvalueAppController { } /** - * 扫描接口 + * 保存增值服务 */ @PostMapping("/saveAddvalueInfo") @ApiOperationSupport(order = 1) @@ -96,7 +96,7 @@ public class DistributionAddvalueAppController { /** - * 扫描接口 + * 编辑保存 */ @PostMapping("/updateAddvalueInfo") @ApiOperationSupport(order = 1) @@ -121,6 +121,19 @@ public class DistributionAddvalueAppController { + /** + * 查询编辑增值服务数据 + */ + @PostMapping("/addvalueInfo") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询增值服务列表", notes = "DistributionAppDeliveryListDTO") + public R addvalueInfo(@Valid @RequestBody DistributionAppAddvalueDTO distributionAppAddvalueDTO) { + R r =distributionAddvalueService.addvalueInfo(distributionAppAddvalueDTO); + return r; + } + + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index 2c5fb60a1..ad8edb991 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -19,14 +19,13 @@ package com.logpm.distribution.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.distribution.dto.DistributionReservationStocklistDTO; import com.logpm.distribution.dto.DistributionSignforDTO; import com.logpm.distribution.entity.DistributionSignforEntity; import com.logpm.distribution.excel.DistributionSignforExcel; import com.logpm.distribution.service.IDistributionReservationService; import com.logpm.distribution.service.IDistributionSignforService; -import com.logpm.distribution.vo.DistributionParcelListVO; -import com.logpm.distribution.vo.DistributionSignforVO; -import com.logpm.distribution.vo.DistributionSignforsnmbVO; +import com.logpm.distribution.vo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -107,6 +106,18 @@ public class DistributionSignforController extends BladeController { return R.data(distributionSignforsnmbVO); } + + /** + * 签收详情包件信息 + */ + @GetMapping("/signforInventoryList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distributionSignfor") + public R> signforInventoryList(Long signforId) { + List distributionReservationStocklistDTOS= distributionSignforService.signforInventoryList(signforId); + return R.data(distributionReservationStocklistDTOS); + } + /** * 签收管理 分页 */ 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 878f55d46..fb3ec8182 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 @@ -124,91 +124,98 @@ public class DistributionStockArticleController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStockArticle") public R> selectStockArticleInfoList(@ApiIgnore @RequestParam Map distributionStockArticle, Query query) { - BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if (Func.isEmpty(myCurrentWarehouse)){ - return R.fail("无仓库信息!!!"); - } - Object orderCodeNum = distributionStockArticle.get("orderCodeNum"); - distributionStockArticle.remove("orderCodeNum"); - Object waybillNum = distributionStockArticle.get("waybillNum"); - Object o = distributionStockArticle.get("orderCode"); - distributionStockArticle.remove("orderCode"); - Object o2 = distributionStockArticle.get("startDate"); - Object o1 = distributionStockArticle.get("entDate"); - String orderIds = (String) distributionStockArticle.get("orderIds"); - String customerName = (String) distributionStockArticle.get("customerName"); - String reservationStatus = (String) distributionStockArticle.get("reservationStatus"); - String warehouseEntryTime = (String) distributionStockArticle.get("warehouseEntryTime"); - String customerTelephone = (String) distributionStockArticle.get("customerTelephone"); - String completeSet = (String) distributionStockArticle.get("completeSet"); - String freezeStatus = (String) distributionStockArticle.get("freezeStatus"); - Object d = distributionStockArticle.get("id"); - distributionStockArticle.remove("id"); - distributionStockArticle.remove("startDate"); - distributionStockArticle.remove("entDate"); - distributionStockArticle.remove("orderIds"); -// distributionStockArticle.remove("pageSize"); -// distributionStockArticle.remove("currentPage"); -// distributionStockArticle.remove("total"); - QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class); - LambdaQueryWrapper lambda = Wrappers.query().lambda(); - queryWrapper.ne("reservation_status","30"); - queryWrapper.lambda().eq(DistributionStockArticleEntity::getWarehouseId,myCurrentWarehouse.getId()); - if(Func.isNotEmpty(o)){ - queryWrapper.in("order_code",String.valueOf(o).split(",")); - } - if(Func.isNotEmpty(reservationStatus)){ - queryWrapper.eq("reservation_status",reservationStatus); - } - if(Func.isNotEmpty(warehouseEntryTime)){ - queryWrapper.apply("datediff(warehouse_entry_time,{0} ) = 0",warehouseEntryTime); - } - if(Func.isNotEmpty(freezeStatus)){ - queryWrapper.eq("freeze_status",freezeStatus); - } - if(Func.isNotEmpty(completeSet)){ - queryWrapper.eq("complete_set",completeSet); - } - if(ObjectUtil.isNotEmpty(d)){ - queryWrapper.in("id",String.valueOf(d).split(",")); - } - if(ObjectUtil.isNotEmpty(o2)){ - queryWrapper.between("warehouse_entry_time",o2,o1); - } - if(Func.isNotEmpty(orderIds)){ - queryWrapper.notIn(Func.isNotEmpty(orderIds),"id",Func.toLongList(orderIds)); - } + + + + R r = distributionStockArticleService.selectStockArticleInfoList(distributionStockArticle,query); + + + +// BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); +// if (Func.isEmpty(myCurrentWarehouse)){ +// return R.fail("无仓库信息!!!"); +// } +// Object orderCodeNum = distributionStockArticle.get("orderCodeNum"); +// distributionStockArticle.remove("orderCodeNum"); +// Object waybillNum = distributionStockArticle.get("waybillNum"); +// Object o = distributionStockArticle.get("orderCode"); +// distributionStockArticle.remove("orderCode"); +// Object o2 = distributionStockArticle.get("startDate"); +// Object o1 = distributionStockArticle.get("entDate"); +// String orderIds = (String) distributionStockArticle.get("orderIds"); +// String customerName = (String) distributionStockArticle.get("customerName"); +// String reservationStatus = (String) distributionStockArticle.get("reservationStatus"); +// String warehouseEntryTime = (String) distributionStockArticle.get("warehouseEntryTime"); +// String customerTelephone = (String) distributionStockArticle.get("customerTelephone"); +// String completeSet = (String) distributionStockArticle.get("completeSet"); +// String freezeStatus = (String) distributionStockArticle.get("freezeStatus"); +// Object d = distributionStockArticle.get("id"); +// distributionStockArticle.remove("id"); +// distributionStockArticle.remove("startDate"); +// distributionStockArticle.remove("entDate"); +// distributionStockArticle.remove("orderIds"); +//// distributionStockArticle.remove("pageSize"); +//// distributionStockArticle.remove("currentPage"); +//// distributionStockArticle.remove("total"); +// QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class); +// LambdaQueryWrapper lambda = Wrappers.query().lambda(); +// queryWrapper.ne("reservation_status","30"); +// queryWrapper.lambda().eq(DistributionStockArticleEntity::getWarehouseId,myCurrentWarehouse.getId()); +// if(Func.isNotEmpty(o)){ +// queryWrapper.in("order_code",String.valueOf(o).split(",")); +// } +// if(Func.isNotEmpty(reservationStatus)){ +// queryWrapper.eq("reservation_status",reservationStatus); +// } +// if(Func.isNotEmpty(warehouseEntryTime)){ +// queryWrapper.apply("datediff(warehouse_entry_time,{0} ) = 0",warehouseEntryTime); +// } +// if(Func.isNotEmpty(freezeStatus)){ +// queryWrapper.eq("freeze_status",freezeStatus); +// } +// if(Func.isNotEmpty(completeSet)){ +// queryWrapper.eq("complete_set",completeSet); +// } +// if(ObjectUtil.isNotEmpty(d)){ +// queryWrapper.in("id",String.valueOf(d).split(",")); +// } +// if(ObjectUtil.isNotEmpty(o2)){ +// queryWrapper.between("warehouse_entry_time",o2,o1); +// } // if(Func.isNotEmpty(orderIds)){ -// queryWrapper.notIn("id",Func.toLongList(orderIds)); +// queryWrapper.notIn(Func.isNotEmpty(orderIds),"id",Func.toLongList(orderIds)); // } - if(Func.isNotEmpty(customerName)){ - queryWrapper.like("customer_name",customerName); - } - if(Func.isNotEmpty(customerTelephone)){ - queryWrapper.like("customer_telephone",customerTelephone); - } - if(Func.isNotEmpty(orderCodeNum)){ - String anumbering = orderCodeNum.toString(); - List list = CommonUtil.stringNum(anumbering); - if(list.size() > 1){ - queryWrapper.in("order_code",list); - }else{ - queryWrapper.like("order_code",anumbering); - } - } - if(Func.isNotEmpty(waybillNum)){ - String waybill = waybillNum.toString(); - List list = CommonUtil.stringNum(waybill); - if(list.size() > 1){ - queryWrapper.in("waybill_number",list); - }else{ - queryWrapper.like("waybill_number",waybill); - } - } - queryWrapper.in("order_status",aaa); - IPage pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper); - IPage distributionStockArticleVOIPage = distributionStockArticleService.handlePackage(DistributionStockArticleWrapper.build().pageVO(pages)); - return R.data(distributionStockArticleVOIPage); +//// if(Func.isNotEmpty(orderIds)){ +//// queryWrapper.notIn("id",Func.toLongList(orderIds)); +//// } +// if(Func.isNotEmpty(customerName)){ +// queryWrapper.like("customer_name",customerName); +// } +// if(Func.isNotEmpty(customerTelephone)){ +// queryWrapper.like("customer_telephone",customerTelephone); +// } +// if(Func.isNotEmpty(orderCodeNum)){ +// String anumbering = orderCodeNum.toString(); +// List list = CommonUtil.stringNum(anumbering); +// if(list.size() > 1){ +// queryWrapper.in("order_code",list); +// }else{ +// queryWrapper.like("order_code",anumbering); +// } +// } +// if(Func.isNotEmpty(waybillNum)){ +// String waybill = waybillNum.toString(); +// List list = CommonUtil.stringNum(waybill); +// if(list.size() > 1){ +// queryWrapper.in("waybill_number",list); +// }else{ +// queryWrapper.like("waybill_number",waybill); +// } +// } +// queryWrapper.in("order_status",aaa); +// IPage pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper); +// IPage distributionStockArticleVOIPage = distributionStockArticleService.handlePackage(DistributionStockArticleWrapper.build().pageVO(pages)); + return r; } @@ -220,7 +227,10 @@ public class DistributionStockArticleController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStockArticle") public R> clientList(@ApiIgnore DistributionStockArticleVO distributionStockArticle, Query query) { - + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if (Func.isEmpty(myCurrentWarehouse)){ + return R.fail("无仓库信息!!!"); + } //获取当前登录人仓库 // List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); // List collect = myWatchWarehouse.stream() @@ -231,7 +241,7 @@ public class DistributionStockArticleController extends BladeController { DistributionStockArticleWrapper.build().pageVO(pages); - return R.data( DistributionStockArticleWrapper.build().pageVO(pages)); + return R.data(DistributionStockArticleWrapper.build().pageVO(pages)); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java index 60106270d..7784277ce 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java @@ -67,6 +67,12 @@ public interface DistributionAddvalueMapper extends BaseMapper addvalueInfo(@Param("reservationId")Long reservationId); + // /** // * 删除增值服务 // * @param reservationId diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml index 9066e6314..5e98bc8ed 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml @@ -24,6 +24,23 @@ + DELETE FROM logpm_distribution_addvalue WHERE ref_id = #{reservationId} and addvalue_id = #{addvalueType} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvaluePackageMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvaluePackageMapper.xml index 2159f56bd..d77e49548 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvaluePackageMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvaluePackageMapper.xml @@ -35,18 +35,13 @@ DELETE FROM logpm_diatribution_addvalue_package WHERE reservation_id = #{reservationId} and addvalue_detail_id = #{addvalueDetailId} - DELETE FROM logpm_diatribution_addvalue_package WHERE reservation_id = #{reservationId} and package_id = #{packageId} + DELETE FROM logpm_diatribution_addvalue_package WHERE reservation_id = #{reservationId} and package_id = #{packageId} - - - - - diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index 5692ff324..a3f9cdbfc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -93,4 +93,11 @@ public interface DistributionParcelListMapper extends BaseMapper findALLNoUpShelfPackageByOrderCode(@Param("orderCode") String orderCode,@Param("orderCode") Long warehouseId); IPage pageOweList(IPage page,@Param("param") DistributionParcelListDTO parcelListEntity); + + /** + * 查询包件信息，包含库位和托盘信息 + * @param id + * @return + */ + List getPackageList(@Param("stockArticleId") Long id); } 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 5c8401b20..c9164087c 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 @@ -379,5 +379,70 @@ GROUP BY ldpl.id + 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 97339a584..2f13918d0 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 @@ -134,7 +134,7 @@ public interface DistributionReservationMapper extends BaseMapper selectPackageByReservationAndStockArticle(@Param("reservationId") Long id,@Param("stockArticleId") Long id1); + List selectPackageByReservationAndStockArticle(@Param("reservationId") Long id,@Param("stockArticleId") Long id1); /** * 查询预约的订单中间表 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 a5be3d927..cc2c29501 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 @@ -593,22 +593,75 @@ 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 6708cf3b9..c4a6a912c 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 @@ -86,10 +86,66 @@ WHERE + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java index 50a600a70..3868f1013 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java @@ -96,4 +96,11 @@ public interface IDistributionAddvalueService extends IService signforPackageList(Long signforId); + + + /** + * 查询该签收列表的库存品信息 + * @param signforId + * @return + */ + List signforInventoryList(Long signforId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java index 64606d1b6..638b81c60 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java @@ -24,6 +24,7 @@ import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.vo.DistributionStockArticleVO; import com.logpm.distribution.vo.OrderPackgeCodeDataVO; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import javax.servlet.http.HttpServletResponse; @@ -126,4 +127,12 @@ public interface IDistributionStockArticleService extends BaseService pageListOwe(IPage page,Map distributionStockArticle); + + /** + * 订单列表 + * @param distributionStockArticle + * @param query + * @return + */ + R selectStockArticleInfoList(Map distributionStockArticle, Query query); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java index 55ae935b6..089d69366 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.service.impl; +import com.alibaba.druid.sql.visitor.functions.If; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.distribution.bean.Res; import com.logpm.distribution.bean.Resp; @@ -320,53 +321,44 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImplquery().lambda() .eq(DistributionAddvalueDetailEntity::getAddvalueId, distributionAddvalueEntity.getId())); - distributionAddvalueMapper.deleteAddvalue(distributionAppAddvalueDTO.getReservationId(),distributionAppAddvalueDTO.getAddvalueType()); + distributionAddvalueMapper.deleteAddvalue(distributionAppAddvalueDTO.getReservationId(), distributionAppAddvalueDTO.getAddvalueType()); distributionAddvalueDetailMapper.deleteAddvalueDetail(distributionAddvalueEntity.getId()); - distributionAddvaluePackageMapper.deleteAddvaluePackageList(distributionAppAddvalueDTO.getReservationId(),addvalueDetailEntity.getId()); - }else { + distributionAddvaluePackageMapper.deleteAddvaluePackageList(distributionAppAddvalueDTO.getReservationId(), addvalueDetailEntity.getId()); + } else { // 查询出原来的包件信息 DistributionAddvalueVO addvalueVO = distributionAddvalueMapper.selectReservationAddvalue(distributionAppAddvalueDTO.getReservationId(), distributionAppAddvalueDTO.getAddvalueType()); String packageListIds = addvalueVO.getPackageListIds(); - if (Func.isNotEmpty(packageListIds)){ + if (Func.isNotEmpty(packageListIds)) { List distributionAddvaluePackageEntities = distributionAddvaluePackageService.listByIds(Func.toLongList(packageListIds)); Map> oldPackageList = distributionAddvaluePackageEntities.stream().collect(Collectors.groupingBy(DistributionAddvaluePackageEntity::getPackageId)); Map> newPackageList = packageEntityList.stream().collect(Collectors.groupingBy(DistributionAddvaluePackageEntity::getPackageId)); - newPackageList.forEach((k,v)->{ - if (Func.isEmpty(oldPackageList.get(k))){ + newPackageList.forEach((k, v) -> { + if (Func.isEmpty(oldPackageList.get(k))) { //从老的包件中无法进行获取，这里进行包件的新增 DistributionAddvaluePackageEntity distributionAddvaluePackageEntity = v.get(0); distributionAddvaluePackageEntity.setAddvalueDetailId(distributionAddvaluePackageEntities.get(0).getAddvalueDetailId()); distributionAddvaluePackageService.save(distributionAddvaluePackageEntity); - }else { + } else { //存在不进行维护 oldPackageList.remove(k); } }); - if (Func.isEmpty(oldPackageList)){ + if (Func.isEmpty(oldPackageList)) { //进行删除，这里删除的时候需要考虑是否删除增值服务项，是否删除整个关于该客户的增值服务信息 - oldPackageList.forEach((m,n)->{ + oldPackageList.forEach((m, n) -> { //进行删除 DistributionAddvaluePackageEntity distributionAddvaluePackageEntity = n.get(0); - distributionAddvaluePackageMapper.deleteAddvaluePackage(distributionAddvaluePackageEntity.getReservationId(),distributionAddvaluePackageEntity.getPackageId()); + distributionAddvaluePackageMapper.deleteAddvaluePackage(distributionAddvaluePackageEntity.getReservationId(), distributionAddvaluePackageEntity.getPackageId()); }); } } } + return Resp.scanSuccess("保存成功", "保存成功"); + } - - - - - - - - - return null; - } - @Override public R editAddvalueInfo(DistributionAppAddvalueDTO distributionAppAddvalueDTO) { DistributionAddvalueVO addvalueVO = distributionAddvalueMapper.selectReservationAddvalue(distributionAppAddvalueDTO.getReservationId(), distributionAppAddvalueDTO.getAddvalueType()); @@ -380,4 +372,11 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl addvalueInfo= distributionAddvalueMapper.addvalueInfo(distributionAppAddvalueDTO.getReservationId()); + addvalueInfo.stream().filter(a->Func.isNotEmpty(a.getPackageListIds())).forEach(a-> a.setPackageEntityList(distributionAddvaluePackageService.listByIds(Func.toLongList(a.getPackageListIds())))); + return R.data(addvalueInfo); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 228e87699..7a3bf77a3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -2978,7 +2978,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl stockArticleVOS = DistributionStockArticleWrapper.build().listVO(stockArticleEntityList); stockArticleVOS.forEach(s -> { //查询出这个订单在这个预约计划的选择情况 - List packageEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationId, s.getId()); - List packageList = distributionReservationPackageService.getStockArticlePackageList(packageEntityList); - s.setPackageList(packageList); + List packageEntityList = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationId, s.getId()); +// List packageList = distributionReservationPackageService.getStockArticlePackageList(packageEntityList); + List parcelListVOS = DistributionParcelListWrapper.build().listVO(packageEntityList); + s.setPackageList(parcelListVOS); }); reservationVO.setStockArticleList(stockArticleVOS); return R.data(reservationVO); @@ -466,7 +467,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl signforInventoryList(Long signforId) { + List distributionReservationStocklistVOS = distributionSignforMapper.selectInventory(signforId); + distributionReservationStocklistVOS.forEach(i->{ + List list = disStockListDetailService.list(Wrappers.query().lambda().eq(DisStockListDetailEntity::getReservationId, i.getReservationId()).eq(DisStockListDetailEntity::getStockListId, i.getStocklistId())); + switch (i.getLoadingStatus()){ + case "10": + i.setLoadingStatusName(ReservationInventoryLoadingStatusConstant.weizhuangche.getName()); + break; + case "20": + i.setLoadingStatusName(ReservationInventoryLoadingStatusConstant.bufenzhuangche.getName()); + + break; + case "30": + i.setLoadingStatusName(ReservationInventoryLoadingStatusConstant.yizhuangche.getName()); + break; + } + switch (i.getSigningStatus()){ + case "10": + i.setSigningStatusName(ReservationInventorySigningStatusConstant.weiqianshou.getName()); + break; + case "20": + i.setSigningStatusName(ReservationInventorySigningStatusConstant.bufenqianshou.getName()); + break; + case "30": + i.setSigningStatusName(ReservationInventorySigningStatusConstant.yiqianshou.getName());; + } + i.setDetailVOS(DistributionDisStockListWrapper.build().listVO(list)); + }); + + return distributionReservationStocklistVOS; + } + } 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 0f9386f77..e9208ea30 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 @@ -18,6 +18,7 @@ package com.logpm.distribution.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; @@ -36,6 +37,7 @@ import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.mapper.DistributionAddvalueMapper; import com.logpm.distribution.mapper.DistributionDeliveryListMapper; +import com.logpm.distribution.mapper.DistributionParcelListMapper; import com.logpm.distribution.mapper.DistributionStockArticleMapper; import com.logpm.distribution.service.*; import com.logpm.distribution.vo.DistributionParcelListVO; @@ -56,6 +58,7 @@ import org.springblade.common.utils.TemplateUtil; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -106,6 +109,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl map = JSONObject.parseObject(JSONObject.toJSONString(orderNoList), Map.class); @@ -554,11 +557,18 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl handlePackage(IPage pageVO) { + pageVO.getRecords().forEach(s->{ - List parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.query().lambda() - .eq(DistributionParcelListEntity::getStockArticleId, s.getId()) - .ne(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.yiyueyue.getValue())); - s.setParcelListVOS(DistributionParcelListWrapper.build().listVO(parcelListEntityList)); + HashSet str = new HashSet<>(); +// List parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.query().lambda() +// .eq(DistributionParcelListEntity::getStockArticleId, s.getId()) +// .ne(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.yiyueyue.getValue())); + List parcelListEntities = distributionParcelListMapper.getPackageList(s.getId()); + Set allocation = parcelListEntities.stream().filter(p -> Func.isNotEmpty(p.getGoodsAllocation())).distinct().map(DistributionParcelListEntity::getGoodsAllocation).collect(Collectors.toSet()); + Set tray = parcelListEntities.stream().filter(p -> Func.isNotEmpty(p.getPallet())).distinct().map(DistributionParcelListEntity::getPallet).collect(Collectors.toSet()); + s.setAllocation(String.join(",",allocation)); + s.setTrays(String.join(",",tray)); + s.setParcelListVOS(DistributionParcelListWrapper.build().listVO(parcelListEntities)); }); return pageVO; } @@ -682,6 +692,95 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl distributionStockArticle, Query query) { +// IPage page = Condition.getPage(query); + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if (Func.isEmpty(myCurrentWarehouse)){ + return R.fail("无仓库信息!!!"); + } + Object orderCodeNum = distributionStockArticle.get("orderCodeNum"); + distributionStockArticle.remove("orderCodeNum"); + Object waybillNum = distributionStockArticle.get("waybillNum"); + Object o = distributionStockArticle.get("orderCode"); + distributionStockArticle.remove("orderCode"); + Object o2 = distributionStockArticle.get("startDate"); + Object o1 = distributionStockArticle.get("entDate"); + String orderIds = (String) distributionStockArticle.get("orderIds"); + String customerName = (String) distributionStockArticle.get("customerName"); + String reservationStatus = (String) distributionStockArticle.get("reservationStatus"); + String warehouseEntryTime = (String) distributionStockArticle.get("warehouseEntryTime"); + String customerTelephone = (String) distributionStockArticle.get("customerTelephone"); + String completeSet = (String) distributionStockArticle.get("completeSet"); + String freezeStatus = (String) distributionStockArticle.get("freezeStatus"); + Object d = distributionStockArticle.get("id"); + distributionStockArticle.remove("id"); + distributionStockArticle.remove("startDate"); + distributionStockArticle.remove("entDate"); + distributionStockArticle.remove("orderIds"); +// distributionStockArticle.remove("pageSize"); +// distributionStockArticle.remove("currentPage"); +// distributionStockArticle.remove("total"); + QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class); + LambdaQueryWrapper lambda = Wrappers.query().lambda(); + queryWrapper.ne("reservation_status","30"); + queryWrapper.lambda().eq(DistributionStockArticleEntity::getWarehouseId,myCurrentWarehouse.getId()); + if(Func.isNotEmpty(o)){ + queryWrapper.in("order_code",String.valueOf(o).split(",")); + } + if(Func.isNotEmpty(reservationStatus)){ + queryWrapper.eq("reservation_status",reservationStatus); + } + if(Func.isNotEmpty(warehouseEntryTime)){ + queryWrapper.apply("datediff(warehouse_entry_time,{0} ) = 0",warehouseEntryTime); + } + if(Func.isNotEmpty(freezeStatus)){ + queryWrapper.eq("freeze_status",freezeStatus); + } + if(Func.isNotEmpty(completeSet)){ + queryWrapper.eq("complete_set",completeSet); + } + if(ObjectUtil.isNotEmpty(d)){ + queryWrapper.in("id",String.valueOf(d).split(",")); + } + if(ObjectUtil.isNotEmpty(o2)){ + queryWrapper.between("warehouse_entry_time",o2,o1); + } + if(Func.isNotEmpty(orderIds)){ + queryWrapper.notIn(Func.isNotEmpty(orderIds),"id",Func.toLongList(orderIds)); + } +// if(Func.isNotEmpty(orderIds)){ +// queryWrapper.notIn("id",Func.toLongList(orderIds)); +// } + if(Func.isNotEmpty(customerName)){ + queryWrapper.like("customer_name",customerName); + } + if(Func.isNotEmpty(customerTelephone)){ + queryWrapper.like("customer_telephone",customerTelephone); + } + if(Func.isNotEmpty(orderCodeNum)){ + String anumbering = orderCodeNum.toString(); + List list = CommonUtil.stringNum(anumbering); + if(list.size() > 1){ + queryWrapper.in("order_code",list); + }else{ + queryWrapper.like("order_code",anumbering); + } + } + if(Func.isNotEmpty(waybillNum)){ + String waybill = waybillNum.toString(); + List list = CommonUtil.stringNum(waybill); + if(list.size() > 1){ + queryWrapper.in("waybill_number",list); + }else{ + queryWrapper.like("waybill_number",waybill); + } + } + IPage pages = this.page(Condition.getPage(query), queryWrapper); + IPage distributionStockArticleVOIPage = this.handlePackage(DistributionStockArticleWrapper.build().pageVO(pages)); + return R.data(distributionStockArticleVOIPage); + } + @Override public DistributionStockArticleEntity findStockArticleByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) { QueryWrapper queryWrapper = new QueryWrapper<>();