Browse Source

Merge branch 'dev' into pre-production

master
汤建军 1 year ago
parent
commit
cecbf19a37
  1. 24
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java
  2. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforOwnExcel.java
  3. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
  4. 83
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
  5. 16
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  6. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
  7. 25
      blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java
  8. 55
      blade-service/logpm-report/src/main/java/com/logpm/report/excel/BillLoadingReportExcel.java
  9. 7
      blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportBillLoadingAsyncService.java
  10. 19
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java

24
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java

@ -97,6 +97,30 @@ public class DistributionSignforVO extends DistributionSignforEntity {
@ApiModelProperty(value = "装车件数")
private Integer loadingNum;
/**
* 包件装车件数
*/
@ApiModelProperty(value = "包件装车件数")
private Integer packageLoadingNum;
/**
* 库存品装车件数
*/
@ApiModelProperty(value = "库存品装车件数")
private Integer inventoryLoadingNum;
/**
* 库存品签收数
*/
@ApiModelProperty(value = "库存品签收数")
private Integer inventorySigningNum;
/**
* 包件签收件数
*/
@ApiModelProperty(value = "包件签收件数")
private Integer packageSigningNum;
/**
* 未装车件数
*/

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforOwnExcel.java

@ -176,7 +176,7 @@ public class DistributionSignforOwnExcel implements Serializable {
@ApiModelProperty(value = "装车未扫数")
@ColumnWidth(20)
@ExcelProperty("装车未扫数")
private String withoutScanning;
private Integer withoutScanning;
/**
* 未签收数目
@ -184,7 +184,7 @@ public class DistributionSignforOwnExcel implements Serializable {
@ApiModelProperty(value = "未签收数目")
@ColumnWidth(20)
@ExcelProperty("未签收数目")
private String unsigneds;
private Integer unsigneds;

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java

@ -25,6 +25,7 @@ import com.logpm.distribution.entity.DistributionParcelListEntity;
import com.logpm.distribution.entity.DistributionReservationEntity;
import com.logpm.distribution.entity.DistributionSignforEntity;
import com.logpm.distribution.excel.DistributionSignforExcel;
import com.logpm.distribution.excel.DistributionSignforOwnExcel;
import com.logpm.distribution.vo.*;
import com.logpm.distribution.vo.app.*;
import com.logpm.oldproject.dto.SignPushDataUnitDTO;

83
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@ -1043,46 +1043,58 @@
lddl.vehicle_name AS vehicleName,
lddl.task_time AS taskTime,
lddl.loading_time AS loadingTime,
IF(ldr.reservation_num > 0,GROUP_CONCAT(ldsa.order_code),'') AS orderCode,
lds.signee_name AS signeeName,
ldr.warehouse_id AS warehouseId,
<!-- ldr.warehouse_id AS warehouseId,-->
ldr.consignee AS consigne,
ldr.delivery_phone AS driverPhone,
ldr.delivery_address AS deliveryAddress,
ldr.warehouse_name AS warehouseName,
GROUP_CONCAT(ldsa.order_code) AS orderCode,
CASE
ldr.delivery_type
WHEN 1 THEN
'商配'
WHEN 2 THEN
'市配'
WHEN 3 THEN
'自提'
END AS deliveryTypeName,
ldr.consignee AS consignee,
ldr.delivery_phone AS deliveryPhone,
ldr.delivery_address AS deliveryAddress,
CASE ldr.delivery_type
WHEN 1 THEN '商配'
WHEN 2 THEN '市配'
WHEN 3 THEN '自提'
END deliveryTypeName,
(ldr.reservation_num + ldr.reservation_stock_list_num ) AS totalNum,
(COUNT(ldl.id) + COUNT(ldll.id) ) AS loadingNum,
lds.received_quantity AS signingNum,
((ldr.reservation_num + ldr.reservation_stock_list_num ) - (COUNT(ldl.id) + COUNT(ldll.id) )) AS unLoadingNum,
((ldr.reservation_num + ldr.reservation_stock_list_num ) - lds.received_quantity) AS unsigneds,
ldr.reservation_num + ldr.reservation_stock_list_num AS totalNum,
lds.loaded_number AS packageLoadingNum,
lds.loadedin_number AS inventoryLoadingNum,
lds.received_quantity AS packageSigningNum,
lds.receivedin_quantity AS inventorySigningNum,
lds.signing_time AS signingTime,
lds.sjsigning_time AS sjsigningTime,
lds.signee_name AS signeeName,
lds.examine_user_name AS examineUserName,
CASE lddl.delivery_status
WHEN 1 THEN '待配送'
WHEN 2 THEN '配送中'
WHEN 3 THEN '已完成'
END deliveryStatusName,
CASE lds.signing_status
WHEN 1 THEN '文员待审核'
WHEN 2 THEN '文员已审核'
END signingStatusName,
IF(lddl.kind = 1,ldds.driver_phone,lddt.driver_phone) AS driverPhone
CASE
lddl.delivery_status
WHEN 1 THEN
'待配送'
WHEN 2 THEN
'配送中'
WHEN 3 THEN
'已完成'
END AS deliveryStatusName,
CASE
lds.signing_status
WHEN 1 THEN
'文员待审核'
WHEN 2 THEN
'文员已审核'
END AS signingStatusName,
IF
( lddl.kind = 1, ldds.driver_phone, lddt.driver_phone ) AS deliveryPhone
FROM
logpm_distribution_signfor lds
JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldr.id = ldrs.reservation_id
LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldrs.stock_article_id
LEFT JOIN logpm_distribution_loadscan AS ldl ON ldr.id = ldl.reservation_id AND ldl.delivery_id = ldl.delivery_id
LEFT JOIN logpm_distribution_loadscaninvn AS ldll ON ldr.id = ldll.reservation_id AND ldll.delivery_id = ldl.delivery_id
LEFT JOIN logpm_distribution_delivery_self AS ldds ON ldds.delivery_id = lddl.id AND ldds.is_master = 2
LEFT JOIN logpm_distribution_delivery_tripartite AS lddt ON lddt.delivery_id = lddl.id
left JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
left JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
LEFT JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id
LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldrs.stock_article_id
LEFT JOIN logpm_distribution_delivery_self ldds ON ldds.delivery_id = lddl.id
AND ldds.is_master = 2
LEFT JOIN logpm_distribution_delivery_tripartite lddt ON lddt.delivery_id = lddl.id
<where>
lds.is_deleted = 0
<if test="param.mallName != null and param.mallName!=''">
@ -1140,7 +1152,12 @@
<if test="param.signingStatus != null and param.signingStatus!=''">
and lds.signing_status = #{param.signingStatus}
</if>
<if test="param.warehouseId != null and param.warehouseId!=''">
and ldr.warehouse_id = #{param.warehouseId} AND lddl.warehouse_id =#{param.warehouseId}
</if>
</where>
GROUP BY
ldr.id
</select>
<select id="selectPushOldPackage" resultType="com.logpm.oldproject.dto.SignPushDataUnitDTO">
SELECT

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

@ -1433,6 +1433,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (ObjectUtils.isNotNull(o)) {
distributionSignfor.remove("ids");
}
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if (Func.isNotEmpty(myCurrentWarehouse)){
distributionSignfor.put("warehouseId",myCurrentWarehouse.getId());
}
DistributionSignforVO distributionSignforVO = JSON.parseObject(JSON.toJSONString(distributionSignfor), DistributionSignforVO.class);
if (ObjectUtils.isNotNull(o)) {
@ -1450,15 +1454,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
signforExcel.setDeliveryDriverPhone(d.getDriverPhone());
signforExcel.setDeliveryDriverName(d.getDriverName());
signforExcel.setReservationNum(d.getTotalNum());
signforExcel.setLoadedNumber(d.getLoadingNum());
signforExcel.setReceivedQuantity(d.getSigningNum());
signforExcel.setWithoutScanning(d.getUnLoadingNum());
signforExcel.setUnsigneds(d.getUnsigneds());
signforExcel.setLoadedNumber(d.getPackageLoadingNum() + d.getInventoryLoadingNum());
signforExcel.setReceivedQuantity(d.getPackageSigningNum()+d.getInventorySigningNum());
signforExcel.setDeliveryStatusName(d.getDeliveryStatusName());
signforExcel.setDeliveryPhone(d.getDeliveryPhone());
//查询仓库
BasicdataWarehouseEntity entityWarehouseId = basicdataWarehouseClient.getEntityWarehouseId(d.getWarehouseId());
signforExcel.setWarehouseName(entityWarehouseId.getName());;
signforExcel.setWithoutScanning(d.getTotalNum() - (d.getPackageLoadingNum() + d.getInventoryLoadingNum()));
signforExcel.setUnsigneds(d.getTotalNum() - (d.getPackageSigningNum()+d.getInventorySigningNum()));
signforExcel.setConsignee(d.getConsignee());
list.add(signforExcel);
});
return list;

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java

@ -242,7 +242,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
basicMaterialEntity.setProductCode(distributionStockListDTO.getCargoNumber());
basicMaterialEntity.setPackingSpecification(distributionStockListDTO.getCargoNorms());
basicMaterialEntity.setSku(distributionStockListDTO.getSku());
basicMaterialEntity.setPackageNum(distributionStockListDTO.getPackageNum());
basicMaterialEntity.setPackageNum(distributionStockListDTO.getPackageNum()+"");
basicMaterialEntity.setLogpmUnit(distributionStockListDTO.getCargoUnit());
basicMaterialEntity.setPid(distributionStockListDTO.getMaterialId());
aLong = basicMaterialClient.addMaterial(basicMaterialEntity);
@ -265,7 +265,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
distributionStockListEntity.setIncomingBatch("CB_"+new Date().getTime());
distributionStockListEntity.setPid(list.get(0).getId());
distributionStockListEntity.setSku(distributionStockListDTO.getSku());
distributionStockListEntity.setQuantityStock(distributionStockListDTO.getStoreNum());
distributionStockListEntity.setQuantityStock((distributionStockListDTO.getStoreNum() * Integer.parseInt(distributionStockListDTO.getPackageNum())));
distributionStockListEntity.setUnpackingQuantity(0);
distributionStockListEntity.setCargoUnit(DictBizCache.getValue(DictBizConstant.LOGPM_UNIT,distributionStockListDTO.getCargoUnit()) );
distributionStockListEntity.setMaterialId(aLong);
@ -279,7 +279,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
//有修改
DistributionStockListEntity d = new DistributionStockListEntity();
d.setId(one2.getId());
int i = one2.getQuantityStock() + distributionStockListDTO.getStoreNum();
int i = one2.getQuantityStock() + (distributionStockListDTO.getStoreNum() * Integer.parseInt(distributionStockListDTO.getPackageNum()));
d.setQuantityStock(i);
this.updateById(d);

25
blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java

@ -0,0 +1,25 @@
package com.logpm.report.controller;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 自提单包条控制器
*/
@RestController
@AllArgsConstructor
@RequestMapping("/reportBillLoading")
@Api(value = "自提单报表", tags = "自提单报表接口")
public class ReportBillLoadingController {
}

55
blade-service/logpm-report/src/main/java/com/logpm/report/excel/BillLoadingReportExcel.java

@ -0,0 +1,55 @@
package com.logpm.report.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 java.io.Serializable;
/**
* 自提导出Excle实体
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BillLoadingReportExcel implements Serializable {
private static final long serialVersionUID = 1L;
@ColumnWidth(20)
@ExcelProperty("提货件数")
private String stockupCode;
@ColumnWidth(20)
@ExcelProperty("到付运费")
private String collectPaymentFee;
@ColumnWidth(20)
@ExcelProperty("搬运费")
private String transportFee;
@ColumnWidth(20)
@ExcelProperty("仓储费")
private String storageFee;
@ColumnWidth(20)
@ExcelProperty("叉车费")
private String forkliftFee;
@ColumnWidth(20)
@ExcelProperty("增值费")
private String addValueFee;
@ColumnWidth(20)
@ExcelProperty("增值费")
private String amountToFee;
@ColumnWidth(20)
@ExcelProperty("创建时间")
private String createdTime;
}

7
blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportBillLoadingAsyncService.java

@ -0,0 +1,7 @@
package com.logpm.report.service;
public interface IReportBillLoadingAsyncService {
}

19
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java

@ -0,0 +1,19 @@
package com.logpm.report.service.impl;
import com.logpm.report.service.IReportBillLoadingAsyncService;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
@Log4j2
@Service
@AllArgsConstructor
public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncService {
}
Loading…
Cancel
Save