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

1.干线bug修复

visual
zhenghaoyu 5 months ago
parent
9be42136bf
commit
77c3fcd1b5
8 changed files with 176 additions and 131 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. 4
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java
  2. 11
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java
  3. 23
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java
  4. 12
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java
  5. 22
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java
  6. 23
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
  7. 31
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  8. 181
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

4
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java
Unescape View File

@ -63,7 +63,9 @@ public class OpenOrderDTO implements Serializable {
private BigDecimal pickupFee = BigDecimal.ZERO;//提货费
private BigDecimal warehouseManagementFee = BigDecimal.ZERO;//仓库管理费
private BigDecimal storageFee = BigDecimal.ZERO;//仓储费
private BigDecimal handlingFee = BigDecimal.ZERO;//装卸费
private BigDecimal sortingFee = BigDecimal.ZERO;//仓储分拣费
private BigDecimal handlingFee = BigDecimal.ZERO;//仓储操作费
private BigDecimal installFee = BigDecimal.ZERO;//安装费
private BigDecimal otherFee = BigDecimal.ZERO;//其他费
private BigDecimal insuranceFee = BigDecimal.ZERO;//保价费

11
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java
Unescape View File

@ -330,11 +330,18 @@ public class WarehouseWaybillEntity extends TenantEntity {
*/
@ApiModelProperty(value = "仓储费")
private BigDecimal storageFee;//仓储费
/**
* 仓储费
*/
@ApiModelProperty(value = "仓储分拣费")
private BigDecimal sortingFee;//仓储分拣费
/**
* 装卸费
*/
@ApiModelProperty(value = "装卸费")
private BigDecimal handlingFee;//装卸费
@ApiModelProperty(value = "仓库操作费")
private BigDecimal handlingFee;//仓库操作费
/**
* 安装费
*/

23
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java
Unescape View File

@ -50,7 +50,8 @@ public class ExportWarehouseWaybillVO implements Serializable {
@ExcelProperty(value = "收货单位")
private String consignee;
@ExcelProperty(value = "收货单位编码")
private String consigneeCode;
@ExcelProperty(value = "收货人")
private String consigneeName;
@ -61,6 +62,8 @@ public class ExportWarehouseWaybillVO implements Serializable {
@ExcelProperty(value = "收货方地址")
private String consigneeAddress;
@ExcelProperty(value = "发站")
private String departure;
@ExcelProperty(value = "到站")
private String destination;
@ -109,11 +112,14 @@ public class ExportWarehouseWaybillVO implements Serializable {
@ExcelProperty(value = "仓储费")
private BigDecimal storageFee;
@ExcelProperty(value = "装卸费")
@ExcelProperty(value = "仓储分拣费")
private BigDecimal sortingFee;
@ExcelProperty(value = "仓储操作费")
private BigDecimal handlingFee;
@ExcelProperty(value = "安装费")
private BigDecimal installFee;
@ExcelProperty(value = "申明价值")
private BigDecimal claimingValue;
@ExcelProperty(value = "回扣")
private BigDecimal rebate;
@ -141,6 +147,8 @@ public class ExportWarehouseWaybillVO implements Serializable {
@ExcelProperty(value = "送货方式")
private String deliveryWay;
@ExcelProperty(value = "运输方式")
private String transportType;
@ExcelProperty(value = "紧急度")
private String urgency;
@ -148,9 +156,6 @@ public class ExportWarehouseWaybillVO implements Serializable {
@ExcelProperty(value = "回单数")
private Integer receiptNum;
@ExcelProperty(value = "运输方式")
private String transportType;
@ExcelProperty(value = "经办人")
private String agent;
@ -182,6 +187,10 @@ public class ExportWarehouseWaybillVO implements Serializable {
private Date freezeTime;
@ExcelIgnore
private Integer checkStatus;
@ExcelProperty(value = "是否审核")
private String checkStatusStr;
@ExcelProperty(value = "审核人")
private String checkUserName;

12
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java
Unescape View File

@ -68,7 +68,7 @@ public class FinanceWaybillExportVO implements Serializable {
@ExcelProperty(value = "备注")
private String remark;
@ExcelProperty(value = "备注")
@ExcelProperty(value = "结算方")
private String cleanObjType;
@ExcelProperty(value = "支付方式")
@ -78,16 +78,16 @@ public class FinanceWaybillExportVO implements Serializable {
private String payWay;
@ExcelProperty(value = "现付")
private BigDecimal xPay;
private BigDecimal nowPay;
@ExcelProperty(value = "到付")
private BigDecimal dPay;
private BigDecimal arrivePay;
@ExcelProperty(value = "回付")
private BigDecimal hPay;
private BigDecimal backPay;
@ExcelProperty(value = "月结")
private BigDecimal yPay;
private BigDecimal monthPay;
@ExcelProperty(value = "服务类型")
private String serviceType;
@ -134,7 +134,7 @@ public class FinanceWaybillExportVO implements Serializable {
@ExcelProperty(value = "总重量")
private BigDecimal totalWeight;
@ExcelProperty(value = "总重量")
@ExcelProperty(value = "总体积")
private BigDecimal totalVolume;
@ExcelProperty(value = "总费用")

22
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java
Unescape View File

@ -458,6 +458,8 @@ public class WaybillCheckListener {
BigDecimal insuranceFee = Objects.isNull(waybillEntity.getInsuranceFee()) ? BigDecimal.ZERO : waybillEntity.getInsuranceFee();
BigDecimal otherFee = Objects.isNull(waybillEntity.getOtherFee()) ? BigDecimal.ZERO : waybillEntity.getOtherFee();
BigDecimal thirdOperationFee = Objects.isNull(waybillEntity.getThirdOperationFee()) ? BigDecimal.ZERO : waybillEntity.getThirdOperationFee();
BigDecimal sortingFee = Objects.isNull(waybillEntity.getSortingFee()) ? BigDecimal.ZERO : waybillEntity.getSortingFee();
BigDecimal deliveryFee = Objects.isNull(waybillEntity.getDeliveryFee()) ? BigDecimal.ZERO : waybillEntity.getDeliveryFee();
Integer totalCount = waybillEntity.getTotalCount();
// BigDecimal pickupPrice = pickupFee.divide(new BigDecimal(totalCount), 2, BigDecimal.ROUND_HALF_UP);
@ -467,6 +469,8 @@ public class WaybillCheckListener {
BigDecimal insurancePrice = insuranceFee.divide(new BigDecimal(totalCount), 2, BigDecimal.ROUND_HALF_UP);
BigDecimal otherPrice = otherFee.divide(new BigDecimal(totalCount), 2, BigDecimal.ROUND_HALF_UP);
BigDecimal thirdOperationPrice = thirdOperationFee.divide(new BigDecimal(totalCount), 2, BigDecimal.ROUND_HALF_UP);
BigDecimal sortingPrice = sortingFee.divide(new BigDecimal(totalCount), 2, BigDecimal.ROUND_HALF_UP);
BigDecimal deliveryPrice = deliveryFee.divide(new BigDecimal(totalCount), 2, BigDecimal.ROUND_HALF_UP);
//查询运单下所有的订单
@ -480,6 +484,14 @@ public class WaybillCheckListener {
.collect(Collectors.toMap(WarehouseWayBillDetail::getProductId, wayBillDetail -> wayBillDetail));
// wayBillDetailMapByProductId.keySet().forEach(productId -> {
// WarehouseWayBillDetail warehouseWayBillDetail = wayBillDetailMapByProductId.get(productId);
//
//
//
// });
//保存订单信息
List<StatisticsOrderInfoEntity> orderInfoEntities = new ArrayList<>();
@ -643,8 +655,8 @@ public class WaybillCheckListener {
warehousePackageEntity.setNum(1);
warehousePackageEntity.setWarehouseFee(warehousePrice.multiply(BigDecimal.ONE));
warehousePackageEntity.setWarehouseManageFee(warehouseManagementPrice.multiply(BigDecimal.ONE));
warehousePackageEntity.setWarehouseSortingFee(BigDecimal.ZERO);
warehousePackageEntity.setWarehouseOperatingFee(BigDecimal.ZERO);
warehousePackageEntity.setWarehouseSortingFee(sortingPrice.multiply(BigDecimal.ONE));
warehousePackageEntity.setWarehouseOperatingFee(handlingPrice.multiply(BigDecimal.ONE));
warehousePackageEntity.setGoodsType(1);
warehousePackageEntity.setOrderInfoId(orderId);
warehousePackageEntity.setBrandId(brandId);
@ -689,7 +701,7 @@ public class WaybillCheckListener {
distributionPackageEntity.setVolume(Objects.isNull(volume) ? BigDecimal.ZERO : volume);
distributionPackageEntity.setGoodsType(1);
distributionPackageEntity.setOrderInfoId(orderId);
distributionPackageEntity.setDeliveryLoadingFee(handlingPrice.multiply(BigDecimal.ONE));
distributionPackageEntity.setDeliveryLoadingFee(BigDecimal.ZERO);
distributionPackageEntity.setDeliverySortingFee(BigDecimal.ZERO);
distributionPackageEntity.setDeliveryUpfloorFee(BigDecimal.ZERO);
distributionPackageEntity.setDeliveryMoveFee(BigDecimal.ZERO);
@ -726,13 +738,13 @@ public class WaybillCheckListener {
} else if (systemDeliveryChargeType == 3) {
distributionPackageEntity.setSystemDeliveryFee(systemDeliveryPrice.multiply(packageWeight));
}
distributionPackageEntity.setDeliveryFee(BigDecimal.ZERO);
distributionPackageEntity.setDeliveryFee(deliveryPrice.multiply(BigDecimal.ONE));
} else {
distributionPackageEntity.setSystemDeliveryChargeType(1);
distributionPackageEntity.setDeliveryChargeType(1);
distributionPackageEntity.setSystemDeliveryFee(BigDecimal.ZERO);
distributionPackageEntity.setDeliveryFee(BigDecimal.ZERO);
distributionPackageEntity.setDeliveryFee(deliveryPrice.multiply(BigDecimal.ONE));
}
if (payWay.equals("1") || payWay.equals("2")) {

23
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
Unescape View File

@ -766,6 +766,7 @@ public class InComingServiceImpl implements IInComingService {
List<TrunklineAdvanceDetailEntity> sendAdvanceDetailEntityList = new ArrayList();
Set<Long> waybillIdSet = new HashSet<>();
Integer total = 0;
for (Long advanceId : advanceIds) {
QueryWrapper<TrunklineAdvanceDetailEntity> queryWrapper = new QueryWrapper<>();
@ -786,18 +787,9 @@ public class InComingServiceImpl implements IInComingService {
//把detailList通过waybillId分组
Map<Long, List<TrunklineAdvanceDetailEntity>> map = detailList.stream().filter(t -> Objects.nonNull(t.getWaybillId())).collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getWaybillId));
Set<Long> waybillIdSet = map.keySet();
waybillIdSet.addAll(map.keySet());
if (CollUtil.isNotEmpty(waybillIdSet)) {
List<WarehouseWaybillEntity> waybillEntityList = warehouseWaybillClient.findListByWaybillIds(new ArrayList<>(waybillIdSet));
waybillEntityList.forEach(wb -> {
Integer totalCount = wb.getTotalCount();
Integer stockCount = wb.getStockCount();
openOrderAsyncService.saveLog(wb.getId(), wb.getWaybillNo(), "20", "已入库", "运单入库：" + stockCount + "/" + totalCount + ",入库类型：【" + IncomingTypeEnum.getValue(incomingType) + "】,入库时间：" + CommonUtil.dateToStringGeneral(new Date()), AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName);
});
}
//把waybillEntityList转化成id为key的Map
// Map<Long, WarehouseWaybillEntity> waybillEntityMap = waybillEntityList.stream().collect(Collectors.toMap(WarehouseWaybillEntity::getId, Function.identity()));
@ -825,6 +817,17 @@ public class InComingServiceImpl implements IInComingService {
}
if (CollUtil.isNotEmpty(waybillIdSet)) {
List<WarehouseWaybillEntity> waybillEntityList = warehouseWaybillClient.findListByWaybillIds(new ArrayList<>(waybillIdSet));
waybillEntityList.forEach(wb -> {
Integer totalCount = wb.getTotalCount();
Integer stockCount = wb.getStockCount();
openOrderAsyncService.saveLog(wb.getId(), wb.getWaybillNo(), "20", "已入库", "运单入库：" + stockCount + "/" + totalCount + ",入库类型：【" + IncomingTypeEnum.getValue(incomingType) + "】,入库时间：" + CommonUtil.dateToStringGeneral(new Date()), AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName);
});
}
if(CollUtil.isNotEmpty(sendAdvanceDetailEntityList)){
advanceDetailService.sendReportIncomingData(AuthUtil.getUserId(),AuthUtil.getNickName(),sendAdvanceDetailEntityList,warehouseId,warehouseName,incomingType);
}

31
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

@ -598,6 +598,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
waybillEntity.setPickupFee(openOrderDTO.getPickupFee());
waybillEntity.setWarehouseManagementFee(openOrderDTO.getWarehouseManagementFee());
waybillEntity.setStorageFee(openOrderDTO.getStorageFee());
waybillEntity.setSortingFee(openOrderDTO.getSortingFee());
waybillEntity.setHandlingFee(openOrderDTO.getHandlingFee());
waybillEntity.setInstallFee(openOrderDTO.getInstallFee());
waybillEntity.setOtherFee(openOrderDTO.getOtherFee());
@ -928,6 +929,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
waybillEntity.setPickupFee(openOrderDTO.getPickupFee());
waybillEntity.setWarehouseManagementFee(openOrderDTO.getWarehouseManagementFee());
waybillEntity.setStorageFee(openOrderDTO.getStorageFee());
waybillEntity.setSortingFee(openOrderDTO.getSortingFee());
waybillEntity.setHandlingFee(openOrderDTO.getHandlingFee());
waybillEntity.setInstallFee(openOrderDTO.getInstallFee());
waybillEntity.setOtherFee(openOrderDTO.getOtherFee());
@ -4770,12 +4772,24 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
msgList.add(editOrderMsgVO);
}
BigDecimal newSortingFee = openOrderDTO.getSortingFee();
BigDecimal sortingFee = waybillEntity.getSortingFee();
if(sortingFee.compareTo(newSortingFee) != 0){
// stringBuilder.append("装卸费：").append(handlingFee).append("-->").append(newHandlingFee).append(";");
EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO();
editOrderMsgVO.setItemName("仓储操作费费");
editOrderMsgVO.setOldValue(sortingFee.toPlainString());
editOrderMsgVO.setNewValue(newSortingFee.toPlainString());
msgList.add(editOrderMsgVO);
}
BigDecimal newHandlingFee = openOrderDTO.getHandlingFee();
BigDecimal handlingFee = waybillEntity.getHandlingFee();
if(handlingFee.compareTo(newHandlingFee) != 0){
// stringBuilder.append("装卸费：").append(handlingFee).append("-->").append(newHandlingFee).append(";");
EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO();
editOrderMsgVO.setItemName("装卸费");
editOrderMsgVO.setItemName("仓储操作费费");
editOrderMsgVO.setOldValue(handlingFee.toPlainString());
editOrderMsgVO.setNewValue(newHandlingFee.toPlainString());
msgList.add(editOrderMsgVO);
@ -5315,10 +5329,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
waybillEntity.setStorageFee(newStorageFee);
}
BigDecimal newSortingFee = openOrderDTO.getSortingFee();
BigDecimal sortingFee = waybillEntity.getSortingFee();
if (sortingFee.compareTo(newSortingFee) != 0) {
stringBuilder.append("仓储分拣费：").append(sortingFee).append("-->").append(newSortingFee).append(";");
waybillEntity.setSortingFee(newSortingFee);
}
BigDecimal newHandlingFee = openOrderDTO.getHandlingFee();
BigDecimal handlingFee = waybillEntity.getHandlingFee();
if (handlingFee.compareTo(newHandlingFee) != 0) {
stringBuilder.append("装卸费：").append(handlingFee).append("-->").append(newHandlingFee).append(";");
stringBuilder.append("仓储操作费：").append(handlingFee).append("-->").append(newHandlingFee).append(";");
waybillEntity.setHandlingFee(newHandlingFee);
}
@ -5586,17 +5607,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(unit);
if(Objects.isNull(basicdataClientEntity)){
basicdataClientEntity = new BasicdataClientEntity();
String finallyClientCode = basicdataClientClient.getFinallyClientCode();
basicdataClientEntity.setClientName(unit);
basicdataClientEntity.setClientCode(finallyClientCode);
basicdataClientEntity.setTypeService(2);
basicdataClientEntity.setTypeService(1);
basicdataClientEntity.setCargoControl(false);
basicdataClientEntity.setClientType(type);//1 工厂 2 商场 3装饰 4个人 5门店 6发货单位
basicdataClientEntity.setLinkman(linkman);
basicdataClientEntity.setPhone(linkPhone);
basicdataClientEntity.setDetailedly(linkAddress);
basicdataClientEntity.setIsNew(1);
clientId = basicdataClientClient.addReturnId(basicdataClientEntity);
clientId = basicdataClientClient.saveEntity(basicdataClientEntity);
}else{
clientId = basicdataClientEntity.getId();
}

181
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml
Unescape View File

@ -174,12 +174,6 @@
lww.h_pay hPay,
lww.y_pay yPay,
lww.service_type serviceType,
IFNULL(lww.update_status,0) updateStatus,
IFNULL(lww.check_status,0) checkStatus,
lww.check_reson checkReson,
lww.check_remark checkRemark,
lww.check_user_name checkUserName,
lww.check_time checkTime,
lww.cancle_check_remark cancleCheckRemark,
lww.cancle_check_user_name cancleCheckUserName,
lww.cancle_check_time cancleCheckTime,
@ -189,39 +183,46 @@
lww.document_making_time documentMakingTime,
lww.create_time createTime,
GROUP_CONCAT(lwwd.product_name) goodsName,
GROUP_CONCAT(CONCAT(lwwd.product_name,'(',lwwd.num,')')) productNum,
GROUP_CONCAT(CONCAT(lwwd.product_name,'(',lwwd.price,')')) productPrice,
lww.total_count totalCount,
sum(lwwd.weight) totalWeight,
sum(lwwd.volume) totalVolume,
lww.x_pay+lww.d_pay+lww.h_pay+lww.y_pay totalFee,
sum(IFNULL(lwwd.freight_price,0)*lwwd.num+IFNULL(lwwd.pickup_price,0)*lwwd.num+IFNULL(lwwd.delivery_price,0)*lwwd.num) systemTotalFee,
lww.pickup_fee pickupFee,
lww.cost_piece costPiece,
lww.cost_zhang costZhang,
lww.cost_num costNum,
lww.total_freight totalFreight,
lww.storage_fee+lww.warehouse_management_fee warehouseServiceFee,
lww.delivery_fee deliveryFee,
lww.pickup_fee pickupFee,
lww.storage_fee storageFee,
lww.warehouse_management_fee warehouseManagementFee,
0.00 warehouseSortingFee,
0.00 warehouseOprationFee,
lww.delivery_fee+lww.handling_fee deliveryServiceFee,
lww.delivery_fee deliveryFee,
lww.sorting_fee sortingFee,
lww.handling_fee handlingFee,
0.00 deliverySortingFee,
0.00 deliveryUpfloorFee,
0.00 deliveryMoveFee,
0.00 deliveryLine,
0.00 deliveryLineFee,
lww.other_fee otherFee,
lww.install_fee installFee,
lww.insurance_fee insuranceFee,
lww.claiming_value claimingValue,
lww.rebate rebate,
lww.urgency urgency,
lww.receipt_num receiptNum,
lww.receipt receipt,
lww.transport_type transportType,
lww.third_operation_fee thirdOperationFee,
lww.pickup_complete_or_not pickupCompleteOrNot,
lww.trunkline_complete_or_not trunklineCompleteOrNot,
lww.freeze_status freezeStatus,
lww.freeze_user_name freezeUserName,
lww.freeze_time freezeTime,
lww.abolish_status abolishStatus,
lww.abolish_user_name abolishUserName,
lww.abolish_time abolishTime,
lww.sign_num signNum,
lww.sign_user_name signUserName,
lww.sign_time signTime,
lww.sign_check_user_name signCheckUserName,
lww.sign_check_time signCheckTime,
lww.rebate rebate,
GROUP_CONCAT(CONCAT(lwwd.product_name,'(',lwwd.num,')')) productNum,
GROUP_CONCAT(CONCAT(lwwd.product_name,'(',lwwd.price,')')) productPrice
IFNULL(lww.check_status,0) checkStatus,
lww.check_reson checkReson,
lww.check_remark checkRemark,
lww.check_user_name checkUserName,
lww.check_time checkTime
from logpm_warehouse_waybill lww
left join logpm_basicdata_client lbc on lbc.id = lww.consignee_id
left join logpm_warehouse_waybill_detail lwwd on lwwd.waybill_id = lww.id and lwwd.is_deleted = 0
@ -466,17 +467,17 @@
sum(lwwd.weight) totalWeight,
sum(lwwd.volume) totalVolume,
lww.x_pay+lww.d_pay+lww.h_pay+lww.y_pay totalFee,
sum(IFNULL(lwwd.freight_price,0)*lwwd.num+IFNULL(lwwd.pickup_price,0)*lwwd.num+IFNULL(lwwd.delivery_price,0)*lwwd.num) systemTotalFee,
sum(IFNULL(lwwd.freight_price,0)*lwwd.num+IF(lww.pickup_complete_or_not=1,IFNULL(lwwd.pickup_price,0)*lwwd.num,0)+IFNULL(lwwd.delivery_price,0)*lwwd.num) systemTotalFee,
lww.pickup_fee pickupFee,
lww.total_freight freightFee,
lww.storage_fee+lww.warehouse_management_fee warehouseServiceFee,
lww.storage_fee+lww.warehouse_management_fee+lww.sorting_fee+lww.handling_fee warehouseServiceFee,
lww.storage_fee warehouseFee,
lww.warehouse_management_fee warehouseManagementFee,
0.00 warehouseSortingFee,
0.00 warehouseOprationFee,
lww.delivery_fee+lww.handling_fee deliveryServiceFee,
lww.sorting_fee warehouseSortingFee,
lww.handling_fee warehouseOprationFee,
lww.delivery_fee deliveryServiceFee,
lww.delivery_fee deliveryFee,
lww.handling_fee deliveryHandlingFee,
0.00 deliveryHandlingFee,
0.00 deliverySortingFee,
0.00 deliveryUpfloorFee,
0.00 deliveryMoveFee,
@ -694,10 +695,10 @@
when lww.pay_way='5' then '内部结算'
when lww.pay_way='6' then '多笔付'
else '未知' end payWay,
lww.x_pay xPay,
lww.d_pay dPay,
lww.h_pay hPay,
lww.y_pay yPay,
lww.x_pay nowPay,
lww.d_pay arrivePay,
lww.h_pay backPay,
lww.y_pay monthPay,
case when lbc.type_service='1' then '商配'
when lbc.type_service='2' then '市配'
when lbc.type_service='3' then '自提'
@ -733,17 +734,17 @@
sum(lwwd.weight) totalWeight,
sum(lwwd.volume) totalVolume,
lww.x_pay+lww.d_pay+lww.h_pay+lww.y_pay totalFee,
sum(IFNULL(lwwd.freight_price,0)*lwwd.num+IFNULL(lwwd.pickup_price,0)*lwwd.num+IFNULL(lwwd.delivery_price,0)*lwwd.num) systemTotalFee,
sum(IFNULL(lwwd.freight_price,0)*lwwd.num+IF(lww.pickup_complete_or_not=1,IFNULL(lwwd.pickup_price,0)*lwwd.num,0)+IFNULL(lwwd.delivery_price,0)*lwwd.num) systemTotalFee,
lww.pickup_fee pickupFee,
lww.total_freight freightFee,
lww.storage_fee+lww.warehouse_management_fee warehouseServiceFee,
lww.storage_fee+lww.warehouse_management_fee+lww.sorting_fee+lww.handling_fee warehouseServiceFee,
lww.storage_fee warehouseFee,
lww.warehouse_management_fee warehouseManagementFee,
0.00 warehouseSortingFee,
0.00 warehouseOprationFee,
lww.delivery_fee+lww.handling_fee deliveryServiceFee,
lww.sorting_fee warehouseSortingFee,
lww.handling_fee warehouseOprationFee,
lww.delivery_fee deliveryServiceFee,
lww.delivery_fee deliveryFee,
lww.handling_fee deliveryHandlingFee,
0.00 deliveryHandlingFee,
0.00 deliverySortingFee,
0.00 deliveryUpfloorFee,
0.00 deliveryMoveFee,
@ -772,7 +773,7 @@
#{item}
</foreach>
</if>
<if test="param.warehouseId != null">
<if test="param.destinationWarehouseIds != null">
and lww.destination_warehouse_id in
<foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
#{item}
@ -926,82 +927,74 @@
</select>
<select id="exportWaybillList" resultType="com.logpm.warehouse.vo.ExportWarehouseWaybillVO">
select lww.id id,
lww.brand brand,
select
lww.waybill_no waybillNo,
lww.order_no orderNo,
lww.remark remark,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
lww.customer_train customerTrain,
lww.brand brand,
lww.shipper shipper,
lww.shipper_name shipperName,
lww.shipper_mobile shipperMobile,
lww.shipper_address shipperAddress,
lww.consignee consignee,
lbc.client_code consigneeCode,
lww.consignee_name consigneeName,
lww.consignee_mobile consigneeMobile,
lww.consignee_address consigneeAddress,
lww.shipper shipper,
lww.shipper_name shipperName,
lww.shipper_mobile shipperMobile,
lww.shipper_address shipperAddress,
lww.destination destination,
lww.departure departure,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
lww.agent agent,
lww.delivery_way deliveryWay,
lww.customer_train customerTrain,
IFNULL(lww.return_status,0) returnStatus,
lww.remark remark,
lww.pay_type payType,
lww.pay_way payWay,
lww.x_pay nowPay,
lww.d_pay arrivePay,
lww.h_pay backPay,
lww.y_pay mouthPay,
lww.service_type serviceType,
IFNULL(lww.update_status,0) updateStatus,
IFNULL(lww.check_status,0) checkStatus,
lww.check_reson checkReson,
lww.check_remark checkRemark,
lww.check_user_name checkUserName,
lww.check_time checkTime,
lww.cancle_check_remark cancleCheckRemark,
lww.cancle_check_user_name cancleCheckUserName,
lww.cancle_check_time cancleCheckTime,
lww.waybill_status waybillStatus,
lww.waybill_type waybillType,
lww.document_making_time documentMakingTime,
lww.create_time createTime,
GROUP_CONCAT(lwwd.product_name) goodsName,
GROUP_CONCAT(CONCAT(lwwd.product_name,'(',lwwd.num,')')) productNum,
GROUP_CONCAT(CONCAT(lwwd.product_name,'(',lwwd.price,')')) productPrice,
lww.cost_piece costPiece,
lww.cost_zhang costZhang,
lww.cost_num costNum,
lww.total_count totalCount,
sum(lwwd.weight) totalWeight,
sum(lwwd.volume) totalVolume,
lww.x_pay+lww.d_pay+lww.h_pay+lww.y_pay totalFee,
sum(IFNULL(lwwd.freight_price,0)*lwwd.num+IFNULL(lwwd.pickup_price,0)*lwwd.num+IFNULL(lwwd.delivery_price,0)*lwwd.num) systemTotalFee,
lww.pickup_fee pickupFee,
lww.total_freight totalFreight,
lww.storage_fee+lww.warehouse_management_fee warehouseServiceFee,
lww.delivery_fee deliveryFee,
lww.pickup_fee pickupFee,
lww.storage_fee storageFee,
lww.warehouse_management_fee warehouseManagementFee,
0.00 warehouseSortingFee,
0.00 warehouseOprationFee,
lww.delivery_fee+lww.handling_fee deliveryServiceFee,
lww.delivery_fee deliveryFee,
lww.sorting_fee sortingFee,
lww.handling_fee handlingFee,
0.00 deliverySortingFee,
0.00 deliveryUpfloorFee,
0.00 deliveryMoveFee,
0.00 deliveryLine,
0.00 deliveryLineFee,
lww.other_fee otherFee,
lww.install_fee installFee,
lww.insurance_fee insuranceFee,
lww.claiming_value claimingValue,
lww.rebate rebate,
lww.pay_type payType,
lww.pay_way payWay,
lww.x_pay nowPay,
lww.d_pay arrivePay,
lww.h_pay backPay,
lww.y_pay mouthPay,
lww.third_operation_fee thirdOperationFee,
lww.delivery_way deliveryWay,
lww.transport_type transportType,
lww.urgency urgency,
lww.receipt_num receiptNum,
lww.agent agent,
lww.waybill_status waybillStatus,
lww.freeze_status freezeStatus,
lww.freeze_user_name freezeUserName,
lww.freeze_time freezeTime,
lww.check_status checkStatus,
lww.check_reson checkReson,
lww.check_remark checkRemark,
lww.check_user_name checkUserName,
lww.check_time checkTime,
lww.sign_num signNum,
lww.sign_user_name signUserName,
lww.sign_time signTime,
lww.sign_check_user_name signCheckUserName,
lww.sign_check_time signCheckTime,
lww.rebate rebate,
GROUP_CONCAT(CONCAT(lwwd.product_name,'(',lwwd.num,')')) productNum,
GROUP_CONCAT(CONCAT(lwwd.product_name,'(',lwwd.price,')')) productPrice
lww.abolish_status abolishStatus,
lww.abolish_user_name abolishUserName,
lww.abolish_time abolishTime,
lww.document_making_time documentMakingTime,
lww.create_time createTime
from logpm_warehouse_waybill lww
left join logpm_basicdata_client lbc on lbc.id = lww.consignee_id
left join logpm_warehouse_waybill_detail lwwd on lwwd.waybill_id = lww.id and lwwd.is_deleted = 0

Write Preview
Loading…
Cancel
Save