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

1.增加查询配送单配送客户的接口 待完成

dev-warehouse
pref_mail@163.com 2 years ago
parent
3113caf4ba
commit
feb6f96bcb
8 changed files with 238 additions and 52 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. 99
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListPrintReponseVO.java
  2. 22
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListPrintRequestVO.java
  3. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java
  4. 17
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
  5. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
  6. 115
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  7. 11
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
  8. 19
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

99
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListPrintReponseVO.java
Unescape View File

@ -0,0 +1,99 @@
package com.logpm.distribution.vo;
import io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* 配送客户清单打印实体
*/
@Data
public class DistributionDeliveryListPrintReponseVO {
/**
* id
*/
private Integer id;
/**
* 配送客户单号
*/
private String reservationCode;
/**
* 商城名称
*/
private String mallName;
/**
* 门店名称
*/
private String storeName;
/**
* 订单自编号集合
*/
private String orderSelfNumberings;
/**
* 收货人
*/
private String consignee;
/**
* 收货人电话
*/
private String deliveryPhone;
/**
* 收货地址
*/
private String deliveryAddress;
/**
* 计划数量
*/
private Integer planNum;
/**
* 装车数
*/
private Integer loadCarNum;
/**
* 签收数
*/
private Integer signNum;
/**
* 回库数
*/
private Integer recycleNum;
/**
* 回库订单编号集合
*/
private Integer recycleOrderSelfNumbers;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
}

22
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListPrintRequestVO.java
Unescape View File

@ -0,0 +1,22 @@
package com.logpm.distribution.vo;
import lombok.Data;
/**
* 配送客户请求VO
*/
@Data
public class DistributionDeliveryListPrintRequestVO {
private String deliveryId;
/**
* 配送单号
*/
private String noteNumber;
/**
* 商城名称
*/
private String mallName;
}

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java
Unescape View File

@ -29,7 +29,7 @@ import org.springblade.core.launch.BladeApplication;
public class DistributionApplication {
public static void main(String[] args) {
BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME, DistributionApplication.class, args);
BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME.concat("-pref"), DistributionApplication.class, args);
}
}

17
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
Unescape View File

@ -22,8 +22,7 @@ import com.logpm.distribution.dto.DistributionDeliveryInfoDTO;
import com.logpm.distribution.dto.DistributionDeliveryListDTO;
import com.logpm.distribution.dto.DistrilbutionloadingscanDTO;
import com.logpm.distribution.service.IDistributionDeliveryInfoService;
import com.logpm.distribution.vo.DistributionDeliveryInfoVO;
import com.logpm.distribution.vo.DistributionstatisticsnmbVO;
import com.logpm.distribution.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@ -42,7 +41,6 @@ import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.distribution.entity.DistributionDeliveryListEntity;
import com.logpm.distribution.vo.DistributionDeliveryListVO;
import com.logpm.distribution.excel.DistributionDeliveryListExcel;
import com.logpm.distribution.service.IDistributionDeliveryListService;
import org.springblade.core.boot.ctrl.BladeController;
@ -259,4 +257,17 @@ public class DistributionDeliveryListController extends BladeController {
ExcelUtil.export(response, "配送管理数据" + DateUtil.time(), "配送管理数据表", list, DistributionDeliveryListExcel.class);
}
/**
* 配送客户列表
*/
@GetMapping("/customList")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "customArgs")
public R<IPage<DistributionDeliveryListPrintReponseVO>> customList(@ApiIgnore @RequestParam Map<String, Object> customArgs, Query query) {
IPage<DistributionDeliveryListPrintReponseVO> pages = distributionDeliveryListService.customListPage(Condition.getPage(query), Condition.getQueryWrapper(customArgs, DistributionDeliveryListPrintRequestVO.class));
return R.data(pages);
}
}

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
Unescape View File

@ -16,9 +16,12 @@
*/
package com.logpm.distribution.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.logpm.distribution.dto.DistributionDeliveryListDTO;
import com.logpm.distribution.dto.DistrilbutionloadingscanDTO;
import com.logpm.distribution.entity.DistributionDeliveryListEntity;
import com.logpm.distribution.vo.DistributionDeliveryListPrintReponseVO;
import com.logpm.distribution.vo.DistributionDeliveryListPrintRequestVO;
import com.logpm.distribution.vo.DistributionDeliveryListVO;
import com.logpm.distribution.excel.DistributionDeliveryListExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -88,4 +91,6 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
* @return
*/
Integer updateloadingTimeById(Long id);
List<DistributionDeliveryListPrintReponseVO> customListPage(IPage<DistributionDeliveryListPrintReponseVO> page, @Param("qw") QueryWrapper<DistributionDeliveryListPrintRequestVO> queryWrapper);
}

