Browse Source

Merge branch 'pre-production'

master
pref_mail@163.com 1 year ago
parent
commit
d03276dc17
  1. 4
      blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java
  2. 2
      blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java
  3. 7
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
  4. 6
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java
  5. 3
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
  6. 2
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java
  7. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java
  8. 7
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
  9. 13
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java
  10. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java
  11. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java
  12. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java
  13. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java
  14. 20
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
  15. 12
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  16. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
  17. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
  18. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java
  19. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java
  20. 14
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
  21. 9
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  22. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
  23. 820
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  24. 11
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
  25. 65
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
  26. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
  27. 2
      blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java
  28. 2
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
  29. 15
      blade-service/logpm-report/Dockerfile
  30. 15
      blade-service/logpm-report/src/main/java/com/logpm/report/constant/ReportConstants.java
  31. 6
      blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java
  32. 18
      blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java
  33. 17
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.java
  34. 3
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml
  35. 31
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java
  36. 76
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml
  37. 21
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapeer.java
  38. 8
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapper.xml
  39. 41
      blade-service/logpm-report/src/main/java/com/logpm/report/query/StockOrderQuery.java
  40. 4
      blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java
  41. 4
      blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingTasksReader.java
  42. 4
      blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryCustomerReader.java
  43. 4
      blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java
  44. 4
      blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryInStocksReader.java
  45. 4
      blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryOutStocksReader.java
  46. 4
      blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryStockReader.java
  47. 4
      blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryTrainReader.java
  48. 36
      blade-service/logpm-report/src/main/java/com/logpm/report/reader/StockOrderReader.java
  49. 2
      blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReader.java
  50. 30
      blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportBillLoadingAsyncService.java
  51. 60
      blade-service/logpm-report/src/main/java/com/logpm/report/service/ReportDeliverService.java
  52. 42
      blade-service/logpm-report/src/main/java/com/logpm/report/service/ReportStockService.java
  53. 13
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java
  54. 35
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
  55. 22
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportStockServiceImpl.java
  56. 3
      blade-service/logpm-report/src/main/java/com/logpm/report/util/QueryUtil.java
  57. 35
      blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java
  58. 4
      blade-service/logpm-report/src/main/java/com/logpm/report/util/ThreadPoolUtil.java
  59. 6
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java
  60. 169
      blade-service/logpm-report/src/main/java/com/logpm/report/vo/StockOrderVO.java
  61. 6
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
  62. 6
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

4
blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java

@ -78,14 +78,14 @@ public class JobRegistryMonitorHelper {
}
} catch (Exception e) {
if (!toStop) {
logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:{}", e);
logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:", e);
}
}
try {
TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT);
} catch (InterruptedException e) {
if (!toStop) {
logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:{}", e);
logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:", e);
}
}
}

2
blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java

@ -143,7 +143,7 @@ public class JobScheduleHelper {
} catch (Exception e) {
if (!scheduleThreadToStop) {
logger.error(">>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}", e);
logger.error(">>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:", e);
}
} finally {

7
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java

@ -269,6 +269,13 @@ public class DistributionDeliveryListEntity extends TenantEntity {
@TableField(exist = false)
private String clineName;
/**
* 商场名称
*/
@ApiModelProperty(value = "商场名称")
@TableField(exist = false)
private String mallName;
/**
* 签收件数
*/

6
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java

@ -64,6 +64,12 @@ public class DistributionDeliveryListVO extends DistributionDeliveryListEntity {
@ApiModelProperty(value = "客户名称")
private String consignee;
/**
* 客户名称
*/
@ApiModelProperty(value = "客户名称")
private String mallName;
/**
* 配送日期
*/

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

@ -121,8 +121,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
.map(BasicdataWarehouseEntity::getId)
.collect(Collectors.toList());
basicdataGoodsShelf.put("warehouseList", collect);
IPage<BasicdataGoodsShelfVO> basicdataGoodsShelfVOIPage = basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf);
return basicdataGoodsShelfVOIPage;
return basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf);
}

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

@ -165,7 +165,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
@Transactional
public void importDriverArtery(List<BasicdataVehicleImportExcel> data) {
String method = "#############BasicdataVehicleServiceImpl.importDriverArtery";
log.info("车辆模板导入信息>>>>",data);
log.info("车辆模板导入信息>>>>{}",data);
try {
List<BasicdataDrivermiddleEntity>drivermiddleEntities = new ArrayList<>();
//对导入数据进行处理

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java

@ -239,7 +239,7 @@ public class DistributionSignforAppController {
if(StringUtils.isBlank(orderPackageCodes)){
orderPackageCodes = packageCode+"";
}else{
orderPackageCodes = orderPackageCodes + "," +packageCode;
orderPackageCodes = orderPackageCodes + "," + packageCode;
}
}
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();

7
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@ -353,6 +353,13 @@ public class DistributionStockArticleController extends BladeController {
return R.status(distributionStockArticleService.updateById(distributionStockArticle));
}
@PostMapping("/updateBatchClient")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入distributionStockArticle")
public R updateBatchClient(@Valid @RequestBody DistributionStockArticleDTO distributionStockArticleDTO) {
return R.status(distributionStockArticleService.updateBatchById(distributionStockArticleDTO.getEntityList()));
}
/**
* 配送在库订单 新增或修改
*/

13
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java

@ -153,7 +153,20 @@ public class DistributionStockListController extends BladeController {
return R.fail(e.getMessage());
}
return R.data(orderPackgeCodeDataVo);
}
@GetMapping("/showInventoryPackgeCode")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "返回模板和模板内容")
public R showOrderPackgeCode(@ApiIgnore @RequestParam Long id){
OrderPackgeCodeDataVO orderPackgeCodeDataVo= null;
try {
orderPackgeCodeDataVo = distributionStockListService.showInvnetoryPackgeCode(id);
} catch (Exception e) {
return R.fail(e.getMessage());
}
return R.data(orderPackgeCodeDataVo);
}

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelListDTO.java

@ -38,6 +38,8 @@ public class DistributionParcelListDTO extends DistributionParcelListEntity {
private Long materialId;
private String materialName;
private String materialCode;
private Integer isLoading;
private Integer isSigning;
private String materialUnit;
private Integer reservationNum; //预约数量
private String sku;

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java

@ -71,5 +71,11 @@ public class DistributionStockArticleDTO extends DistributionStockArticleEntity
@TableField(exist = false)
private List<DistributionParcelNumberVO> parcelNumberVOS;
/**
// * 零担订单品类信息
// */
@TableField(exist = false)
private List<DistributionStockArticleEntity> entityList;
}

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java

@ -28,6 +28,5 @@ public class DistributionStockArticleOweDTO extends DistributionStockArticleEnti
private String reservation;
private String startDate;
private String entDate;
private String isAll;
private List<Long> warehouseIdList;
}

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java

