Browse Source

Merge branch 'pre-production' into master

master
zhaoqiaobo 7 months ago
parent
commit
ed30fd50ba
  1. 4
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java
  2. 121
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleReadingFriendlyExcel.java
  3. 3
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java
  4. 6
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml
  5. 3
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehicleService.java
  6. 14
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java
  7. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
  8. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java
  9. 29
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  10. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java
  11. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/SplitPackageOrderVO.java
  12. 2
      blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java

4
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java

@ -210,8 +210,8 @@ public class BasicdataVehicleController extends BladeController {
@ApiOperation(value = "导出数据", notes = "传入basicdataVehicle")
public void exportBasicdataVehicle(@ApiIgnore @RequestParam String ids, HttpServletResponse response) {
List<BasicdataVehicleExcel> list = basicdataVehicleService.exportBasicdataVehicle(ids);
ExcelUtil.export(response, "车辆信息表数据" + DateUtil.time(), "车辆信息表数据表", list, BasicdataVehicleExcel.class);
List<BasicdataVehicleReadingFriendlyExcel> list = basicdataVehicleService.exportBasicdataVehicle(ids);
ExcelUtil.export(response, "车辆信息表数据" + DateUtil.time(), "车辆信息表数据表", list, BasicdataVehicleReadingFriendlyExcel.class);
}

121
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataVehicleReadingFriendlyExcel.java

@ -0,0 +1,121 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package com.logpm.basicdata.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
import org.springblade.system.cache.DictBizCache;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 车辆信息表 Excel实体类
*
* @author lmy
* @since 2023-05-16
*/
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BasicdataVehicleReadingFriendlyExcel extends BasicdataVehicleExcel implements Serializable {
private static final long serialVersionUID = 1L;
// // 车辆来源
// getDictionaryBiz('basic_vehicle_source').then(res => handleData('车辆来源', res)),
// // 是否车头
// getDictionaryBiz('yes_no').then(res => handleData('是否车头', res)),
// // 挂车类型
// getDictionaryBiz('basic_trailer_type').then(res => handleData('挂车类型', res)),
// // 车辆类型
// getDictionaryBiz('basic_vehicle_model').then(res => handleData('车辆类型', res)),
// // 车厢类型
// getDictionaryBiz('basic_car_type').then(res => handleData('车厢类型', res)),
// // 付款方式
// getDictionaryBiz('basicdata_vehicle_paymentmethod').then(res => handleData('付款方式', res)),
// // 车牌颜色
// getDictionaryBiz('basic_plate_color').then(res => handleData('车牌颜色', res)),
// // 车身颜色
// getDictionaryBiz('basic_vehicle_color').then(res => handleData('车身颜色', res)),
// // 能源类型
// getDictionaryBiz('basic_energy_type').then(res => handleData('能源类型', res)),
// // 车牌类型
// getDictionaryBiz('basic_plate_type').then(res => handleData('车牌类型', res)),
@Override
public String getVehicleSource() {
return DictBizCache.getValue("basic_vehicle_source", super.getVehicleSource());
}
@Override
public String getIsHead() {
return DictBizCache.getValue("yes_no", super.getIsHead());
}
@Override
public String getTrailerType() {
return DictBizCache.getValue("basic_trailer_type", super.getTrailerType());
}
@Override
public String getVehicleModel() {
return DictBizCache.getValue("basic_vehicle_model", super.getVehicleModel());
}
@Override
public String getCarType() {
return DictBizCache.getValue("basic_car_type", super.getCarType());
}
@Override
public String getPaymentMethod() {
return DictBizCache.getValue("basicdata_vehicle_paymentmethod", super.getPaymentMethod());
}
@Override
public String getLicensePlateColor() {
return DictBizCache.getValue("basic_plate_color", super.getLicensePlateColor());
}
@Override
public String getVehicleColor() {
return DictBizCache.getValue("basic_vehicle_color", super.getVehicleColor());
}
@Override
public String getEnergyType() {
return DictBizCache.getValue("basic_energy_type", super.getEnergyType());
}
@Override
public String getLicensePlateType() {
return DictBizCache.getValue("basic_plate_type", super.getLicensePlateType());
}
@Override
public String getWithGps() {
return DictBizCache.getValue("yes_no", super.getWithGps());
}
}

3
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java

@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.basicdata.dto.BasicdataVehicleDTO;
import com.logpm.basicdata.entity.BasicdataVehicleEntity;
import com.logpm.basicdata.excel.BasicdataVehicleExcel;
import com.logpm.basicdata.excel.BasicdataVehicleReadingFriendlyExcel;
import com.logpm.basicdata.vo.BasicdataVehicleVO;
import org.apache.ibatis.annotations.Param;
@ -51,7 +52,7 @@ public interface BasicdataVehicleMapper extends BaseMapper<BasicdataVehicleEntit
* @param queryWrapper
* @return
*/
List<BasicdataVehicleExcel> exportBasicdataVehicle(@Param("ids") List<Long> ids);
List<BasicdataVehicleReadingFriendlyExcel> exportBasicdataVehicle(@Param("ids") List<Long> ids);
List<String> selectPhotoBymasterId(Long id);
/**

6
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml

@ -158,7 +158,7 @@
</select>
<select id="exportBasicdataVehicle" resultType="com.logpm.basicdata.excel.BasicdataVehicleExcel">
<select id="exportBasicdataVehicle" resultType="com.logpm.basicdata.excel.BasicdataVehicleReadingFriendlyExcel">
SELECT
lbc.vehicle_nub AS vehicleNub,
lbc.vehicle_source AS vehicleSource,
@ -215,9 +215,9 @@
LEFT JOIN logpm_basicdata_drivermiddle AS lbd ON lbc.id = lbd.brand_id
LEFT JOIN logpm_basicdata_driver_artery AS lbda ON lbd.driver_id = lbda.id
<where>
is_deleted = 0
lbc.is_deleted = 0
<if test="ids != null and ids != ''">
and id in
and lbc.id in
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>

3
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataVehicleService.java

@ -22,6 +22,7 @@ import com.logpm.basicdata.dto.BasicdataVehicleDTO;
import com.logpm.basicdata.entity.BasicdataVehicleEntity;
import com.logpm.basicdata.excel.BasicdataVehicleExcel;
import com.logpm.basicdata.excel.BasicdataVehicleImportExcel;
import com.logpm.basicdata.excel.BasicdataVehicleReadingFriendlyExcel;
import com.logpm.basicdata.vo.BasicdataVehicleVO;
import org.springblade.core.mp.base.BaseService;
@ -50,7 +51,7 @@ public interface IBasicdataVehicleService extends BaseService<BasicdataVehicleEn
* @param ids
* @return
*/
List<BasicdataVehicleExcel> exportBasicdataVehicle(String ids);
List<BasicdataVehicleReadingFriendlyExcel> exportBasicdataVehicle(String ids);
/**
* 查询历史照片
*

14
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java

@ -32,11 +32,13 @@ import com.logpm.basicdata.entity.BasicdataDrivermiddleEntity;
import com.logpm.basicdata.entity.BasicdataVehicleEntity;
import com.logpm.basicdata.excel.BasicdataVehicleExcel;
import com.logpm.basicdata.excel.BasicdataVehicleImportExcel;
import com.logpm.basicdata.excel.BasicdataVehicleReadingFriendlyExcel;
import com.logpm.basicdata.mapper.BasicdataDriverArteryMapper;
import com.logpm.basicdata.mapper.BasicdataDrivermiddleMapper;
import com.logpm.basicdata.mapper.BasicdataVehicleMapper;
import com.logpm.basicdata.service.IBasicdataCarrierService;
import com.logpm.basicdata.service.IBasicdataVehicleService;
import com.logpm.basicdata.vo.BasicdataCarrierVO;
import com.logpm.basicdata.vo.BasicdataVehicleVO;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -80,9 +82,15 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
@Override
public List<BasicdataVehicleExcel> exportBasicdataVehicle(String ids) {
List<BasicdataVehicleExcel> basicdataVehicleList = baseMapper.exportBasicdataVehicle(Func.toLongList(ids));
public List<BasicdataVehicleReadingFriendlyExcel> exportBasicdataVehicle(String ids) {
List<BasicdataVehicleReadingFriendlyExcel> basicdataVehicleList = baseMapper.exportBasicdataVehicle(ids.isEmpty() ? null : Func.toLongList(ids));
// List<BasicdataCarrierVO> basicdataCarrierVOS = basicdataCarrierService.selectBasicdataCarrierDictionary();
// Map<Long, String> carrierMap = basicdataCarrierVOS.stream().collect(Collectors.toMap(BasicdataCarrierVO::getId, BasicdataCarrierVO::getCarrierName));
//
// basicdataVehicleList.stream().map(basicdataVehicleReadingFriendlyExcel -> {
// basicdataVehicleReadingFriendlyExcel.setCarrierName(carrierMap.get(basicdataVehicleReadingFriendlyExcel.getCarrierId()));
// });
return basicdataVehicleList;
}

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@ -77,7 +77,7 @@
SET ldrzp.quantity = ( ldrzp.quantity - #{retentionQuantity})
WHERE
ldrzp.zero_package_status != 2
AND #{retentionQuantity} !=0
AND #{retentionQuantity} != 0
AND ldrzp.reservation_id = #{reservationId}
AND parcel_list_id = #{orderPackageId}
</update>
@ -86,9 +86,9 @@
id=#{orderPackageId} and is_deleted = 0
</update>
<update id="updatePackageDeliveryStatus">
UPDATE logpm_distribution_reservation_package SET packet_bar_status = 2 ,cancel_status = 1
UPDATE logpm_distribution_reservation_package SET packet_bar_status = 2 ,cancel_status = 1,cancel_remark = '差异数据'
WHERE
reservation_id = #{reservationId} and parce_list_id in
reservation_id = #{reservationId} AND is_deleted = 0 AND parce_list_id in
<foreach collection="packageIds" item="id" open="(" close=")" separator=",">
#{id}
</foreach>

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java

@ -182,7 +182,6 @@ public class DistributionReservationPackageServiceImpl extends BaseServiceImpl<D
//执行计划的包件取消
List<JSONObject> aaa = new ArrayList<>();
DistributionReservationPackageEntity distributionReservationPackageEntity = packageEntityList.get(0);
distributionReservationPackageEntity.setCancelStatus(1);
distributionReservationPackageEntity.setCancelRemark(AuthUtil.getNickName()+"进行配车计划取消订制品");
distributionReservationPackageEntity.setPacketBarStatus(ReservationPackageStatusConstant.quxiao.getValue());
this.updateById(distributionReservationPackageEntity);

29
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@ -6078,17 +6078,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
log.error("##########配送计划异常:{}", deliveryListEntity);
return Resp.scanFail("服务器正忙...", "服务器正忙");
}
Integer loadingNumber = 0;
Integer signingNumber = 0;
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
// DistributionDeliverySelfEntity finalDistributionDeliverySelfEntity = distributionDeliverySelfEntity;
List<String> orderCodes = new ArrayList<>();
BladeUser user = AuthUtil.getUser();
DistributionSignforEntity signforEntity = distributionSignforMapper.selectOne(Wrappers.<DistributionSignforEntity>query().lambda()
.eq(DistributionSignforEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
.eq(DistributionSignforEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()));
//查询零担装车
Integer loadedNumber = signforEntity.getLoadedNumber();
Integer receivedQuantity = signforEntity.getReceivedQuantity();
if (!parcelNumberDTOS.isEmpty()) {
List<Long> packageIds = parcelNumberDTOS.stream().map(DistributionParcelNumberDTO::getParcelListId).collect(Collectors.toList());
List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
@ -6099,9 +6098,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
Map<Long, List<DistributionLoadscanEntity>> loadingMap = null;
Map<Long, List<DistributionReservationZeroPackageEntity>> reservationMap = null;
if (!loadscanEntityList.isEmpty()) {
loadingNumber = signforEntity.getLoadedNumber() - loadscanEntityList.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum();
signingNumber = signforEntity.getReceivedQuantity() - loadscanEntityList.stream().mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum();
int sum1 = loadscanEntityList.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum();
int sum2 = loadscanEntityList.stream().mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum();
loadedNumber = loadedNumber - sum1;
receivedQuantity = receivedQuantity - sum2;
loadingMap = loadscanEntityList.stream().collect(Collectors.groupingBy(DistributionLoadscanEntity::getPackageId));
}
//查询对应的计划品类
@ -6112,7 +6114,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (!reservationZeroPackageEntity.isEmpty()) {
reservationMap = reservationZeroPackageEntity.stream().collect(Collectors.groupingBy(DistributionReservationZeroPackageEntity::getParcelListId));
}
int sum = parcelNumberDTOS.stream().mapToInt(DistributionParcelNumberDTO::getSigningNum).sum();
List<JSONObject> jsonObjects = new ArrayList<>();
for (DistributionParcelNumberDTO parcelNumberDTO : parcelNumberDTOS) {
List<DistributionReservationZeroPackageEntity> zeroPackageEntities = reservationMap.get(parcelNumberDTO.getParcelListId());
@ -6160,8 +6161,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
distributionLoadscanEntity.setSigningUser(user.getNickName());
loadingNumber += distributionLoadscanEntity.getLoadedNub() + signforEntity.getLoadedNumber();
signingNumber += distributionLoadscanEntity.getReceivedQuantity() + signforEntity.getReceivedQuantity();
loadedNumber += parcelNumberDTO.getSigningNum() ;
receivedQuantity += parcelNumberDTO.getSigningNum() ;
//进行签收数量的统计
distributionLoadscanService.updateById(distributionLoadscanEntity);
JSONObject jsonObject = new JSONObject();
@ -6218,8 +6219,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscanEntity.setOneQclick(2);
loadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
distributionLoadscanService.save(loadscanEntity);
loadingNumber += loadscanEntity.getLoadedNub();
signingNumber += loadscanEntity.getReceivedQuantity();
loadedNumber += loadscanEntity.getLoadedNub();
receivedQuantity += loadscanEntity.getReceivedQuantity();
//维护零担品类信息
deliveryNumber = distributionParcelNumberEntity.getDeliveryQuantity() - parcelNumberDTO.getSigningNum();
handQuantity = distributionParcelNumberEntity.getHandQuantity() - parcelNumberDTO.getSigningNum();
@ -6242,7 +6243,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (handQuantity == 0) {
parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
}
if (signingNumber.equals(distributionParcelNumberEntity.getQuantity())) {
if (receivedQuantity.equals(distributionParcelNumberEntity.getQuantity())) {
parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
}
distributionParcelListService.updateById(parcelListEntity);
@ -6259,8 +6260,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
}
}
signforEntity.setLoadedNumber(loadingNumber);
signforEntity.setReceivedQuantity(signingNumber);
signforEntity.setLoadedNumber(loadedNumber);
signforEntity.setReceivedQuantity(receivedQuantity);
distributionSignforMapper.updateById(signforEntity);
if (!packageLockIds.isEmpty()) {
List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:");

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java

@ -891,6 +891,7 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl<Distr
splitPackageOrderVO.setMateriel(distributionParcelListEntity.getMaterialName());
splitPackageOrderVO.setOrderCode(distributionParcelListEntity.getOrderCode());
splitPackageOrderVO.setCategory(distributionParcelListEntity.getThirdProduct());
splitPackageOrderVO.setMaterielNo(distributionParcelListEntity.getMaterialCode());
return splitPackageOrderVO;
}).collect(Collectors.toList());
@ -918,6 +919,7 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl<Distr
splitPackageOrderVO.setMateriel(distributionParcelListEntity.getMaterialName());
splitPackageOrderVO.setOrderCode(distributionParcelListEntity.getOrderCode());
splitPackageOrderVO.setCategory(distributionParcelListEntity.getThirdProduct());
splitPackageOrderVO.setMaterielNo(distributionParcelListEntity.getMaterialCode());
return splitPackageOrderVO;
}).collect(Collectors.toList());
}

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/SplitPackageOrderVO.java

@ -9,6 +9,7 @@ import lombok.Data;
public class SplitPackageOrderVO {
private String orderCode;
private String packageCode;
private String materielNo;
private String materiel;
private String category;
}

2
blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java

@ -184,7 +184,7 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
List<ExportIndicatorsVO> list = baseMapper.selectExportList(indicatorsDTO);
for (ExportIndicatorsVO exportIndicatorsVO : list) {
Long deptId = exportIndicatorsVO.getCreateDept();
Long deptId = exportIndicatorsVO.getExamineDeptId();
String deptName = deptClient.findNameById(deptId);
exportIndicatorsVO.setCreateDeptName(deptName);
Long createUser = exportIndicatorsVO.getCreateUser();

Loading…
Cancel
Save