115
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
Unescape View File

@ -3,7 +3,8 @@
<mapper namespace="com.logpm.distribution.mapper.DistributionDeliveryListMapper">
<!-- 通用查询映射结果 -->
<resultMap id="distributionDeliveryListResultMap" type="com.logpm.distribution.entity.DistributionDeliveryListEntity">
<resultMap id="distributionDeliveryListResultMap"
type="com.logpm.distribution.entity.DistributionDeliveryListEntity">
<result column="id" property="id"/>
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
@ -52,34 +53,35 @@
<select id="selectDistributionDeliveryListPage" resultType="com.logpm.distribution.vo.DistributionDeliveryListVO">
SELECT
lddl.id id,
lddl.train_number trainNumber,
lddl.warehouse_name warehouseName,
lddl.warehouse_id warehouseId,
lddl.type type,
lddl.kind kind,
lddl.vehicle_name vehicleName,
lddl.driver_name driverName,
lddl.vehicle_id vehicleId,
lddl.driver_id driverId,
lddl.distribution_company distributionCompany,
lddl.state state,
lddl.customers_number customersNumber,
lddl.price price,
lddl.added_services_id addedServicesId,
lddl.order_number orderNumber,
lddl.delivery_number deliveryNumber,
lddl.loading_team_id loadingTeamId,
lddl.loading_team_name loadingTeamName,
lddl.reservation_id reservationId,
lddl.lead_time leadTime,
lddl.order_id orderId,
lddl.loading_time loadingTime,
lddl.note_number noteNumber,
lddl.source source,
(SELECT COALESCE(COUNT(loaded_nub), 0) FROM logpm_distribution_loadscan ldls WHERE (scan_status=2 or scan_status=3) and lddl.id = ldls.delivery_id) scannedNumber
lddl.id id,
lddl.train_number trainNumber,
lddl.warehouse_name warehouseName,
lddl.warehouse_id warehouseId,
lddl.type type,
lddl.kind kind,
lddl.vehicle_name vehicleName,
lddl.driver_name driverName,
lddl.vehicle_id vehicleId,
lddl.driver_id driverId,
lddl.distribution_company distributionCompany,
lddl.state state,
lddl.customers_number customersNumber,
lddl.price price,
lddl.added_services_id addedServicesId,
lddl.order_number orderNumber,
lddl.delivery_number deliveryNumber,
lddl.loading_team_id loadingTeamId,
lddl.loading_team_name loadingTeamName,
lddl.reservation_id reservationId,
lddl.lead_time leadTime,
lddl.order_id orderId,
lddl.loading_time loadingTime,
lddl.note_number noteNumber,
lddl.source source,
(SELECT COALESCE(COUNT(loaded_nub), 0) FROM logpm_distribution_loadscan ldls WHERE (scan_status=2 or
scan_status=3) and lddl.id = ldls.delivery_id) scannedNumber
FROM
logpm_distribution_delivery_list lddl
logpm_distribution_delivery_list lddl
<where>
<if test="param.trainNumber != null and param.trainNumber!=''">
@ -91,7 +93,7 @@
<if test="param.vehicleName != null and param.vehicleName!=''">
and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
</if>
<if test="param.driverName != null and param.driverName!=''">
<if test="param.driverName != null and param.driverName!=''">
and lddl.driver_name like concat('%',#{param.driverName},'%')
</if>
<if test="param.kind != null and param.kind!=''">
@ -107,10 +109,10 @@
and lddl.state = #{param.state}
</if>
<if test="param.createTime_query!=null and param.createTime_query!=''">
and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
</if>
<if test="param.leadTime!=null and param.leadTime!=''">
and lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
and lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
</if>
<if test="param.loadingTime!=null and param.loadingTime!=''">
and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
@ -123,7 +125,7 @@
SELECT * FROM logpm_distribution_delivery_list ${ew.customSqlSegment}
</select>
<select id="selectBycommercialNub" resultType="java.lang.Integer">
SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_delivery_list lddl
SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_delivery_list lddl
<where>
lddl.type = '1'
<if test="param.trainNumber != null and param.trainNumber!=''">
@ -148,10 +150,10 @@
and lddl.state = #{param.state}
</if>
<if test="param.createTime_query!=null and param.createTime_query!=''">
and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
</if>
<if test="param.leadTime!=null and param.leadTime!=''">
and lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
and lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
</if>
<if test="param.loadingTime!=null and param.loadingTime!=''">
and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
@ -160,10 +162,10 @@
</select>
<select id="selectcommercialTotal" resultType="java.lang.Integer">
SELECT COALESCE
( COUNT(*), 0 )
( COUNT(*), 0 )
FROM
logpm_distribution_delivery_list lddl
JOIN logpm_distribution_loadscan ldl ON lddl.id = ldl.delivery_id
logpm_distribution_delivery_list lddl
JOIN logpm_distribution_loadscan ldl ON lddl.id = ldl.delivery_id
<where>
lddl.type = '1'
<if test="param.trainNumber != null and param.trainNumber!=''">
@ -188,10 +190,10 @@
and lddl.state = #{param.state}
</if>
<if test="param.createTime_query!=null and param.createTime_query!=''">
and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
</if>
<if test="param.leadTime!=null and param.leadTime!=''">
and lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
and lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
</if>
<if test="param.loadingTime!=null and param.loadingTime!=''">
and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
@ -199,7 +201,7 @@
</where>
</select>
<select id="selectmarketNub" resultType="java.lang.Integer">
SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_delivery_list lddl
SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_delivery_list lddl
<where>
lddl.type = '2'
<if test="param.trainNumber != null and param.trainNumber!=''">
@ -225,10 +227,10 @@
and lddl.state = #{param.state}
</if>
<if test="param.createTime_query!=null and param.createTime_query!=''">
and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
</if>
<if test="param.leadTime!=null and param.leadTime!=''">
and lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
and lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
</if>
<if test="param.loadingTime!=null and param.loadingTime!=''">
and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
@ -265,10 +267,10 @@
and lddl.state = #{param.state}
</if>
<if test="param.createTime_query!=null and param.createTime_query!=''">
and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
</if>
<if test="param.leadTime!=null and param.leadTime!=''">
and lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
and lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
</if>
<if test="param.loadingTime!=null and param.loadingTime!=''">
and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
@ -276,4 +278,29 @@
</where>
</select>
<select id="customListPage" resultType="com.logpm.distribution.vo.DistributionDeliveryListPrintReponseVO">
SELECT
lds.id,
ldr.mall_name,
ldr.store_name,
CONCAT(ldr.stock_article_id) as reservationCode, -- 预约单编号
ldr.consignee, -- 收货人
ldr.delivery_phone, -- 收货人电话
ldr.delivery_address, -- 收货人地址
ldr.reservation_num, -- 计划数量
ldr.create_time,
ldr.update_time
FROM
logpm_distribution_signfor lds -- 签收
LEFT JOIN logpm_distribution_reservation AS ldr -- 预约
ON ldr.id = lds.reservation_id
WHERE
lds.delivery_id = #{qw.deliveryId}
</select>
</mapper>

11
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
Unescape View File

@ -17,9 +17,12 @@
package com.logpm.distribution.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.logpm.distribution.dto.DistributionDeliveryListDTO;
import com.logpm.distribution.dto.DistrilbutionloadingscanDTO;
import com.logpm.distribution.entity.DistributionDeliveryListEntity;
import com.logpm.distribution.vo.DistributionDeliveryListPrintReponseVO;
import com.logpm.distribution.vo.DistributionDeliveryListPrintRequestVO;
import com.logpm.distribution.vo.DistributionDeliveryListVO;
import com.logpm.distribution.excel.DistributionDeliveryListExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -100,4 +103,12 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
*库存品装车
*/
R loadinginventory(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
/**
* 配送客户列表查询
* @param page
* @param queryWrapper
* @return
*/
IPage<DistributionDeliveryListPrintReponseVO> customListPage(IPage<DistributionDeliveryListPrintReponseVO> page, QueryWrapper<DistributionDeliveryListPrintRequestVO> queryWrapper);
}

19
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -52,10 +52,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigInteger;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.concurrent.TimeUnit;
/**
@ -419,4 +416,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return null;
}
@Override
public IPage<DistributionDeliveryListPrintReponseVO> customListPage(IPage<DistributionDeliveryListPrintReponseVO> page, QueryWrapper<DistributionDeliveryListPrintRequestVO> queryWrapper) {
// 查询配送单关联的预约单
List<DistributionDeliveryListPrintReponseVO> result =distributionDeliveryListMapper.customListPage(page,queryWrapper);
// 通过对查询的预约单进行数据处理
// TODO 需要没有完成对实际装车数和 签收数据的汇总
page.setRecords(result);
return page;
}
}

Write Preview
Loading…
Cancel
Save