@ -68,6 +68,12 @@ public class DistributionDeliveryListExcel implements Serializable {
@ColumnWidth(20)
@ExcelProperty("客户名称")
private String consignee;
/**
* 仓库
*/
@ColumnWidth(35)
@ExcelProperty("商场名称")
private String mallName;
/**
* 配送类型;1-自主配送,2-三方配送
*/

20
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml

@ -93,14 +93,6 @@
lds.received_quantity receivedQuantity,
lds.is_have_abnormal_package isHaveAbnormalPackage,
lds.signee_name signeeName,
(SELECT
ldss.forklift_name
FROM
logpm_distribution_stockup_info AS ldsi
LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id
WHERE
ldsi.reservation_id = lds.reservation_id
) AS forkliftName,
CASE
WHEN ldr.stockup_status ='10' THEN '待指派'
WHEN ldr.stockup_status ='20' THEN '待备货'
@ -118,10 +110,18 @@
CASE
WHEN lds.driver_signing ='1' THEN '未完成'
else '已完成'
END driverSigning
END driverSigning,
t.forklift_name AS forkliftName
FROM
logpm_distribution_signfor lds
JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
LEFT JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
LEFT JOIN (SELECT
ldss.forklift_name,
ldsi.reservation_id
FROM
logpm_distribution_stockup_info AS ldsi
LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id
) AS t ON t.reservation_id = lds.reservation_id
<where>
lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0
</where>

12
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@ -205,7 +205,8 @@
WHERE
lddl.id = lds.delivery_id
) signingNumber,
GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName
GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName,
GROUP_CONCAT(DISTINCT ldr.mall_name SEPARATOR ',') mallName
FROM logpm_distribution_delivery_list lddl
left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id
LEFT JOIN logpm_distribution_reservation ldr on ldr.id = lds.reservation_id
@ -226,6 +227,9 @@
<if test="param.clineName != null and param.clineName!=''">
and ldr.consignee like concat('%',#{param.clineName},'%')
</if>
<if test="param.mallName != null and param.mallName!=''">
and ldr.mall_name like concat('%',#{param.mallName},'%')
</if>
<if test="param.vehicleName != null and param.vehicleName!=''">
and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
</if>
@ -302,6 +306,7 @@
lddl.task_time AS taskTime,
ldr.warehouse_id AS warehouseId,
ldr.consignee AS consignee,
ldr.mall_name AS mallName,
CASE
lddl.kind
WHEN 1 THEN
@ -351,7 +356,7 @@
WHERE
lddl.id = lds.delivery_id
) signingNumber,
GROUP_CONCAT( lddl.loading_team_name, lddl.loading_team_name ) AS handlingCrew
GROUP_CONCAT( lddl.loading_team_name, lddl.unloading_team_name ) AS handlingCrew
FROM
logpm_distribution_delivery_list AS lddl
LEFT JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id
@ -372,6 +377,9 @@
<if test=" params.clineName != '' and params.clineName != null">
AND ldr.consignee like concat('%',#{params.clineName},'%')
</if>
<if test=" params.mallName != '' and params.mallName != null">
AND ldr.mall_name like concat('%',#{params.mallName},'%')
</if>
<if test=" params.type != '' and params.type != null">
AND lddl.type = #{params.type}
</if>

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

@ -638,6 +638,12 @@
<if test="param.orderPackageReservationStatus != null and param.orderPackageReservationStatus != ''">and
ldpl.order_package_reservation_status = #{param.orderPackageReservationStatus}
</if>
<if test="param.isLoading != null and param.isLoading == 0">and
ldpl.order_package_loading_status != 20
</if>
<if test="param.isSigning != null and param.isSigning == 0">and
ldpl.order_package_status != 70
</if>
<if test="param.orderPackageFreezeStatus != null and param.orderPackageFreezeStatus != ''">and
ldpl.order_package_freeze_status = #{param.orderPackageFreezeStatus}
</if>

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@ -432,6 +432,7 @@
LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
<where>
ldsa.is_deleted = 0 and ldsa.order_status in (10,20,30,40,50,60,70)
and ldsa.hand_quantity > 0
<if test="param.orderCodeNumList != null">
and ldsa.order_code in
<foreach collection="param.orderCodeNumList" separator="," close=")" item="a" open="(">
@ -473,8 +474,6 @@
<if test=" param.startDate != null ">and ldsa.warehouse_entry_time between #{param.startDate} and
#{param.entDate}
</if>
<if test=" param.isAll != null ">and ldsa.hand_quantity > 0
</if>
<if test=" param.warehouseEntryTime != null ">and DATE(ldsa.warehouse_entry_time) =
#{param.warehouseEntryTime}
</if>

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

@ -232,4 +232,5 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
void submitHandleNumAndTotalNumberByOrderId(Integer subNum, Long articleId);
}

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

@ -196,6 +196,12 @@ public interface IDistributionStockListService extends BaseService<DistributionS
*/
R cancelAddStockListByPackage(DistributionStockListDTO distributionStockListDTO);
/**
* 查询库存品包件二维码
* @param id
* @return
*/
OrderPackgeCodeDataVO showInvnetoryPackgeCode(Long id);
// /**

14
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

@ -1439,13 +1439,15 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
break;
case "欧派":
//推送到欧派
try {
// ouPaiFactoryClinet.newSystemHandleStatusDataSignforOne("7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );//*签收人*//
// log.info(">>>>>>>>>>>>>>>>>>>>>>>> 签收推送 欧派:{} {} {} {}", "7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );
} catch (Exception e) {
throw new RuntimeException(e);
}
// try {
// // ouPaiFactoryClinet.newSystemHandleStatusDataSignforOne("7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );//*签收人*//
// // log.info(">>>>>>>>>>>>>>>>>>>>>>>> 签收推送 欧派:{} {} {} {}", "7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );
// } catch (Exception e) {
// throw new RuntimeException(e);
// }
break;
default:
log.info("开单其它品牌stockArticleEntity.getBrand() ={}",stockArticleEntity.getBrand());
//其他.....
}
}

