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

1.配送详情页面

test
0.0 2 years ago
parent
0de756578d
commit
463405ea9a
8 changed files with 232 additions and 25 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. 7
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java
  2. 20
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionstatisticsnmbVO.java
  3. 16
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java
  4. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
  5. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
  6. 14
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
  7. 156
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  8. 41
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

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

@ -42,6 +42,13 @@ public class DistributionDeliveryListVO extends DistributionDeliveryListEntity {
private Integer loadNub;
/**
* 配送总库存品数
*/
@ApiModelProperty(value = "配送总库存品数")
private Integer inventoryNub;
/**
* 包条数据
*/

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

@ -23,6 +23,11 @@ public class DistributionstatisticsnmbVO {
*/
@ApiModelProperty(value = "配送总件数")
private Integer deliveriesTotal;
/**
* 配送总库存数
*/
@ApiModelProperty(value = "配送总库存数")
private Integer dinventoryTotal;
/**
* 商配总车次
@ -30,18 +35,29 @@ public class DistributionstatisticsnmbVO {
@ApiModelProperty(value = "商配总车次")
private Integer commercialNub;
/**
* 商配总件数
* 商配总包件数
*/
@ApiModelProperty(value = "商配总件数")
private Integer commercialTotal;
/**
* 商配库存件数
*/
@ApiModelProperty(value = "商配库存件数")
private Integer cinventoryTotal;
/**
* 市配总车数
*/
@ApiModelProperty(value = "市配总车数")
private Integer marketNub;
/**
* 市配总件数
* 市配总包件数
*/
@ApiModelProperty(value = "市配总件数")
private Integer marketTotal;
/**
* 市配库存件数
*/
@ApiModelProperty(value = "市配库存件数")
private Integer minventoryTotal;
}

16
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java
Unescape View File

@ -53,7 +53,23 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
@ApiModelProperty(value = "装车客户数")
private Integer loadCusNub;
/**
* 配车状态
*/
@ApiModelProperty(value = "配车状态")
private String vehicleStatus_name;
/**
* 配送种类;1-自主配送,2-三方配送
*/
@ApiModelProperty(value = "配送类型;1-自主配送,2-三方配送")
private String kind_name;
/**
* 配送类型;1-市配,2-商配
*/
@ApiModelProperty(value = "配送种类;1-市配,2-商配")
private String type_name;
/**
* 是否备货

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
Unescape View File

@ -45,7 +45,6 @@ public class DistributionDeliveryAppController {
/**
* 配送管理 列表
*/

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

@ -168,8 +168,6 @@ public class DistributionDeliveryListController extends BladeController {
/**
* 配送管理 点击发车
*/

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

@ -187,4 +187,18 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
* @return
*/
List<DistributionLoadscaninvnVO> selectdeliverOnevnopen(Long reservationId, Long deliveryId);
/**
* 查询商配库存数
*
* @return
*/
Integer selectcinventoryTotal(@Param("param") DistributionDeliveryListDTO distributionDeliveryList);
/**
* 市配库存品件数
*
* @return
*/
Integer selectminventoryTotal(@Param("param") DistributionDeliveryListDTO distributionDeliveryList);
}

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

@ -65,14 +65,33 @@
lddl.driver_id driverId,
lddl.distribution_company distributionCompany,
lddl.state state,
lddl.customers_number customersNumber,
(SELECT GROUP_CONCAT(DISTINCT ldsu.forklift_name SEPARATOR ',') FROM
logpm_distribution_signfor lds
join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
join logpm_distribution_stockup_info ldsi on ldr.id = ldsi.reservation_id
join logpm_distribution_stockup ldsu on ldsu.id = ldsi.stockup_id
WHERE lds.delivery_id = lddl.id
) forkliftName,
lddl.create_time createTime,
(SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_signfor lds WHERE lds.delivery_id =lddl.id) customersNumber,
lddl.price price,
lddl.added_services_id addedServicesId,
lddl.order_number orderNumber,
lddl.delivery_number deliveryNumber,
(SELECT COALESCE (COUNT(*) ,0)
FROM
logpm_distribution_signfor lds
join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
join logpm_distribution_reservation_stockarticle ldrs on ldrs.reservation_id =ldr.id
WHERE lds.delivery_id = lddl.id
) orderNumber,
(SELECT COALESCE (sum(ldr.reservation_num) ,0)
FROM
logpm_distribution_signfor lds
join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
WHERE lds.delivery_id = lddl.id
) deliveryNumber,
lddl.loading_team_id loadingTeamId,
lddl.loading_team_name loadingTeamName,
lddl.reservation_id reservationId,
(SELECT GROUP_CONCAT( lds.reservation_id SEPARATOR ',') from logpm_distribution_signfor lds WHERE lds.delivery_id = lddl.id) reservationId,
lddl.lead_time leadTime,
lddl.order_id orderId,
lddl.fee fee,
@ -80,12 +99,18 @@
lddl.loading_time loadingTime,
lddl.note_number noteNumber,
lddl.source source,
lddl.vehicle_name vehicleName,
(SELECT COALESCE (sum(ldr.reservation_stock_list_num) ,0)
FROM
logpm_distribution_signfor lds
join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
WHERE lds.delivery_id = lddl.id) inventoryNub,
(SELECT COALESCE(sum(lds.loaded_number), 0) FROM logpm_distribution_signfor lds WHERE
lddl.id = lds.delivery_list_id) scannedNumber
lddl.id = lds.delivery_id) scannedNumber
FROM
logpm_distribution_delivery_list lddl
<where>
lddl.is_deleted = 0
<if test="param.trainNumber != null and param.trainNumber!=''">
and lddl.train_number like concat('%',#{param.trainNumber},'%')
</if>
@ -181,9 +206,10 @@
</where>
</select>
<select id="selectcommercialTotal" resultType="java.lang.Integer">
SELECT COALESCE (sum(lddl.delivery_number) ,0)
SELECT COALESCE (sum(ldr.reservation_num) ,0)
FROM
logpm_distribution_delivery_list lddl
logpm_distribution_delivery_list lddl join logpm_distribution_signfor lds on lddl.id = lds.delivery_id
join logpm_distribution_reservation ldr on lddl.reservation_id =ldr.id
<where>
lddl.type = '1'
<if test="param.trainNumber != null and param.trainNumber!=''">
@ -529,23 +555,49 @@
lddl.driver_id driverId,
lddl.distribution_company distributionCompany,
lddl.state state,
lddl.customers_number customersNumber,
(SELECT GROUP_CONCAT(DISTINCT ldsu.forklift_name SEPARATOR ',') FROM
logpm_distribution_signfor lds
join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
join logpm_distribution_stockup_info ldsi on ldr.id = ldsi.reservation_id
join logpm_distribution_stockup ldsu on ldsu.id = ldsi.stockup_id
WHERE lds.delivery_id = lddl.id
) forkliftName,
lddl.create_time createTime,
(SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_signfor lds WHERE lds.delivery_id =lddl.id) customersNumber,
lddl.price price,
lddl.added_services_id addedServicesId,
lddl.order_number orderNumber,
lddl.delivery_number deliveryNumber,
(SELECT COALESCE (COUNT(*) ,0)
FROM
logpm_distribution_signfor lds
join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
join logpm_distribution_reservation_stockarticle ldrs on ldrs.reservation_id =ldr.id
WHERE lds.delivery_id = lddl.id
) orderNumber,
(SELECT COALESCE (sum(ldr.reservation_num) ,0)
FROM
logpm_distribution_signfor lds
join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
WHERE lds.delivery_id = lddl.id
) deliveryNumber,
lddl.loading_team_id loadingTeamId,
lddl.loading_team_name loadingTeamName,
lddl.reservation_id reservationId,
(SELECT GROUP_CONCAT( lds.reservation_id SEPARATOR ',') from logpm_distribution_signfor lds WHERE lds.delivery_id = lddl.id) reservationId,
lddl.lead_time leadTime,
lddl.order_id orderId,
lddl.fee fee,
lddl.task_time taskTime,
lddl.loading_time loadingTime,
lddl.note_number noteNumber,
lddl.source source,
lddl.vehicle_name vehicleName,
lddl.task_time taskTime,
(SELECT COALESCE (sum(ldr.reservation_stock_list_num) ,0)
FROM
logpm_distribution_signfor lds
join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
WHERE lds.delivery_id = lddl.id) inventoryNub,
(SELECT COALESCE(sum(lds.loaded_number), 0) FROM logpm_distribution_signfor lds WHERE
lddl.id = lds.delivery_list_id) scannedNumber
lddl.id = lds.delivery_id) scannedNumber
FROM
logpm_distribution_delivery_list lddl
<where>
@ -570,5 +622,83 @@
lddl.id = #{id}
</select>
<select id="selectcinventoryTotal" resultType="java.lang.Integer">
SELECT COALESCE (sum(ldr.reservation_stock_list_num) ,0)
FROM
logpm_distribution_delivery_list lddl join logpm_distribution_signfor lds on lddl.id = lds.delivery_id
join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
<where>
lddl.type = '1'
<if test="param.trainNumber != null and param.trainNumber!=''">
and lddl.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.warehouseName != null and param.warehouseName!=''">
and lddl.warehouse_name like concat('%',#{param.warehouseName},'%')
</if>
<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!=''">
and lddl.driver_name like concat('%',#{param.driverName},'%')
</if>
<if test="param.kind != null and param.kind!=''">
and lddl.kind = #{param.kind}
</if>
<if test="param.distributionCompany != null and param.distributionCompany!=''">
and lddl.distribution_company = #{param.distributionCompany}
</if>
<if test="param.state != null and param.state!=''">
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%')
</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%')
</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%')
</if>
</where>
</select>
<select id="selectminventoryTotal" resultType="java.lang.Integer">
SELECT COALESCE (sum(ldr.reservation_stock_list_num) ,0)
FROM
logpm_distribution_delivery_list lddl join logpm_distribution_signfor lds on lddl.id = lds.delivery_id
join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
<where>
lddl.type = '2'
<if test="param.trainNumber != null and param.trainNumber!=''">
and lddl.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.warehouseName != null and param.warehouseName!=''">
and lddl.warehouse_name like concat('%',#{param.warehouseName},'%')
</if>
<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!=''">
and lddl.driver_name like concat('%',#{param.driverName},'%')
</if>
<if test="param.kind != null and param.kind!=''">
and lddl.kind = #{param.kind}
</if>
<if test="param.distributionCompany != null and param.distributionCompany!=''">
and lddl.distribution_company = #{param.distributionCompany}
</if>
<if test="param.state != null and param.state!=''">
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%')
</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%')
</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%')
</if>
</where>
</select>
</mapper>

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

@ -40,6 +40,7 @@ import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.feign.IDictBizClient;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@ -79,6 +80,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
private final DistributionStockupMapper distributionStockupMapper;
private final BladeRedis bladeRedis;
private final IDistributionAsyncService distributionAsyncService;
private final IDictBizClient dictBizClient;
@Override
public IPage<DistributionDeliveryListVO> selectDistributionDeliveryListPage(IPage<DistributionDeliveryListVO> page, DistributionDeliveryListDTO distributionDeliveryList) {
@ -110,8 +112,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//List<DistributionDeliveryInfoVO> stripList = distributionDeliveryInfoMapper.selectStripList(detail.getId());
//distributionDeliveryListVO.setPackadeList(stripList);
//装车件数
Integer sum = distributionSignforMapper.selectloadNub(distributionDeliveryListVO.getId());
distributionDeliveryListVO.setLoadNub(sum);
//Integer sum = distributionSignforMapper.selectloadNub(distributionDeliveryListVO.getId());
// distributionDeliveryListVO.setLoadNub(sum);
// if (detail.getSource() == 1) {
//查询客户信息
List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId());
@ -136,23 +138,32 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//商配车次
Integer a = baseMapper.selectBycommercialNub(distributionDeliveryList);
Integer commercialNub = a != null ? a : 0;
//商配件数
//商配包件数
Integer b = baseMapper.selectcommercialTotal(distributionDeliveryList);
Integer commercialTotal = b != null ? b : 0;
//商配库存品件数
Integer e = baseMapper.selectcinventoryTotal(distributionDeliveryList);
Integer cinventoryTotal = e != null ? e : 0;
//市配车次
Integer c = baseMapper.selectmarketNub(distributionDeliveryList);
Integer marketNub = c != null ? c : 0;
//市配件数
Integer d = baseMapper.selectmarketTotal(distributionDeliveryList);
Integer marketTotal = d != null ? d : 0;
//市配库存品件数
Integer f = baseMapper.selectminventoryTotal(distributionDeliveryList);
Integer minventoryTotal = f != null ? f : 0;
//配送总车次
distributionstatisticsnmbVO.setVehiclesNub(commercialNub + marketNub);
//配送总件数
distributionstatisticsnmbVO.setDeliveriesTotal(commercialTotal + marketTotal);
distributionstatisticsnmbVO.setDinventoryTotal(cinventoryTotal+minventoryTotal);
distributionstatisticsnmbVO.setCommercialNub(commercialNub);
distributionstatisticsnmbVO.setCommercialTotal(commercialTotal);
distributionstatisticsnmbVO.setMarketNub(marketNub);
distributionstatisticsnmbVO.setMarketTotal(marketTotal);
distributionstatisticsnmbVO.setCinventoryTotal(cinventoryTotal);
distributionstatisticsnmbVO.setMinventoryTotal(minventoryTotal);
return distributionstatisticsnmbVO;
}
@ -973,10 +984,26 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
BladeUser user = AuthUtil.getUser();
String roleId = user.getRoleId();
List<DistributionAppDeliveryListVO> distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryListPage(page, distributionAppDeliveryListDTO);
//查询是否备货
// for (DistributionAppDeliveryListVO distributionAppDeliveryListVO : distributionAppDeliveryListVOS) {
//
// }
//转换字典字段
for (DistributionAppDeliveryListVO distributionAppDeliveryListVO : distributionAppDeliveryListVOS) {
R<String> distribution_type = dictBizClient.getValue("distribution_type", distributionAppDeliveryListVO.getType() );
distributionAppDeliveryListVO.setType_name(dictBizClient.getValue("distribution_type", distributionAppDeliveryListVO.getType() ).getData());
//查询是否配车
Integer aLong = 0;
Integer aLong2 = 0;
distributionAppDeliveryListVO.setVehicleStatus_name("已配车");
if (distributionAppDeliveryListVO.getKind().equals("1")){
aLong = distributionDeliverySelfMapper.selectCount(new QueryWrapper<DistributionDeliverySelfEntity>().lambda()
.eq(DistributionDeliverySelfEntity::getDeliveryId, distributionAppDeliveryListVO.getId())
).intValue();
}else {
aLong2=distributionDeliveryTripartiteMapper.selectCount(new QueryWrapper<DistributionDeliveryTripartiteEntity>().lambda()
.eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distributionAppDeliveryListVO.getId())).intValue();
}
if (aLong ==0 && aLong2 ==0){distributionAppDeliveryListVO.setVehicleStatus_name("未配车");}
//查询是否备货
}
return page.setRecords(distributionAppDeliveryListVOS);
}

Write Preview
Loading…
Cancel
Save