java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

fix: 

1.增加首页的明细数据
fix-sign
pref_mail@163.com 5 months ago
parent
be176e6b41
commit
0e1ddf8ceb
13 changed files with 1058 additions and 608 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 304
      blade-service/logpm-report/src/main/java/com/logpm/report/controller/WarehouseIndexController.java
  2. 9
      blade-service/logpm-report/src/main/java/com/logpm/report/dto/IndexDTO.java
  3. 126
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.java
  4. 119
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
  5. 6
      blade-service/logpm-report/src/main/java/com/logpm/report/service/IWarehouseIndexService.java
  6. 992
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java
  7. 16
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/IndexAllocationDataByWarehouseIdVO.java
  8. 16
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/IndexHandOrderDataByWarehouseIdVO.java
  9. 19
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/IndexOpenOrderDataByWarehouseVO.java
  10. 16
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/WarehouseNumberVO.java
  11. 16
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexOpenItemDataByWarWarehouseIdVO.java
  12. 18
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
  13. 9
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java

304
blade-service/logpm-report/src/main/java/com/logpm/report/controller/WarehouseIndexController.java
Unescape View File

@ -37,31 +37,43 @@ public class WarehouseIndexController {
@ApiOperation(value = "开单数据", notes = "传入indexDTO")
public R openOrderData(@RequestBody IndexDTO indexDTO) {
String method = "###########openOrderData: ";
log.info(method+"indexDTO={}",indexDTO);
log.info(method + "indexDTO={}", indexDTO);
try{
List<Long> warehouseIds = new ArrayList<>();
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
myWatchWarehouse.forEach(warehouseEntity -> {
warehouseIds.add(warehouseEntity.getId());
});
}else{
warehouseIds.add(myCurrentWarehouse.getId());
}
try {
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
indexDTO.setWarehouseIds(warehouseIds);
//查询订制品打托列表
IndexOpenOrderDataVO indexOpenOrderDataVO = warehouseIndexService.openOrderData(indexDTO);
return R.data(indexOpenOrderDataVO);
}catch (CustomerException e){
} catch (CustomerException e) {
log.warn(e.message);
return R.fail(e.code, e.message);
} catch (Exception e) {
log.error(method + "系统异常，联系管理员", e);
return R.fail(500, "系统异常，联系管理员");
}
}
@ResponseBody
@PostMapping("/openOrderDataByWarehouseId")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "开单数据明细", notes = "传入indexDTO")
public R openOrderDataByWarWarehouseId(@RequestBody IndexDTO indexDTO) {
String method = "###########openOrderDataByWarWarehouseId: ";
log.info(method + "indexDTO={}", indexDTO);
try {
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
indexDTO.setWarehouseIds(warehouseIds);
//查询订制品打托列表
List<IndexOpenOrderDataByWarehouseVO> indexOpenOrderDataVO = warehouseIndexService.openOrderDataByWarWarehouseId(indexDTO);
return R.data(indexOpenOrderDataVO);
} catch (CustomerException e) {
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
return R.fail(e.code, e.message);
} catch (Exception e) {
log.error(method + "系统异常，联系管理员", e);
return R.fail(500, "系统异常，联系管理员");
}
}
@ -72,31 +84,20 @@ public class WarehouseIndexController {
@ApiOperation(value = "开单收入数据", notes = "传入indexDTO")
public R openOrderIncome(@RequestBody IndexDTO indexDTO) {
String method = "###########openOrderIncome: ";
log.info(method+"indexDTO={}",indexDTO);
log.info(method + "indexDTO={}", indexDTO);
try{
List<Long> warehouseIds = new ArrayList<>();
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
myWatchWarehouse.forEach(warehouseEntity -> {
warehouseIds.add(warehouseEntity.getId());
});
}else{
warehouseIds.add(myCurrentWarehouse.getId());
}
try {
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
indexDTO.setWarehouseIds(warehouseIds);
//查询订制品打托列表
IndexOpenOrderIncomeVO indexOpenOrderIncomeVO = warehouseIndexService.openOrderIncome(indexDTO);
return R.data(indexOpenOrderIncomeVO);
}catch (CustomerException e){
} catch (CustomerException e) {
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
return R.fail(e.code, e.message);
} catch (Exception e) {
log.error(method + "系统异常，联系管理员", e);
return R.fail(500, "系统异常，联系管理员");
}
}
@ -107,31 +108,45 @@ public class WarehouseIndexController {
@ApiOperation(value = "当前在库数据", notes = "传入indexDTO")
public R handOrderData(@RequestBody IndexDTO indexDTO) {
String method = "###########handOrderData: ";
log.info(method+"indexDTO={}",indexDTO);
log.info(method + "indexDTO={}", indexDTO);
try{
List<Long> warehouseIds = new ArrayList<>();
try {
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
myWatchWarehouse.forEach(warehouseEntity -> {
warehouseIds.add(warehouseEntity.getId());
});
}else{
warehouseIds.add(myCurrentWarehouse.getId());
}
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
indexDTO.setWarehouseIds(warehouseIds);
//查询订制品打托列表
IndexHandOrderDataVO indexHandOrderDataVO = warehouseIndexService.handOrderData(indexDTO);
return R.data(indexHandOrderDataVO);
}catch (CustomerException e){
} catch (CustomerException e) {
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
return R.fail(e.code, e.message);
} catch (Exception e) {
log.error(method + "系统异常，联系管理员", e);
return R.fail(500, "系统异常，联系管理员");
}
}
@ResponseBody
@PostMapping("/handOrderDataByWarehouseId")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "当前在库数据明细", notes = "传入indexDTO")
public R handOrderDataByWarehouseId(@RequestBody IndexDTO indexDTO) {
String method = "###########handOrderDataByWarehouseId: ";
log.info(method + "indexDTO={}", indexDTO);
try {
//当前登录人选择的仓库
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
indexDTO.setWarehouseIds(warehouseIds);
//查询订制品打托列表
List<IndexHandOrderDataByWarehouseIdVO> indexHandOrderDataByWarehouseIdVO = warehouseIndexService.handOrderDataByWarehouseId(indexDTO);
return R.data(indexHandOrderDataByWarehouseIdVO);
} catch (CustomerException e) {
log.warn(e.message);
return R.fail(e.code, e.message);
} catch (Exception e) {
log.error(method + "系统异常，联系管理员", e);
return R.fail(500, "系统异常，联系管理员");
}
}
@ -141,31 +156,45 @@ public class WarehouseIndexController {
@ApiOperation(value = "库位数据", notes = "传入indexDTO")
public R allocationData(@RequestBody IndexDTO indexDTO) {
String method = "###########allocationData: ";
log.info(method+"indexDTO={}",indexDTO);
log.info(method + "indexDTO={}", indexDTO);
try {
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
try{
List<Long> warehouseIds = new ArrayList<>();
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
myWatchWarehouse.forEach(warehouseEntity -> {
warehouseIds.add(warehouseEntity.getId());
});
}else{
warehouseIds.add(myCurrentWarehouse.getId());
}
indexDTO.setWarehouseIds(warehouseIds);
//查询订制品打托列表
IndexAllocationDataVO indexAllocationDataVO = warehouseIndexService.allocationData(indexDTO);
return R.data(indexAllocationDataVO);
}catch (CustomerException e){
} catch (CustomerException e) {
log.warn(e.message);
return R.fail(e.code, e.message);
} catch (Exception e) {
log.error(method + "系统异常，联系管理员", e);
return R.fail(500, "系统异常，联系管理员");
}
}
@ResponseBody
@PostMapping("/allocationDataByWarehouseId")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "库位数据", notes = "传入indexDTO")
public R allocationDataByWarehouseId(@RequestBody IndexDTO indexDTO) {
String method = "###########allocationDataByWarehouseId: ";
log.info(method + "indexDTO={}", indexDTO);
try {
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
indexDTO.setWarehouseIds(warehouseIds);
//查询订制品打托列表
List<IndexAllocationDataByWarehouseIdVO> allocationDataByWarehouseIdList = warehouseIndexService.allocationDataByWarehouseId(indexDTO);
return R.data(allocationDataByWarehouseIdList);
} catch (CustomerException e) {
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
return R.fail(e.code, e.message);
} catch (Exception e) {
log.error(method + "系统异常，联系管理员", e);
return R.fail(500, "系统异常，联系管理员");
}
}
@ -175,31 +204,22 @@ public class WarehouseIndexController {
@ApiOperation(value = "干线待发运数据", notes = "传入indexDTO")
public R trunklineHandOrderData(@RequestBody IndexDTO indexDTO) {
String method = "###########trunklineHandOrderData: ";
log.info(method+"indexDTO={}",indexDTO);
log.info(method + "indexDTO={}", indexDTO);
try {
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
try{
List<Long> warehouseIds = new ArrayList<>();
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
myWatchWarehouse.forEach(warehouseEntity -> {
warehouseIds.add(warehouseEntity.getId());
});
}else{
warehouseIds.add(myCurrentWarehouse.getId());
}
indexDTO.setWarehouseIds(warehouseIds);
//查询订制品打托列表
IndexTrunklineHandOrderDataVO indexTrunklineHandOrderDataVO = warehouseIndexService.trunklineHandOrderData(indexDTO);
return R.data(indexTrunklineHandOrderDataVO);
}catch (CustomerException e){
} catch (CustomerException e) {
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
return R.fail(e.code, e.message);
} catch (Exception e) {
log.error(method + "系统异常，联系管理员", e);
return R.fail(500, "系统异常，联系管理员");
}
}
@ -209,31 +229,21 @@ public class WarehouseIndexController {
@ApiOperation(value = "干线车次数据", notes = "传入indexDTO")
public R trunklineCarsData(@RequestBody IndexDTO indexDTO) {
String method = "###########trunklineCarsData: ";
log.info(method+"indexDTO={}",indexDTO);
log.info(method + "indexDTO={}", indexDTO);
try{
List<Long> warehouseIds = new ArrayList<>();
try {
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
myWatchWarehouse.forEach(warehouseEntity -> {
warehouseIds.add(warehouseEntity.getId());
});
}else{
warehouseIds.add(myCurrentWarehouse.getId());
}
indexDTO.setWarehouseIds(warehouseIds);
//查询订制品打托列表
IndexTrunklineCarsDataVO indexTrunklineCarsDataVO = warehouseIndexService.trunklineCarsData(indexDTO);
return R.data(indexTrunklineCarsDataVO);
}catch (CustomerException e){
} catch (CustomerException e) {
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
return R.fail(e.code, e.message);
} catch (Exception e) {
log.error(method + "系统异常，联系管理员", e);
return R.fail(500, "系统异常，联系管理员");
}
}
@ -243,18 +253,18 @@ public class WarehouseIndexController {
@ApiOperation(value = "卸车异常数据", notes = "传入indexDTO")
public R unloadAbnormalData(@RequestBody IndexDTO indexDTO) {
String method = "###########unloadAbnormalData: ";
log.info(method+"indexDTO={}",indexDTO);
log.info(method + "indexDTO={}", indexDTO);
try{
try {
List<Long> warehouseIds = new ArrayList<>();
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
if (Objects.isNull(myCurrentWarehouse)) {
List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
myWatchWarehouse.forEach(warehouseEntity -> {
warehouseIds.add(warehouseEntity.getId());
});
}else{
} else {
warehouseIds.add(myCurrentWarehouse.getId());
}
indexDTO.setWarehouseIds(warehouseIds);
@ -262,48 +272,36 @@ public class WarehouseIndexController {
//查询订制品打托列表
IndexUnloadAbnormalDataVO indexUnloadAbnormalDataVO = warehouseIndexService.unloadAbnormalData(indexDTO);
return R.data(indexUnloadAbnormalDataVO);
}catch (CustomerException e){
} catch (CustomerException e) {
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
return R.fail(e.code, e.message);
} catch (Exception e) {
log.error(method + "系统异常，联系管理员", e);
return R.fail(500, "系统异常，联系管理员");
}
}
@ResponseBody
@PostMapping("/deliveryData")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "卸车异常数据", notes = "传入indexDTO")
public R deliveryData(@RequestBody IndexDTO indexDTO) {
String method = "###########unloadAbnormalData: ";
log.info(method+"indexDTO={}",indexDTO);
try{
List<Long> warehouseIds = new ArrayList<>();
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWarehouseList();
if (!myWatchWarehouse.isEmpty()) {
warehouseIds = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
}
}else{
warehouseIds.add(myCurrentWarehouse.getId());
}
log.info(method + "indexDTO={}", indexDTO);
try {
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
indexDTO.setWarehouseIds(warehouseIds);
//查询订制品打托列表
List<IndexDeliveryDataVO> indexDeliveryDataVO = warehouseIndexService.deliveryData(indexDTO);
return R.data(indexDeliveryDataVO);
}catch (CustomerException e){
} catch (CustomerException e) {
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
return R.fail(e.code, e.message);
} catch (Exception e) {
log.error(method + "系统异常，联系管理员", e);
return R.fail(500, "系统异常，联系管理员");
}
}
@ -314,31 +312,19 @@ public class WarehouseIndexController {
@ApiOperation(value = "卸车异常数据", notes = "传入indexDTO")
public R signforData(@RequestBody IndexDTO indexDTO) {
String method = "###########unloadAbnormalData: ";
log.info(method+"indexDTO={}",indexDTO);
try{
List<Long> warehouseIds = new ArrayList<>();
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWarehouseList();
if (!myWatchWarehouse.isEmpty()) {
warehouseIds = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
}
}else{
warehouseIds.add(myCurrentWarehouse.getId());
}
log.info(method + "indexDTO={}", indexDTO);
try {
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
indexDTO.setWarehouseIds(warehouseIds);
//查询订制品打托列表
List<IndexSignforDataVO> indexDeliveryDataVO = warehouseIndexService.signforData(indexDTO);
return R.data(indexDeliveryDataVO);
}catch (CustomerException e){
} catch (CustomerException e) {
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
return R.fail(e.code, e.message);
} catch (Exception e) {
log.error(method + "系统异常，联系管理员", e);
return R.fail(500, "系统异常，联系管理员");
}
}

9
blade-service/logpm-report/src/main/java/com/logpm/report/dto/IndexDTO.java
Unescape View File

@ -14,4 +14,13 @@ public class IndexDTO implements Serializable {
private Date endDate;
private String dayStr;
@Override
public String toString() {
return "IndexDTO{" +
"warehouseIds=" + warehouseIds +
", startDate=" + startDate +
", endDate=" + endDate +
", dayStr='" + dayStr + '\'' +
'}';
}
}

126
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.java
Unescape View File

@ -2,9 +2,12 @@ package com.logpm.report.mapper;
import com.alibaba.fastjson.JSONObject;
import com.logpm.report.dto.IndexDTO;
import com.logpm.report.vo.IndexHandOrderDataByWarehouseIdVO;
import com.logpm.report.vo.IndexHandOrderDataVO;
import com.logpm.report.vo.IndexTrunklineCarsDataVO;
import com.logpm.report.vo.WarehouseNumberVO;
import com.logpm.report.vo.indexCount.IndexDeliveryDataVO;
import com.logpm.report.vo.indexCount.IndexOpenItemDataByWarWarehouseIdVO;
import com.logpm.report.vo.indexCount.IndexOpenItemDataVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -23,12 +26,18 @@ public interface WarehouseIndexMapper {
IndexHandOrderDataVO handOrderData(@Param("param") IndexDTO indexDTO);
List<IndexHandOrderDataByWarehouseIdVO> handOrderDataByWarehouseId(@Param("param") IndexDTO indexDTO);
Integer findHandStockListNum(@Param("param") IndexDTO indexDTO);
List<WarehouseNumberVO> findHandStockListNumByWarehouseId(@Param("param") IndexDTO indexDTO);
Integer findTrayNum(@Param("param") IndexDTO indexDTO);
Integer findTotalAllocationNum(@Param("param") IndexDTO indexDTO);
List<WarehouseNumberVO> findTotalAllocationNumByWarehouseId(@Param("param") IndexDTO indexDTO);
Integer findUseAllocationNum(@Param("param") IndexDTO indexDTO);
Integer findUpshelfNum(@Param("param") IndexDTO indexDTO);
@ -45,253 +54,296 @@ public interface WarehouseIndexMapper {
/**
* 查询商、市配的当前配送总数据
*
* @param indexDTO
* @return
*/
List<IndexDeliveryDataVO> findDeliveryTotal(@Param("param")IndexDTO indexDTO);
List<IndexDeliveryDataVO> findDeliveryTotal(@Param("param") IndexDTO indexDTO);
/**
* 查询自提当前配送总信息
*
* @param indexDTO
* @return
*/
IndexDeliveryDataVO findBillLadingTotal(@Param("param")IndexDTO indexDTO);
IndexDeliveryDataVO findBillLadingTotal(@Param("param") IndexDTO indexDTO);
/**
* 查询配送信息
*
* @param type
* @param indexDTO
* @return
*/
Integer findDeLiveryTotalNum(@Param("param") IndexDTO indexDTO,@Param("type")String type);
Integer findDeLiveryTotalNum(@Param("param") IndexDTO indexDTO, @Param("type") String type);
/**
* 查询当前配送总重量
*
* @param indexDTO
* @param type
* @return
*/
BigDecimal findDeliveryTotalWeight(@Param("param")IndexDTO indexDTO, @Param("type")String type);
BigDecimal findDeliveryTotalWeight(@Param("param") IndexDTO indexDTO, @Param("type") String type);
/**
* 查询当前配送总体积
*
* @param indexDTO
* @param type
* @return
*/
BigDecimal findDeliveryTotalVolume(@Param("param")IndexDTO indexDTO, @Param("type") String type);
BigDecimal findDeliveryTotalVolume(@Param("param") IndexDTO indexDTO, @Param("type") String type);
/**
* 查询当前配送总重量
*
* @param indexDTO
* @param type
* @return
*/
Integer findDeLiveryTotalRoadNum(@Param("param")IndexDTO indexDTO,@Param("type") String type);
Integer findDeLiveryTotalRoadNum(@Param("param") IndexDTO indexDTO, @Param("type") String type);
/**
* 查询自提总件数
*
* @return
*/
Integer findBillLadingTotalNum(@Param("param")IndexDTO indexDTO);
Integer findBillLadingTotalNum(@Param("param") IndexDTO indexDTO);
/**
* 查询自提包件总重量
*
* @param indexDTO
* @return
*/
BigDecimal findBillLadingTotalWeight(@Param("param")IndexDTO indexDTO);
BigDecimal findBillLadingTotalWeight(@Param("param") IndexDTO indexDTO);
/**
* 查询自提包件总体积
*
* @param indexDTO
* @return
*/
BigDecimal findBillLadingTotalVolume(@Param("param")IndexDTO indexDTO);
BigDecimal findBillLadingTotalVolume(@Param("param") IndexDTO indexDTO);
/**
* 查询三方配送信息
*
* @param indexDTO
* @return
*/
IndexDeliveryDataVO findTripartiteTotalByMerchant(@Param("param")IndexDTO indexDTO);
IndexDeliveryDataVO findTripartiteTotalByMerchant(@Param("param") IndexDTO indexDTO);
/**
* 查询三方配送信息
*
* @param indexDTO
* @return
*/
IndexDeliveryDataVO findTripartiteTotalByCity(@Param("param")IndexDTO indexDTO);
IndexDeliveryDataVO findTripartiteTotalByCity(@Param("param") IndexDTO indexDTO);
/**
* 查询三方商配总件数
*
* @param indexDTO
* @return
*/
Integer findTripartiteTotalNumByMerchant(@Param("param")IndexDTO indexDTO);
Integer findTripartiteTotalNumByMerchant(@Param("param") IndexDTO indexDTO);
/**
* 查询三方市配总件数
*
* @param indexDTO
* @return
*/
Integer findTripartiteTotalNumByCity(@Param("param")IndexDTO indexDTO);
Integer findTripartiteTotalNumByCity(@Param("param") IndexDTO indexDTO);
/**
* 查询三方总重量
*
* @param indexDTO
* @return
*/
BigDecimal findTripartiteTotalWeightByMerchant(@Param("param")IndexDTO indexDTO);
BigDecimal findTripartiteTotalWeightByMerchant(@Param("param") IndexDTO indexDTO);
BigDecimal findTripartiteTotalWeightByCity(@Param("param")IndexDTO indexDTO);
BigDecimal findTripartiteTotalWeightByCity(@Param("param") IndexDTO indexDTO);
/**
* 查询三方配送总体积
*
* @param indexDTO
* @return
*/
BigDecimal findTripartiteTotalVolumeByMerchant(@Param("param")IndexDTO indexDTO);
BigDecimal findTripartiteTotalVolumeByMerchant(@Param("param") IndexDTO indexDTO);
/**
* 查询三方配送市配总体积
*
* @param indexDTO
* @return
*/
BigDecimal findTripartiteTotalVolumeByCity(@Param("param")IndexDTO indexDTO);
BigDecimal findTripartiteTotalVolumeByCity(@Param("param") IndexDTO indexDTO);
/**
* 查询当天的签收数量
*
* @param indexDTO
* @return
*/
String findSignforDataByDay(@Param("param")IndexDTO indexDTO);
String findSignforDataByDay(@Param("param") IndexDTO indexDTO);
/**
* 查询当月签收数量
*
* @param indexDTO
* @return
*/
String findSignforDataByMonth(@Param("param")IndexDTO indexDTO);
String findSignforDataByMonth(@Param("param") IndexDTO indexDTO);
/**
* 查询前天未签收件数
*
* @param indexDTO
* @return
*/
String findUnSignforDataByDay(@Param("param")IndexDTO indexDTO);
String findUnSignforDataByDay(@Param("param") IndexDTO indexDTO);
/**
* 查询当月未签收件数
*
* @param indexDTO
* @return
*/
String findUnSignforDataByMonth(@Param("param")IndexDTO indexDTO);
String findUnSignforDataByMonth(@Param("param") IndexDTO indexDTO);
/**
* 查询当天文员复核数
*
* @param indexDTO
* @return
*/
String findClerkSignforNumByDay(@Param("param")IndexDTO indexDTO);
String findClerkSignforNumByDay(@Param("param") IndexDTO indexDTO);
/**
* 查询当月文员复核数
*
* @param indexDTO
* @return
*/
String findClerkSignforNumByMonth(@Param("param")IndexDTO indexDTO);
String findClerkSignforNumByMonth(@Param("param") IndexDTO indexDTO);
/**
* 查询当天计划数
*
* @param indexDTO
* @return
*/
String findPlanNumByDay(@Param("param")IndexDTO indexDTO);
String findPlanNumByDay(@Param("param") IndexDTO indexDTO);
/**
* 查询当月文员计划数
*
* @param indexDTO
* @return
*/
String findPlanNumByMonth(@Param("param")IndexDTO indexDTO);
String findPlanNumByMonth(@Param("param") IndexDTO indexDTO);
/**
* 查询当天文员复核超时数
*
* @param indexDTO
* @return
*/
String findClerkOverTimeNumByDay(@Param("param")IndexDTO indexDTO);
String findClerkOverTimeNumByDay(@Param("param") IndexDTO indexDTO);
/**
* 查询当月文员复核超时数
*
* @param indexDTO
* @return
*/
String findClerkOverTimeNumByMonth(@Param("param")IndexDTO indexDTO);
String findClerkOverTimeNumByMonth(@Param("param") IndexDTO indexDTO);
/**
* 查询自提签收包件数
*
* @param indexDTO
* @return
*/
String findBillLadingSignforByDay(@Param("param")IndexDTO indexDTO);
String findBillLadingSignforByDay(@Param("param") IndexDTO indexDTO);
/**
* 查询当月自提签收包件数
*
* @param indexDTO
* @return
*/
String findBillLadingSignforByMonth(@Param("param")IndexDTO indexDTO);
String findBillLadingSignforByMonth(@Param("param") IndexDTO indexDTO);
/**
* 查询当天自提未签收数
*
* @param indexDTO
* @return
*/
String findBillLadingUnSignforByDay(@Param("param")IndexDTO indexDTO);
String findBillLadingUnSignforByDay(@Param("param") IndexDTO indexDTO);
/**
* 查询当月自提未签收数
*
* @param indexDTO
* @return
*/
String findBillLadingUnSignforByMonth(@Param("param")IndexDTO indexDTO);
String findBillLadingUnSignforByMonth(@Param("param") IndexDTO indexDTO);
/**
* 查询当天自提复核数
*
* @param indexDTO
* @return
*/
String findBillLadingSignForNumByDay(@Param("param")IndexDTO indexDTO);
String findBillLadingSignForNumByDay(@Param("param") IndexDTO indexDTO);
/**
* 查询当天签收超时数
*
* @param indexDTO
* @return
*/
String findBillLadingOverTimeNumByDay(@Param("param")IndexDTO indexDTO);
String findBillLadingOverTimeNumByDay(@Param("param") IndexDTO indexDTO);
/**
* 查询当月签收数
*
* @param indexDTO
* @return
*/
String findBillLadingSignForNumByMonth(@Param("param")IndexDTO indexDTO);
String findBillLadingSignForNumByMonth(@Param("param") IndexDTO indexDTO);
/**
* 查询当月计划自提总数
*
* @param indexDTO
* @return
*/
String findBillLadingPlanNumByDay(@Param("param")IndexDTO indexDTO);
String findBillLadingPlanNumByDay(@Param("param") IndexDTO indexDTO);
/**
*查询当月自提计划数
* 查询当月自提计划数
*
* @param indexDTO
* @return
*/
String findBillLadingPlanNumByMonth(@Param("param")IndexDTO indexDTO);
String findBillLadingPlanNumByMonth(@Param("param") IndexDTO indexDTO);
List<IndexOpenItemDataByWarWarehouseIdVO> findTotalNumByWarWarehouseId(@Param("param") IndexDTO indexDTO);
List<WarehouseNumberVO> findUseAllocationNumByWarehouseId(@Param("param") IndexDTO indexDTO);
List<WarehouseNumberVO> findUpshelfNumByWarehouseId(@Param("param") IndexDTO indexDTO);
List<WarehouseNumberVO> findTrayNumByWarehouseId(@Param("param") IndexDTO indexDTO);
}

119
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
Unescape View File

@ -4,9 +4,9 @@
<select id="findTotalNum" resultType="com.logpm.report.vo.indexCount.IndexOpenItemDataVO">
select IFNULL(count(id),0) totalNum,
IFNULL(sum(total_count),0) totalCount
IFNULL(sum(total_count),0) totalCount
from logpm_warehouse_waybill
where 1=1
where 1=1 and abolish_status=0
<if test="param.startDate != null">
and create_time &gt;= #{param.startDate}
</if>
@ -98,6 +98,22 @@
#{item}
</foreach>
</select>
<select id="findTotalAllocationNumByWarehouseId" resultType="com.logpm.report.vo.WarehouseNumberVO">
select
warehouse_id
,IFNULL(count(id),0) as countNumber
from logpm_warehouse_goods_allocation
where 1=1
and is_deleted = 0
and enable_status = 1
and warehouse_id in
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY
warehouse_id
</select>
<select id="findUseAllocationNum" resultType="int">
select IFNULL(count(id),0)
@ -597,7 +613,7 @@
</foreach>
</if>
</where>
) AS num
) AS num
</select>
<select id="findUnSignforDataByDay" resultType="java.lang.String">
SELECT
@ -835,7 +851,7 @@
<select id="findBillLadingSignForNumByDay" resultType="java.lang.String">
SELECT
count(1) AS num
count(1) AS num
FROM
logpm_distrilbution_bill_lading
<where>
@ -853,7 +869,7 @@
<select id="findBillLadingOverTimeNumByDay" resultType="java.lang.String">
SELECT
count(1) AS num
count(1) AS num
FROM
logpm_distrilbution_bill_lading
<where>
@ -871,7 +887,7 @@
</select>
<select id="findBillLadingSignForNumByMonth" resultType="java.lang.String">
SELECT
count(1) AS num
count(1) AS num
FROM
logpm_distrilbution_bill_lading
<where>
@ -888,7 +904,7 @@
</select>
<select id="findBillLadingPlanNumByDay" resultType="java.lang.String">
SELECT
count(1) AS num
count(1) AS num
FROM
logpm_distrilbution_bill_lading
<where>
@ -904,7 +920,7 @@
</select>
<select id="findBillLadingPlanNumByMonth" resultType="java.lang.String">
SELECT
count(1) AS num
count(1) AS num
FROM
logpm_distrilbution_bill_lading
<where>
@ -918,6 +934,93 @@
</if>
</where>
</select>
<select id="findTotalNumByWarWarehouseId"
resultType="com.logpm.report.vo.indexCount.IndexOpenItemDataByWarWarehouseIdVO">
select departure_warehouse_id as warehouseId,departure_warehouse_name as warehouseName ,
IFNULL(count(id),0) totalNum,
IFNULL(sum(total_count),0) totalCount
from logpm_warehouse_waybill
where 1=1 and abolish_status=0
<if test="param.startDate != null">
and create_time &gt;= #{param.startDate}
</if>
<if test="param.endDate != null">
and create_time &lt;= #{param.endDate}
</if>
and departure_warehouse_id in
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY departure_warehouse_id
</select>
<select id="handOrderDataByWarehouseId" resultType="com.logpm.report.vo.IndexHandOrderDataByWarehouseIdVO">
select
warehouse_id as warehouseId,
warehouse as warehouseName,
IFNULL(sum(hand_quantity),0) totalNum,
IFNULL(SUM(IF(is_zero=1,hand_quantity,0)),0) zeroNum,
IFNULL(SUM(IF(type_service='1',hand_quantity,0)),0) mallNum,
IFNULL(SUM(IF(type_service='2',hand_quantity,0)),0) cityNum,
IFNULL(SUM(IF(type_service='3',hand_quantity,0)),0) billNum,
IFNULL(SUM(IF(type_service='4',hand_quantity,0)),0) thirdTransferNum
from logpm_distribution_stock_article
WHERE 1=1
and warehouse_id in
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY
warehouse_id
</select>
<select id="findHandStockListNumByWarehouseId" resultType="com.logpm.report.vo.WarehouseNumberVO">
SELECT warehouse_id, IFNULL( sum( quantity_stock ), 0 ) as countNumber
FROM logpm_distribution_stock_list
WHERE
1 = 1 AND warehouse_id IN
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY
warehouse_id
</select>
<select id="findUseAllocationNumByWarehouseId" resultType="com.logpm.report.vo.WarehouseNumberVO">
select warehouse_id,IFNULL(count(id),0) as countNumber
from logpm_warehouse_updown_type
where 1=1
and is_deleted = 0
and warehouse_id in
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
group by warehouse_id
</select>
<select id="findUpshelfNumByWarehouseId" resultType="com.logpm.report.vo.WarehouseNumberVO">
select
warehouse_id
,IFNULL(sum(num),0) as countNumber
from logpm_warehouse_updown_goods
where 1=1
and warehouse_id in
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
group by warehouse_id
</select>
<select id="findTrayNumByWarehouseId" resultType="com.logpm.report.vo.WarehouseNumberVO">
select
warehouse_id
,IFNULL(sum(num),0) as countNumber
from logpm_warehouse_tray_goods
where 1=1
and warehouse_id in
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
group by warehouse_id
</select>
</mapper>

6
blade-service/logpm-report/src/main/java/com/logpm/report/service/IWarehouseIndexService.java
Unescape View File

@ -35,4 +35,10 @@ public interface IWarehouseIndexService {
* @return
*/
List<IndexSignforDataVO> signforData(IndexDTO indexDTO);
List<IndexOpenOrderDataByWarehouseVO> openOrderDataByWarWarehouseId(IndexDTO indexDTO);
List<IndexAllocationDataByWarehouseIdVO> allocationDataByWarehouseId(IndexDTO indexDTO);
List<IndexHandOrderDataByWarehouseIdVO> handOrderDataByWarehouseId(IndexDTO indexDTO);
}

992
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

16
blade-service/logpm-report/src/main/java/com/logpm/report/vo/IndexAllocationDataByWarehouseIdVO.java
Unescape View File

@ -0,0 +1,16 @@
package com.logpm.report.vo;
import lombok.Data;
@Data
public class IndexAllocationDataByWarehouseIdVO extends IndexAllocationDataVO {
/**
* 仓库名称
*/
private String warehouseName;
/**
* 仓库ID
*/
private Long warehouseId;
}

16
blade-service/logpm-report/src/main/java/com/logpm/report/vo/IndexHandOrderDataByWarehouseIdVO.java
Unescape View File

@ -0,0 +1,16 @@
package com.logpm.report.vo;
import lombok.Data;
@Data
public class IndexHandOrderDataByWarehouseIdVO extends IndexHandOrderDataVO{
/**
* 仓库名称
*/
private String warehouseName;
/**
* 仓库ID
*/
private Long warehouseId;
}

19
blade-service/logpm-report/src/main/java/com/logpm/report/vo/IndexOpenOrderDataByWarehouseVO.java
Unescape View File

@ -0,0 +1,19 @@
package com.logpm.report.vo;
import lombok.Data;
/**
* 开单的仓库明细数据
*/
@Data
public class IndexOpenOrderDataByWarehouseVO extends IndexOpenOrderDataVO {
/**
* 仓库名称
*/
private String warehouseName;
/**
* 仓库ID
*/
private Long warehouseId;
}

16
blade-service/logpm-report/src/main/java/com/logpm/report/vo/WarehouseNumberVO.java
Unescape View File

@ -0,0 +1,16 @@
package com.logpm.report.vo;
import lombok.Data;
@Data
public class WarehouseNumberVO {
/**
* 数量
*/
private Integer countNumber;
/**
* 仓库ID
*/
private Long warehouseId;
}

16
blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexOpenItemDataByWarWarehouseIdVO.java
Unescape View File

@ -0,0 +1,16 @@
package com.logpm.report.vo.indexCount;
import lombok.Data;
@Data
public class IndexOpenItemDataByWarWarehouseIdVO extends IndexOpenItemDataVO{
/**
* 仓库名称
*/
private String warehouseName;
/**
* 仓库ID
*/
private Long warehouseId;
}

18
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
Unescape View File

@ -140,26 +140,19 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
List<AdvanceDetailDTO> advanceDetailDTOList = advanceDetailDTOS.stream().
filter(advanceDetailDTO -> advanceDetailDTO.getWaybillId().equals(waybillId) && advanceDetailDTO.getOrderCode().equals(orderCode)).collect(Collectors.toList());
// 对advanceDetailDTOList 按照 incomeCategoryName 进分组 并统计数量
Map<String, List<AdvanceDetailDTO>> collect = advanceDetailDTOList.stream().filter(advanceDetailDTO -> !Objects.isNull(advanceDetailDTO.getIncomeCategoryName())).collect(Collectors.groupingBy(AdvanceDetailDTO::getIncomeCategoryName));
Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId();
if(orderPackageInfoMap!=null){
StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(orderInfoId);
if(statisticsPackageFeeInfoVO!=null){
// statisticsPackageFeeInfoVO.setGoodsName(statisticsOrderInfoVO.getGoodsName());
BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO);
if(StringUtil.isNotBlank(statisticsOrderInfoVO.getGoodsName())){
// String[] split = statisticsOrderInfoVO.getGoodsName().split(",");
List<WaybillDetailByWaybillNoVo> waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillId());
StringBuffer sb = new StringBuffer();
@ -182,30 +175,21 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
}
sb.append(waybillDetailByWaybillNoVo.getNum());
if(!sb1.toString().isEmpty()){
sb1.append(",");
}
sb1.append(waybillDetailByWaybillNoVo.getPrice());
}
}
}else{
collect.keySet().forEach(s -> {
if(!sb3.toString().isEmpty()){
sb3.append(",");
}
sb3.append(s);
List<AdvanceDetailDTO> advanceDetailDTOS1 = collect.get(s);
Optional<WaybillDetailByWaybillNoVo> first = waybillDetailByWaybillNoVos.stream().filter(waybillDetailByWaybillNoVo -> waybillDetailByWaybillNoVo.getProductName().equals(s)).findFirst();
@ -230,8 +214,6 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
}
statisticsOrderInfoVO.setGoodsName(sb3.toString());
statisticsOrderInfoVO.setGoodsNum(sb.toString());
statisticsOrderInfoVO.setGoodsPrice(sb1.toString());

9
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java
Unescape View File

@ -246,14 +246,7 @@ public class WarehouseWaybillController extends BladeController {
log.info(method + "请求参数{}", waybillDTO);
try{
//当前登录人选择的仓库
List<Long> warehouseIds = new ArrayList<>();
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(!Objects.isNull(myCurrentWarehouse)){
warehouseIds.add(myCurrentWarehouse.getId());
}else{
List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
myWatchWarehouse.forEach(warehouseEntity -> warehouseIds.add(warehouseEntity.getId()));
}
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
waybillDTO.setWarehouseIds(warehouseIds);
IPage<WarehouseWaybillVO> pages = warehouseWaybillService.pageList(waybillDTO);

Write Preview
Loading…
Cancel
Save