9
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@ -4587,8 +4587,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
List<String> collect = list.stream().filter(l -> !l.getScanStatus().equals(LoadingStatusConstant.quxiao.getValue())).map(DistributionLoadscaninvnEntity::getScanUser).collect(Collectors.toList());
int loadingNum = list.stream().mapToInt(DistributionLoadscaninvnEntity::getLoadedNub).sum();
rs.setLoadedinNumber(loadingNum);
HashSet<String> strings = new HashSet<>();
strings.addAll(collect);
HashSet<String> strings = new HashSet<>(collect);
rs.setScanUser(String.join(",", strings));
if (loadingNum > 0 && loadingNum == rs.getReservationNum()) {
@ -5084,7 +5083,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
TrayTypeDataVO trayTypeDataVO = warehouseTrayTypeClient.selectListByTrayCode(c.getTrayCode());
if (Func.isNotEmpty(trayTypeDataVO)) {
String trayName = trayTypeDataVO.getTrayName();
String trayName = trayTypeDataVO.getTrayCode();
c.setTrayName(trayName);
List<WarehouseTrayGoodsEntity> goodsLsit = trayTypeDataVO.getGoodsLsit();
if (Func.isNotEmpty(goodsLsit)) {
@ -5653,12 +5652,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
public R getZeroPackageInfo(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = baseMapper.selectReservationStockByDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
if (Func.isEmpty(reservationStockarticleEntityList)) {
log.error("#############配送任务查询订单错误,deliveryId:{}", distrilbutionloadingscanDTO.getDeliveryId());
log.info("#############配送任务查询订单错误,deliveryId:{}", distrilbutionloadingscanDTO.getDeliveryId());
return null;
}
List<Long> orderIds = reservationStockarticleEntityList.stream().filter(rs -> Func.isNotEmpty(rs.getIsZero()) && rs.getIsZero().equals(IsOrNoConstant.yes.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
if (Func.isEmpty(orderIds)) {
log.error("####################配送任务下无零担信息:{}");
log.info("####################配送任务下无零担信息:{}",orderIds);
return Resp.scanFail("查询错误", "该任务无零担订单");
}
List<DistributionParcelNumberVO> parcelNumberVOS = new ArrayList<>();

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java

@ -855,7 +855,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(materialId.get(0));
distributionStockListEntity.setSku(materialOwnId.getSku());
// distributionStockListEntity.setMaterialId(materialId.get(0));//货物ID
distributionStockListEntity.setMaterialId(materialId.get(0));//货物ID
// distributionStockListEntity.setParcelListId(distributionParcelListEntities.getId());//包件id
distributionStockListEntity.setQuantityOccupied(0);//冻结数量
distributionStockListEntity.setServiceType(distributionStockArticleEntity.getTypeService());//冻结数量
@ -870,8 +870,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
distributionStockListService.updateById(listEntity);
} else {
log.info("###########distributionStockListEntity>>>>>>>>,{}",distributionStockListEntity);
// distributionStockListService.save(distributionStockListEntity);
distributionStockListService.getBaseMapper().insert(distributionStockListEntity);
distributionStockListService.save(distributionStockListEntity);
}
// distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null)); //托盘
// distributionStockListEntity.setStorageLocation(Optional.ofNullable(distributionParcelList.getGoodsAllocation()).orElse(null)); //库位信息

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

File diff suppressed because it is too large Load Diff

11
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@ -19,6 +19,7 @@ package com.logpm.distribution.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@ -1663,10 +1664,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
.eq(DistributionReservationPackageEntity::getStockArticleId, stockArticleEntity.getId())
.ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())
);
if (Func.isNotEmpty(packageEntityList)) {
long count = packageEntityList.stream().count();
}
// if (Func.isNotEmpty(packageEntityList)) {
//// long count = packageEntityList.size();
//
// }
//查询签收数量
}
}
@ -1789,6 +1790,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
}
@Override
public DistributionStockArticleEntity findZeroByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) {
QueryWrapper<DistributionStockArticleEntity> queryWrapper = new QueryWrapper<>();

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

@ -108,6 +108,9 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
@Autowired
@Lazy
private IDistributionStockArticleService distributionStockArticleService;
@Autowired
@Lazy
private IDisStockListDetailService disStockListDetailService;
@ -743,7 +746,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
throw new ServiceException("查询库存品信息失败");
}
for (DisStockListDetailEntity disStockListDetailEntity : stockUpStockListPack) {
Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(stockListEntity), Map.class);
Map<String, Object> map =JSONObject.parseObject(JSONObject.toJSONString(stockListEntity), Map.class);
map.put("id",disStockListDetailEntity.getId());
map.put("customerName",distributionReservationEntity.getConsignee());
map.put("customerTelephone",distributionReservationEntity.getDeliveryPhone());
@ -765,6 +768,66 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
return orderPackgeCodeDataVO;
}
@Override
public OrderPackgeCodeDataVO showInvnetoryPackgeCode(Long id) {
OrderPackgeCodeDataVO orderPackgeCodeDataVO = new OrderPackgeCodeDataVO();
List<Map> data = new ArrayList<>();
BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_11.getValue());
if (ObjectUtil.isEmpty(template)) {
throw new ServiceException("模板内容未找到");
}
String html = null;
try {
html = TemplateUtil.getTemplateByUrl(template.getTemplateUrl());
orderPackgeCodeDataVO.setTemplateHtml(html);
orderPackgeCodeDataVO.setTemplateId(template.getId());
//查询库存品包件
DisStockListDetailEntity disStockListDetail = disStockListDetailService.getById(id);
if (Func.isEmpty(disStockListDetail)){
log.error("##################查询库存品包件失败id:{}",id);
throw new ServiceException("库存品包件查询失败");
}
//查询库存品信息
DistributionStockListEntity stockListEntity = this.getById(disStockListDetail.getStockListId());
if (Func.isEmpty(stockListEntity)){
log.info("##############查询ID:{}",disStockListDetail.getStockListId());
throw new ServiceException("查询库存品信息失败");
}
DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(disStockListDetail.getReservationId());
if (Func.isEmpty(distributionReservationEntity)){
log.info("##############查询ID:{}",distributionReservationEntity);
throw new ServiceException("查询库存品信息失败");
}
Map<String, Object> map =JSONObject.parseObject(JSONObject.toJSONString(stockListEntity), Map.class);
map.put("id",disStockListDetail.getId());
map.put("customerName",distributionReservationEntity.getConsignee());
map.put("customerTelephone",distributionReservationEntity.getDeliveryPhone());
map.put("customerAddress",distributionReservationEntity.getDeliveryAddress());
map.put("shipperName"," ");
map.put("shipperAddress"," ");
map.put("stockPackageCode",disStockListDetail.getStockPackageCode());
String filename = QRCodeUtil.createCodeToFile(disStockListDetail.getStockPackageCode());
map.put("img", QRCodeUtil.getEmpAutograph(filename));
if (Func.isNotEmpty(stockListEntity.getOrderCode())){
String fileTypeName = QRCodeUtil.createCodeToFile(stockListEntity.getOrderCode());
map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName));
}
data.add(map);
orderPackgeCodeDataVO.setDataList(data);
return orderPackgeCodeDataVO;
} catch (Exception e) {
throw new RuntimeException(e);
}
}
@Override
public OrderPackgeCodeDataVO showInventorySourcePackageCode(String incomingBatch, Long packageIds) throws Exception {
OrderPackgeCodeDataVO orderPackgeCodeDataVO = new OrderPackgeCodeDataVO();

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

@ -474,8 +474,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
}
private String deakwithPallet(List<String> packagePallet, List<String> stockListPallet) {
Set<String> set = new HashSet<>();
set.addAll(packagePallet);
Set<String> set = new HashSet<>(packagePallet);
for (String pallet : stockListPallet) {
if (StringUtil.isBlank(pallet)) {
@ -500,8 +499,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
private String dealwithAllocation(List<String> packageAllocation, List<String> stockListAllocation) {
Set<String> set = new HashSet<>();
set.addAll(packageAllocation);
Set<String> set = new HashSet<>(packageAllocation);
for (String allocation : stockListAllocation) {
if (StringUtil.isBlank(allocation)) {

2
blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java

@ -39,7 +39,7 @@ public class ZbFactoryAccountsInterceptor implements HandlerInterceptor {
String body = myRequestWrapper.getBody();
JSONObject bodyJson = JSONObject.parseObject(body);
log.info("bodyJson {}",bodyJson,toString());
log.info("bodyJson ={}",bodyJson.toString());
Map<String, String> params = new HashMap<>();
params.put("app_key",appKey);

2
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@ -581,7 +581,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
FactoryOrderEntity factoryOrder = factoryOrderService.selectEntityByOrderPackageCode(unitNo);
if (Objects.isNull(factoryOrder)) {
log.info("》》》》》》》》》》》》 未查询到该单据推送订单信息", orderStatusDTO.getUnitNo());
log.info("》》》》》》》》》》》》 未查询到该单据推送订单信息 {}", orderStatusDTO.getUnitNo());
return Resp.fail(400, "未查询到该单据推送订单信息");
}
// 如何判断这个包间是非干仓配的数据

15
blade-service/logpm-report/Dockerfile

@ -0,0 +1,15 @@
FROM bladex/alpine-java:openjdk8-openj9_cn_slim
MAINTAINER h5u@163.com
RUN mkdir -p /logpm/report
WORKDIR /logpm/report
EXPOSE 8900
ADD ./target/logpm-report.jar ./app.jar
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar","-Xms128m","-Xmx512m", "app.jar"]
CMD ["--spring.profiles.active=test"]

15
blade-service/logpm-report/src/main/java/com/logpm/report/constant/ReportConstants.java

@ -0,0 +1,15 @@
package com.logpm.report.constant;
/**
* @author zhaoqiaobo
* @create 2024-03-14 18:54
*/
public class ReportConstants {
public static final int HASHMAP_DEFAULT_SIZE = 16;
public static final String PARAM_SPLITTER = ",";
public static final Integer HTTP_SUCCESS_CODE = 200;
}

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

@ -18,8 +18,10 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
/**
* 自提单包条控制器
*/
* 自提报表前端控制器
* @Author zqb
* @Date 2024/3/14
**/
@RestController
@AllArgsConstructor
@RequestMapping("/reportBillLoading")

18
blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportDeliveryController.java

@ -21,10 +21,12 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.logpm.report.query.DevilerDetailsQuery;
import com.logpm.report.query.ReportCustomerQuery;
import com.logpm.report.query.ReportDevilerQuery;
import com.logpm.report.query.StockOrderQuery;
import com.logpm.report.service.ReportDeliverService;
import com.logpm.report.vo.ReportCustomerVO;
import com.logpm.report.vo.ReportDetailVO;
import com.logpm.report.vo.ReportDevilerVO;
import com.logpm.report.vo.StockOrderVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@ -94,6 +96,22 @@ public class ReportDeliveryController extends BladeController {
@ApiOperation(value = "导出配送明细报表", notes = "导出配送明细报表")
public void exportDetails(HttpServletResponse response, ReportDetailVO vo, DevilerDetailsQuery query) {
reportDeliverService.exportDetails(response, vo, query);
}
@GetMapping("/stockOrder")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "在库订单报表", notes = "在库订单报表")
public R<IPage<StockOrderVO>> stockOrderPage(StockOrderVO vo, StockOrderQuery query) {
IPage<StockOrderVO> pages = reportDeliverService.stockOrderPage(vo, query);
return R.data(pages);
}
@GetMapping("/exportStockOrder")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "导出在库订单报表", notes = "导出在库订单报表")
public void exportStockOrder(HttpServletResponse response, StockOrderVO vo, StockOrderQuery query) {
reportDeliverService.exportStockOrder(response, vo, query);
}

17
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.java

@ -10,11 +10,28 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 自提报表Mapper
* @Author zqb
* @Date 2024/3/14
**/
@Mapper
public interface ReportBillLoadingMapper extends BaseMapper {
/**
* 查询自提明细分页sql
* @param page
* @param queryWrapper
* @return
*/
List<BillLoadingDetailsVO> getDetailsPage(IPage<BillLoadingDetailsVO> page,@Param("ew") Wrapper<BillLoadingDetailsVO> queryWrapper);
/**
* 查询自提任务报表sql
* @param page
* @param queryWrapper
* @return
*/
List<BillLoadingTasksVO> getTasksPage(IPage<BillLoadingTasksVO> page,@Param("ew") Wrapper<BillLoadingTasksVO> queryWrapper);
}

3
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml

@ -82,7 +82,7 @@
dpl.description_goods material_name,
'' start_ware_in_time,
'' start_ware_out_time,
dpl.warehousing_time,
dpl.warehousing_time warehouse_entry_time_end,
dbls.create_user scan_user,
dbls.create_time scan_time,
dbl.update_time examine_time,
@ -115,6 +115,7 @@
storage_fee,
forklift_fee,
add_value_fee,
(collect_payment_fee + transport_fee + storage_fee + forklift_fee + add_value_fee) amount_to_fee,
goods_info,
created_time
from (SELECT ldbl.pickup_batch AS pickup_atch,

31
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.report.vo.ReportCustomerVO;
import com.logpm.report.vo.ReportDetailVO;
import com.logpm.report.vo.ReportDevilerVO;
import com.logpm.report.vo.StockOrderVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -18,10 +19,40 @@ import java.util.List;
@Mapper
public interface ReportDeliverMapeer extends BaseMapper {
/**
* 查询配送车次报表sql
*
* @param page
* @param query
* @return
*/
List<ReportDevilerVO> getDeliveryTrainPage(IPage<ReportDevilerVO> page, @Param("ew") Wrapper query);
/**
* 查询配送客户报表sql
*
* @param page
* @param query
* @return
*/
List<ReportCustomerVO> getCustomerPage(IPage<ReportCustomerVO> page, @Param("ew") Wrapper query);
/**
* 拆线呢配送明细报表sql
*
* @param page
* @param query
* @return
*/
List<ReportDetailVO> getDetailsPage(IPage<ReportDetailVO> page, @Param("ew") Wrapper query);
/**
* 查询在库订单报表sql
*
* @param page
* @param queryWrapper
* @return
*/
List<StockOrderVO> getStockOrderPage(IPage<StockOrderVO> page, @Param("ew") Wrapper<StockOrderVO> queryWrapper);
}

76
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml

@ -535,5 +535,81 @@
FROM logpm_distribution_reservation obj
WHERE obj.id = t.id)
</select>
<select id="getStockOrderPage" resultType="com.logpm.report.vo.StockOrderVO">
select waybill_number,
service_number,
order_code,
mall_name,
description_goods,
warehouse,
warehouse_entry_time,
warehouse_entry_time_end,
store_time,
consignee_unit,
consignee_person,
total_number,
hand_quantity,
not_received,
sorting_quantity,
delivery_quantity,
transfer_quantity,
signin_quantity,
grounding_status,
brand,
trays,
allocation,
freeze_status,
order_status,
reservation_status,
stockup_status,
complete_set,
type_service,
customer_name,
customer_telephone,
customer_address,
fee,
create_user,
create_time
from (SELECT GROUP_CONCAT(DISTINCT ldpl.waybill_number) waybill_number,
ldsa.service_number,
ldsa.order_code,
ldsa.mall_name,
ldsa.description_goods,
ldsa.warehouse,
ldsa.warehouse_entry_time,
ldsa.warehouse_entry_time_end,
ldsa.store_time,
ldsa.consignee_unit,
ldsa.consignee_person,
ldsa.total_number,
ldsa.hand_quantity,
ldsa.total_number - ldsa.hand_quantity not_received,
ldsa.sorting_quantity,
ldsa.delivery_quantity,
ldsa.transfer_quantity,
ldsa.signin_quantity,
ldsa.grounding_status,
ldsa.brand,
GROUP_CONCAT(DISTINCT lwtg.tray_code) trays,
GROUP_CONCAT(DISTINCT lwug.position_code) allocation,
ldsa.freeze_status,
ldsa.order_status,
ldsa.reservation_status,
ldsa.stockup_status,
ldsa.complete_set,
ldsa.type_service,
ldsa.customer_name,
ldsa.customer_telephone,
ldsa.customer_address,
ldsa.fee,
ldsa.create_user,
ldsa.create_time
FROM logpm_distribution_stock_article ldsa
LEFT JOIN logpm_distribution_parcel_list ldpl ON ldsa.id = ldpl.stock_article_id
LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwtg.association_id = ldpl.id
LEFT JOIN logpm_warehouse_updown_goods lwug ON lwug.association_id = ldpl.id
${ew.customSqlSegment}
group by ldsa.id) t
</select>
</mapper>

21
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapeer.java

@ -18,10 +18,31 @@ import java.util.List;
@Mapper
public interface ReportStockMapeer extends BaseMapper {
/**
* 查询库存品报表sql
*
* @param page
* @param queryWrapper
* @return
*/
List<StockDetailsVO> getDetailPage(IPage<StockDetailsVO> page, @Param("ew") Wrapper<StockDetailsVO> queryWrapper);
/**
* 查询库存入库报表sql
*
* @param page
* @param queryWrapper
* @return
*/
List<ReportInStockVO> getInStocks(IPage<ReportInStockVO> page, @Param("ew") Wrapper<ReportInStockVO> queryWrapper);
/**
* 查询库存出库报表sql
*
* @param page
* @param queryWrapper
* @return
*/
List<ReportOutStockVO> getOutStocks(IPage<ReportOutStockVO> page, @Param("ew") Wrapper<ReportOutStockVO> queryWrapper);
}

8
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapper.xml

@ -16,9 +16,7 @@
allocation_title
from (select t.warehouse_name,
t.market_name,
case
when t.service_type = 2 then '市内库存品'
when t.service_type = 3 then '自提库存品' end service_type,
t.service_type service_type,
t.cargo_number,
t.description_goods,
t.quantity_stock,
@ -49,9 +47,7 @@
allocation_title
from (select t.warehouse_name,
t.market_name,
case
when t.service_type = 2 then '市内库存品'
when t.service_type = 3 then '自提库存品' end service_type,
t.service_type service_type,
t.cargo_number,
t.description_goods,
t.warehousing_time,

41
blade-service/logpm-report/src/main/java/com/logpm/report/query/StockOrderQuery.java

@ -0,0 +1,41 @@
package com.logpm.report.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springblade.core.mp.support.Query;
import java.util.Date;
/**
* 库存出库报表 query
*
* @author zhaoqiaobo
* @create 2024-03-13 14:21
*/
@ApiModel(value = "库存出库报表查询对象", description = "库存出库报表查询对象")
@Data
public class StockOrderQuery extends Query {
@ApiModelProperty(value = "入库时间开始(范围)", position = 2)
private Date startWarehouseEntryTime;
@ApiModelProperty(value = "入库时间结束(范围)", position = 3)
private Date endWarehouseEntryTime;
@ApiModelProperty(value = "仓库(范围)", position = 6)
private String warehouseRange;
@ApiModelProperty(value = "运单号(范围)", position = 8)
private String waybillNumberRange;
@ApiModelProperty(value = "商场名称(范围)", position = 10)
private String mallNameRange;
@ApiModelProperty(value = "收货人(范围)", position = 12)
private String consigneePersonRange;
@ApiModelProperty(value = "品牌(范围)", position = 14)
private String brandRange;
}

4
blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingDetailsReader.java

@ -3,7 +3,7 @@ package com.logpm.report.reader;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.report.mapper.ReportBillLoadingMapper;
import com.logpm.report.service.ExportReaderService;
import com.logpm.report.service.ExportReader;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
@ -15,7 +15,7 @@ import java.util.List;
* @create 2024-03-08 9:50
*/
@Component
public class BillLoadingDetailsReader implements ExportReaderService {
public class BillLoadingDetailsReader implements ExportReader {
@Resource
private ReportBillLoadingMapper billLoadingMapper;

4
blade-service/logpm-report/src/main/java/com/logpm/report/reader/BillLoadingTasksReader.java

@ -3,7 +3,7 @@ package com.logpm.report.reader;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.report.mapper.ReportBillLoadingMapper;
import com.logpm.report.service.ExportReaderService;
import com.logpm.report.service.ExportReader;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
@ -15,7 +15,7 @@ import java.util.List;
* @create 2024-03-08 9:50
*/
@Component
public class BillLoadingTasksReader implements ExportReaderService {
public class BillLoadingTasksReader implements ExportReader {
@Resource
private ReportBillLoadingMapper billLoadingMapper;

4
blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryCustomerReader.java

@ -3,7 +3,7 @@ package com.logpm.report.reader;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.report.mapper.ReportDeliverMapeer;
import com.logpm.report.service.ExportReaderService;
import com.logpm.report.service.ExportReader;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
@ -16,7 +16,7 @@ import java.util.List;
* @create 2024-03-08 9:50
*/
@Component
public class DeliveryCustomerReader implements ExportReaderService {
public class DeliveryCustomerReader implements ExportReader {
@Resource
private ReportDeliverMapeer reportDeliverMapeer;

4
blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java

@ -3,7 +3,7 @@ package com.logpm.report.reader;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.report.mapper.ReportDeliverMapeer;
import com.logpm.report.service.ExportReaderService;
import com.logpm.report.service.ExportReader;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
@ -16,7 +16,7 @@ import java.util.List;
* @create 2024-03-08 9:50
*/
@Component
public class DeliveryDetailReader implements ExportReaderService {
public class DeliveryDetailReader implements ExportReader {
@Resource
private ReportDeliverMapeer reportDeliverMapeer;

4
blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryInStocksReader.java

@ -3,7 +3,7 @@ package com.logpm.report.reader;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.report.mapper.ReportStockMapeer;
import com.logpm.report.service.ExportReaderService;
import com.logpm.report.service.ExportReader;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
@ -16,7 +16,7 @@ import java.util.List;
* @create 2024-03-08 9:50
*/
@Component
public class DeliveryInStocksReader implements ExportReaderService {
public class DeliveryInStocksReader implements ExportReader {
@Resource
private ReportStockMapeer reportStockMapeer;

4
blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryOutStocksReader.java

@ -3,7 +3,7 @@ package com.logpm.report.reader;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.report.mapper.ReportStockMapeer;
import com.logpm.report.service.ExportReaderService;
import com.logpm.report.service.ExportReader;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
@ -16,7 +16,7 @@ import java.util.List;
* @create 2024-03-08 9:50
*/
@Component
public class DeliveryOutStocksReader implements ExportReaderService {
public class DeliveryOutStocksReader implements ExportReader {
@Resource
private ReportStockMapeer reportStockMapeer;

4
blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryStockReader.java

@ -3,7 +3,7 @@ package com.logpm.report.reader;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.report.mapper.ReportStockMapeer;
import com.logpm.report.service.ExportReaderService;
import com.logpm.report.service.ExportReader;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
@ -16,7 +16,7 @@ import java.util.List;
* @create 2024-03-08 9:50
*/
@Component
public class DeliveryStockReader implements ExportReaderService {
public class DeliveryStockReader implements ExportReader {
@Resource
private ReportStockMapeer reportStockMapeer;

4
blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryTrainReader.java

@ -3,7 +3,7 @@ package com.logpm.report.reader;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.report.mapper.ReportDeliverMapeer;
import com.logpm.report.service.ExportReaderService;
import com.logpm.report.service.ExportReader;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
@ -16,7 +16,7 @@ import java.util.List;
* @create 2024-03-08 9:50
*/
@Component
public class DeliveryTrainReader implements ExportReaderService {
public class DeliveryTrainReader implements ExportReader {
@Resource
private ReportDeliverMapeer reportDeliverMapeer;

36
blade-service/logpm-report/src/main/java/com/logpm/report/reader/StockOrderReader.java

@ -0,0 +1,36 @@
package com.logpm.report.reader;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.report.mapper.ReportDeliverMapeer;
import com.logpm.report.service.ExportReader;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.List;
/**
*
* @author zhaoqiaobo
* @create 2024-03-08 9:50
*/
@Component
public class StockOrderReader implements ExportReader {
@Resource
private ReportDeliverMapeer reportDeliverMapeer;
@Override
public Long getCount(Wrapper query) {
Page page = new Page(1, 1);
reportDeliverMapeer.getStockOrderPage(page, query);
return page.getTotal();
}
@Override
public List<T> findList(Page page, Wrapper query) {
return reportDeliverMapeer.getStockOrderPage(page,query);
}
}

2
blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReaderService.java → blade-service/logpm-report/src/main/java/com/logpm/report/service/ExportReader.java

@ -12,7 +12,7 @@ import java.util.List;
* @author zhaoqiaobo
* @create 2024-03-07 18:14
*/
public interface ExportReaderService {
public interface ExportReader {
/**
* 导出的总条数

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

@ -8,14 +8,42 @@ import com.logpm.report.vo.BillLoadingTasksVO;
import javax.servlet.http.HttpServletResponse;
/**
* 自提报表接口
* @Author zqb
* @Date 2024/3/14
**/
public interface IReportBillLoadingAsyncService {
/**
* 自提明细报表分页
* @param vo
* @param query
* @return
*/
IPage<BillLoadingDetailsVO> detailsPage(BillLoadingDetailsVO vo, BillDetailsQuery query);
/**
* 导出自提明细报表excel
* @param response
* @param vo
* @param query
*/
void exportDetails(HttpServletResponse response, BillLoadingDetailsVO vo, BillDetailsQuery query);
/**
* 自提任务报表分页
* @param vo
* @param query
* @return
*/
IPage<BillLoadingTasksVO> tasksPage(BillLoadingTasksVO vo, BillLoadingTasksQuery query);
/**
* 导出自提任务报表excel
* @param response
* @param vo
* @param query
*/
void exportTasks(HttpServletResponse response, BillLoadingTasksVO vo, BillLoadingTasksQuery query);
}

60
blade-service/logpm-report/src/main/java/com/logpm/report/service/ReportDeliverService.java

@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.report.query.DevilerDetailsQuery;
import com.logpm.report.query.ReportCustomerQuery;
import com.logpm.report.query.ReportDevilerQuery;
import com.logpm.report.query.StockOrderQuery;
import com.logpm.report.vo.ReportCustomerVO;
import com.logpm.report.vo.ReportDetailVO;
import com.logpm.report.vo.ReportDevilerVO;
import com.logpm.report.vo.StockOrderVO;
import javax.servlet.http.HttpServletResponse;
@ -16,15 +18,73 @@ import javax.servlet.http.HttpServletResponse;
*/
public interface ReportDeliverService {
/**
* 配送车次报表分页
*
* @param vo
* @param query
* @return
*/
IPage<ReportDevilerVO> deliveryTrainPage(ReportDevilerVO vo, ReportDevilerQuery query);
/**
* 导出配送车次报表excel
*
* @param response
* @param vo
* @param query
*/
void exportTrain(HttpServletResponse response, ReportDevilerVO vo, ReportDevilerQuery query);
/**
* 查询配送客户分页
*
* @param vo
* @param query
* @return
*/
IPage<ReportCustomerVO> customerPage(ReportCustomerVO vo, ReportCustomerQuery query);
/**
* 导出配送客户报表excel
*
* @param response
* @param vo
* @param query
*/
void exportCustomer(HttpServletResponse response, ReportCustomerVO vo, ReportCustomerQuery query);
/**
* 查询配送明细分页
*
* @param vo
* @param query
* @return
*/
IPage<ReportDetailVO> detailsPage(ReportDetailVO vo, DevilerDetailsQuery query);
/**
* 导出配送明细报表excel
*
* @param response
* @param vo
* @param query
*/
void exportDetails(HttpServletResponse response, ReportDetailVO vo, DevilerDetailsQuery query);
/**
* 查询在库订单分页
* @param vo
* @param query
* @return
*/
IPage<StockOrderVO> stockOrderPage(StockOrderVO vo, StockOrderQuery query);
/**
* 导出在库订单excel
* @param response
* @param vo
* @param query
*/
void exportStockOrder(HttpServletResponse response, StockOrderVO vo, StockOrderQuery query);
}

42
blade-service/logpm-report/src/main/java/com/logpm/report/service/ReportStockService.java

@ -16,15 +16,57 @@ import javax.servlet.http.HttpServletResponse;
*/
public interface ReportStockService {
/**
* 查询库存品报表分页
*
* @param vo
* @param query
* @return
*/
IPage<StockDetailsVO> detailsPage(StockDetailsVO vo, StockDetailsQuery query);
/**
* 导出库存品报表excel
*
* @param response
* @param vo
* @param query
*/
void exportDetails(HttpServletResponse response, StockDetailsVO vo, StockDetailsQuery query);
/**
* 查询库存入库报表
*
* @param vo
* @param query
* @return
*/
IPage<ReportInStockVO> inStocks(ReportInStockVO vo, StockInQuery query);
/**
* 导出库存入库excel
*
* @param response
* @param vo
* @param query
*/
void exportInStocks(HttpServletResponse response, ReportInStockVO vo, StockInQuery query);
/**
* 查询库存出库报表
*
* @param vo
* @param query
* @return
*/
IPage<ReportOutStockVO> outStocks(ReportOutStockVO vo, StockOutQuery query);
/**
* 导出库存出库报表excel
*
* @param response
* @param vo
* @param query
*/
void exportOutStocks(HttpServletResponse response, ReportOutStockVO vo, StockOutQuery query);
}

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

@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.report.constant.ReportConstants;
import com.logpm.report.mapper.ReportBillLoadingMapper;
import com.logpm.report.query.BillDetailsQuery;
import com.logpm.report.query.BillLoadingTasksQuery;
@ -31,6 +32,12 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
/**
* 自提报表业务实现类
*
* @Author zqb
* @Date 2024/3/14
**/
@Log4j2
@Service
@AllArgsConstructor
@ -61,8 +68,8 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer
// 提货人
QueryUtil.splitEqQuery("bill_user", query.getBillUserRange(), queryWrapper);
// 提货时间
QueryUtil.timeGe("create_time", query.getStartCreatedTime(), queryWrapper);
QueryUtil.timeLe("create_time", query.getEndCreatedTime(), queryWrapper);
QueryUtil.timeGe("created_time", query.getStartCreatedTime(), queryWrapper);
QueryUtil.timeLe("created_time", query.getEndCreatedTime(), queryWrapper);
}
@Override
@ -91,7 +98,7 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer
}
}
R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ","));
if (ObjectUtil.equal(200, listR.getCode())) {
if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) {
List<User> data = listR.getData();
Map<Long, String> collect = data.stream().collect(Collectors.toMap(User::getId, User::getName));
for (BillLoadingDetailsVO detailsVO : detailsPage) {

35
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@ -6,15 +6,18 @@ import com.logpm.report.mapper.ReportDeliverMapeer;
import com.logpm.report.query.DevilerDetailsQuery;
import com.logpm.report.query.ReportCustomerQuery;
import com.logpm.report.query.ReportDevilerQuery;
import com.logpm.report.query.StockOrderQuery;
import com.logpm.report.reader.DeliveryCustomerReader;
import com.logpm.report.reader.DeliveryDetailReader;
import com.logpm.report.reader.DeliveryTrainReader;
import com.logpm.report.reader.StockOrderReader;
import com.logpm.report.service.ReportDeliverService;
import com.logpm.report.util.QueryUtil;
import com.logpm.report.util.ReportExcelUtil;
import com.logpm.report.vo.ReportCustomerVO;
import com.logpm.report.vo.ReportDetailVO;
import com.logpm.report.vo.ReportDevilerVO;
import com.logpm.report.vo.StockOrderVO;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springframework.stereotype.Service;
@ -33,6 +36,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
private final DeliveryTrainReader deliveryTrainReader;
private final DeliveryCustomerReader deliveryCustomerReader;
private final DeliveryDetailReader deliveryDetailReader;
private final StockOrderReader stockOrderReader;
@Override
public IPage<ReportDevilerVO> deliveryTrainPage(ReportDevilerVO vo, ReportDevilerQuery query) {
@ -139,4 +143,35 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
new ReportExcelUtil().export(response, deliveryDetailReader, ReportDetailVO.class, queryWrapper, "配送明细报表");
}
@Override
public IPage<StockOrderVO> stockOrderPage(StockOrderVO vo, StockOrderQuery query) {
IPage<StockOrderVO> page = Condition.getPage(query);
QueryWrapper<StockOrderVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, StockOrderVO.class);
stockOrderQuery(query, queryWrapper);
return page.setRecords(reportDeliverMapeer.getStockOrderPage(page, queryWrapper));
}
private void stockOrderQuery(StockOrderQuery query, QueryWrapper<StockOrderVO> queryWrapper) {
// 入库时间开始
QueryUtil.timeGe("warehouse_entry_time", query.getStartWarehouseEntryTime(), queryWrapper);
QueryUtil.timeLe("warehouse_entry_time", query.getEndWarehouseEntryTime(), queryWrapper);
// 仓库
QueryUtil.splitEqQuery("warehouse", query.getWarehouseRange(), queryWrapper);
// 运单号
QueryUtil.splitEqQuery("waybill_number", query.getWaybillNumberRange(), queryWrapper);
// 商场名称
QueryUtil.splitEqQuery("mall_name", query.getMallNameRange(), queryWrapper);
// 收货人
QueryUtil.splitEqQuery("consignee_person", query.getConsigneePersonRange(), queryWrapper);
// 品牌
QueryUtil.splitEqQuery("brand", query.getBrandRange(), queryWrapper);
}
@Override
public void exportStockOrder(HttpServletResponse response, StockOrderVO vo, StockOrderQuery query) {
QueryWrapper<StockOrderVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, StockOrderVO.class);
stockOrderQuery(query, queryWrapper);
new ReportExcelUtil().export(response, stockOrderReader, StockOrderVO.class, queryWrapper, "在库订单表");
}
}

22
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportStockServiceImpl.java

@ -1,5 +1,8 @@
package com.logpm.report.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.report.mapper.ReportStockMapeer;
@ -16,10 +19,14 @@ import com.logpm.report.vo.ReportInStockVO;
import com.logpm.report.vo.ReportOutStockVO;
import com.logpm.report.vo.StockDetailsVO;
import lombok.AllArgsConstructor;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springblade.system.feign.IDictBizClient;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* @author zhaoqiaobo
@ -33,6 +40,7 @@ public class ReportStockServiceImpl implements ReportStockService {
private final DeliveryStockReader deliveryStockReader;
private final DeliveryInStocksReader inStocksReader;
private final DeliveryOutStocksReader outStocksReader;
private final IDictBizClient dictBizClient;
@Override
public IPage<StockDetailsVO> detailsPage(StockDetailsVO vo, StockDetailsQuery query) {
@ -67,7 +75,19 @@ public class ReportStockServiceImpl implements ReportStockService {
IPage<ReportInStockVO> page = Condition.getPage(query);
QueryWrapper<ReportInStockVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportInStockVO.class);
inStocksCustomQuery(query, queryWrapper);
return page.setRecords(reportStockMapeer.getInStocks(page, queryWrapper));
List<ReportInStockVO> inStocks = reportStockMapeer.getInStocks(page, queryWrapper);
if (CollUtil.isNotEmpty(inStocks)) {
for (ReportInStockVO inStock : inStocks) {
String serviceType = inStock.getServiceType();
if (StrUtil.isNotBlank(serviceType)) {
R<String> value = dictBizClient.getValue(DictBizConstant.DISTRIBUTION_TYPE, serviceType);
if (ObjectUtil.isNotNull(value)) {
inStock.setServiceType(value.getData());
}
}
}
}
return page.setRecords(inStocks);
}
private void inStocksCustomQuery(StockInQuery query, QueryWrapper<ReportInStockVO> queryWrapper) {

3
blade-service/logpm-report/src/main/java/com/logpm/report/util/QueryUtil.java

@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.logpm.report.constant.ReportConstants;
import org.springblade.core.mp.support.Condition;
import java.util.Date;
@ -67,7 +68,7 @@ public class QueryUtil {
public static void splitEqQuery(String field, String value, QueryWrapper wrapper) {
if (StrUtil.isNotBlank(value)) {
String splitValue = value.replaceAll(",", ",");
if (value.contains(",")) {
if (value.contains(ReportConstants.PARAM_SPLITTER)) {
List<String> splits = StrUtil.split(splitValue, ",");
if (CollUtil.isNotEmpty(splits)) {
StrUtil.trim(splits.toArray(new String[0]));

35
blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java

@ -6,7 +6,8 @@ import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.report.service.ExportReaderService;
import com.logpm.report.constant.ReportConstants;
import com.logpm.report.service.ExportReader;
import org.apache.poi.ss.formula.functions.T;
import javax.servlet.http.HttpServletResponse;
@ -41,6 +42,7 @@ public class ReportExcelUtil {
/**
* 设置excel导出的返回头
*
* @param response HttpServletResponse对象
* @param fileName 文件名
*/
@ -56,30 +58,31 @@ public class ReportExcelUtil {
/**
* 多线程导出数据到excel 带默认参数 pageSize onceSheetDataNum
*
* @param response HttpServletResponse对象
* @param service ExportReaderService读取器接口实现类
* @param classz easyexcel 导出数据定义对象
* @param query 数据查询对象
* @param service ExportReaderService读取器接口实现类
* @param classz easyexcel 导出数据定义对象
* @param query 数据查询对象
* @param fileName 导出文件名称
*/
public void export(HttpServletResponse response, ExportReaderService service, Class classz, Wrapper query, String fileName) {
public void export(HttpServletResponse response, ExportReader service, Class classz, Wrapper query, String fileName) {
export(response, service, classz, query, fileName, PAGESIZE, SHEETDATANUM);
}
/**
* 多线程导出数据到excel
* 注意事项
* 1 需要定义导出数据读取器实现 ExportReaderService 接口.实现接口中的两个方法
* 1 需要定义导出数据读取器实现 ExportReaderService 接口.实现接口中的两个方法
*
* @param response HttpServletResponse对象
* @param service ExportReaderService读取器接口实现类
* @param classz easyexcel 导出数据定义对象
* @param query 数据查询对象
* @param fileName 导出文件名称
* @param pageSize 每次查询多少条数据
* @param response HttpServletResponse对象
* @param service ExportReaderService读取器接口实现类
* @param classz easyexcel 导出数据定义对象
* @param query 数据查询对象
* @param fileName 导出文件名称
* @param pageSize 每次查询多少条数据
* @param onceSheetDataNum 一个sheet页最大装多少条数据
*/
public void export(HttpServletResponse response, ExportReaderService service, Class classz, Wrapper query, String fileName, Long pageSize, Long onceSheetDataNum) {
public void export(HttpServletResponse response, ExportReader service, Class classz, Wrapper query, String fileName, Long pageSize, Long onceSheetDataNum) {
// 设置响应头
ReportExcelUtil.setExportHeader(response, fileName);
// 获取需要导出的总条数
@ -91,7 +94,7 @@ public class ReportExcelUtil {
// 总共需要查询数据库几次
int findNum = (int) Math.ceil((count / pageSize.doubleValue()));
// 封装查询后需要导出的数据
Map<Integer, List<Object>> pageMap = new HashMap<>();
Map<Integer, List<Object>> pageMap = new HashMap<>(ReportConstants.HASHMAP_DEFAULT_SIZE);
// 定义线程池,大表导出使用一个线程池
ExecutorService executorService = ThreadPoolUtil.getThreadPool();
// 控制线程全部查询完后执行导出操作
@ -128,9 +131,9 @@ public class ReportExcelUtil {
// 执行查询操作返回数据
List deliveryTrainPage = service.findList(page, query);
// 获取组装的数据列表
List<Object> reportDevilerVOS = pageMap.get(finalI);
List<Object> detailVo = pageMap.get(finalI);
// 将查询数据添加到本地缓存
if (CollectionUtil.isEmpty(reportDevilerVOS)) {
if (CollectionUtil.isEmpty(detailVo)) {
pageMap.put(finalI, deliveryTrainPage);
} else {
pageMap.get(finalI).addAll(deliveryTrainPage);

4
blade-service/logpm-report/src/main/java/com/logpm/report/util/ThreadPoolUtil.java

@ -16,7 +16,9 @@ public class ThreadPoolUtil {
private ThreadPoolUtil() {
}
//构建线程池
/**
* 导出线程池
*/
public static ExecutorService executor = null;
static {
init();

6
blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java

@ -87,7 +87,7 @@ public class BillLoadingTasksVO implements Serializable {
@ApiModelProperty(value = "实际提货件数")
@ExcelProperty("实际提货件数")
private String BillLoadingNum;
private String billLoadingNum;
@ApiModelProperty(value = "到付运费")
@ExcelProperty("到付运费")
@ -109,8 +109,8 @@ public class BillLoadingTasksVO implements Serializable {
@ExcelProperty("增值费")
private String addValueFee;
@ApiModelProperty(value = "增值费")
@ExcelProperty("增值费")
@ApiModelProperty(value = "费用合计")
@ExcelProperty("费用合计")
private String amountToFee;
@ApiModelProperty(value = "提货时间")

169
blade-service/logpm-report/src/main/java/com/logpm/report/vo/StockOrderVO.java

@ -0,0 +1,169 @@
package com.logpm.report.vo;
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 com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 在库订单表 vo
*
* @author zhaoqiaobo
* @create 2024-03-06 16:02
*/
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
@ApiModel(value = "在库订单表", description = "在库订单表")
@Data
public class StockOrderVO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "运单号", position = 7)
@ExcelProperty("运单号")
private String waybillNumber;
@ApiModelProperty(value = "服务号")
@ExcelProperty("服务号")
private String serviceNumber;
@ApiModelProperty(value = "订单自编号")
@ExcelProperty("订单自编号")
private String orderCode;
@ApiModelProperty(value = "商场名称", position = 9)
@ExcelProperty("商场名称")
private String mallName;
@ApiModelProperty(value = "货物名称")
@ExcelProperty("货物名称")
private String descriptionGoods;
@ApiModelProperty(value = "仓库", position = 5)
@ExcelProperty("仓库")
private String warehouse;
@ApiModelProperty(value = "入库时间", position = 1)
@ExcelProperty("入库时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date warehouseEntryTime;
@ApiModelProperty(value = "最新入库时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@ExcelProperty("最新入库时间")
private Date warehouseEntryTimeEnd;
@ApiModelProperty(value = "在库时间")
@ExcelProperty("在库时间")
private String storeTime;
@ApiModelProperty(value = "收货单位")
@ExcelProperty("收货单位")
private String consigneeUnit;
@ApiModelProperty(value = "收货人", position = 11)
@ExcelProperty("收货人")
private String consigneePerson;
@ApiModelProperty(value = "订单总件数")
@ExcelProperty("订单总件数")
private Integer totalNumber;
@ApiModelProperty(value = "在库件数")
@ExcelProperty("在库件数")
private Integer handQuantity;
@ApiModelProperty(value = "未入库数量")
@ExcelProperty("未入库数量")
private Integer notReceived;
@ApiModelProperty(value = "分拣件数")
@ExcelProperty("分拣件数")
private Integer sortingQuantity;
@ApiModelProperty(value = "配送件数")
@ExcelProperty("配送件数")
private Integer deliveryQuantity;
@ApiModelProperty(value = "中转件数")
@ExcelProperty("中转件数")
private Integer transferQuantity;
@ApiModelProperty(value = "签收件数")
@ExcelProperty("签收件数")
private Integer signinQuantity;
@ApiModelProperty(value = "上架状态")
@ExcelProperty("上架状态")
private String groundingStatus;
@ApiModelProperty(value = "品牌", position = 13)
@ExcelProperty("品牌")
private String brand;
@ApiModelProperty(value = "所在托盘")
@ExcelProperty("所在托盘")
private String trays;
@ApiModelProperty(value = "所在货位")
@ExcelProperty("所在货位")
private String allocation;
@ApiModelProperty(value = "冻结状态")
@ExcelProperty("冻结状态")
private String freezeStatus;
@ApiModelProperty(value = "订单状态")
@ExcelProperty("订单状态")
private String orderStatus;
@ApiModelProperty(value = "预约状态")
@ExcelProperty("预约状态")
private String reservationStatus;
@ApiModelProperty(value = "备货状态")
@ExcelProperty("备货状态")
private String stockupStatus;
@ApiModelProperty(value = "是否齐套")
@ExcelProperty("是否齐套")
private Integer completeSet;
@ApiModelProperty(value = "服务类型")
@ExcelProperty("服务类型")
private String typeService;
@ApiModelProperty(value = "顾客名字")
@ExcelProperty("顾客名字")
private String customerName;
@ApiModelProperty(value = "顾客电话")
@ExcelProperty("顾客电话")
private String customerTelephone;
@ApiModelProperty(value = "顾客地址")
@ExcelProperty("顾客地址")
private String customerAddress;
@ApiModelProperty(value = "增值服务")
@ExcelProperty("增值服务")
private BigDecimal fee;
@ApiModelProperty(value = "创建人")
@ExcelProperty("创建人")
private String createUser;
@ApiModelProperty(value = "创建时间")
@ExcelProperty("创建时间")
private String createTime;
}

6
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@ -772,7 +772,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
//查询当前包件盘点状态
QuestDetailEntity questDetail = new QuestDetailEntity();
questDetail.setId(Long.valueOf(i));
questDetail.setId(i);
questDetail.setQuestStatus(1);
questDetail.setUpdateUser(user.getUserId());
questDetail.setUpdateTime(new Date());
@ -1362,9 +1362,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
if (ObjectUtils.isNotNull(taskSearchDTO.getQuestDetailIds())) {
//修改盘点状态
List<QuestDetailEntity> questDetailEntities = new ArrayList<>();
taskSearchDTO.getQuestDetailIds().stream().forEach(i -> {
taskSearchDTO.getQuestDetailIds().forEach(i -> {
QuestDetailEntity questDetail = new QuestDetailEntity();
questDetail.setId(Long.valueOf(i));
questDetail.setId(i);
questDetail.setQuestStatus(0);
questDetailEntities.add(questDetail);
baseMapper.deleteQuestChild(taskSearchDTO.getQuestNum() + "_child", i);

6
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@ -2893,7 +2893,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
TrayTypeDataVO trayTypeDataVO = new TrayTypeDataVO();
trayTypeDataVO.setTrayTypeId(trayTypeId);
trayTypeDataVO.setType(type);
trayTypeDataVO.setTrayCode(trayTypeEntity.getTrayCode());
if(Func.isNotBlank(basicdataTrayEntity.getPalletName())){
trayTypeDataVO.setTrayCode(basicdataTrayEntity.getPalletName());
}else {
trayTypeDataVO.setTrayCode(basicdataTrayEntity.getPalletCode());
}
trayTypeDataVO.setTrayNum(trayTypeEntity.getTotalNum());
trayTypeDataVO.setName(trayTypeEntity.getFilterValue());
trayTypeDataVO.setOrderTotalNum(trayTypeEntity.getOrderTotalNum());

Loading…
Cancel
Save