54 changed files with 463 additions and 1123 deletions
@ -0,0 +1,12 @@
|
||||
package com.logpm.business.dto; |
||||
|
||||
import com.logpm.business.entity.BusinessPreOrderEntity; |
||||
|
||||
/** |
||||
* |
||||
*/ |
||||
public class BusinessPreOrderDTO extends BusinessPreOrderEntity { |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,28 @@
|
||||
package com.logpm.business.feign; |
||||
|
||||
import com.logpm.business.entity.BusinessPreOrderEntity; |
||||
import org.apache.ibatis.annotations.Param; |
||||
import org.springblade.common.constant.ModuleNameConstant; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.PostMapping; |
||||
import org.springframework.web.bind.annotation.RequestBody; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
||||
import java.util.List; |
||||
|
||||
@FeignClient( |
||||
value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME |
||||
) |
||||
public interface IBusinessPreOrderClient { |
||||
String API_PREFIX = "/client"; |
||||
String INORDERBYORDERPACKAGECODE = API_PREFIX + "/inOrderByOrderPackageCode"; |
||||
String SAVEOTHERDATABASENEW = API_PREFIX + "/saveOtherDataBaseNew"; |
||||
|
||||
@GetMapping(INORDERBYORDERPACKAGECODE) |
||||
Integer inOrderByOrderPackageCode(@RequestParam("orderPackageCode") String orderPackageCode, @RequestParam("carNum") String carNum); |
||||
|
||||
@PostMapping(SAVEOTHERDATABASENEW) |
||||
void saveOtherDataBaseNew(@RequestParam("userId") String tenantId, @RequestBody List<BusinessPreOrderEntity> dataResult, @RequestParam("userId") String mallName); |
||||
|
||||
} |
||||
@ -0,0 +1,14 @@
|
||||
package com.logpm.business.vo; |
||||
|
||||
import com.logpm.business.entity.BusinessPreOrderEntity; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* |
||||
*/ |
||||
@Data |
||||
public class BusinessPreOrderVO extends BusinessPreOrderEntity { |
||||
|
||||
|
||||
|
||||
} |
||||
@ -1,21 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" |
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
||||
<modelVersion>4.0.0</modelVersion> |
||||
|
||||
<groupId>org.springblade</groupId> |
||||
<artifactId>logpm-business-conversion-api</artifactId> |
||||
<version>3.2.0.RELEASE</version> |
||||
<parent> |
||||
<groupId>org.springblade</groupId> |
||||
<version>3.2.0.RELEASE</version> |
||||
<artifactId>blade-service-api</artifactId> |
||||
</parent> |
||||
<properties> |
||||
<maven.compiler.source>8</maven.compiler.source> |
||||
<maven.compiler.target>8</maven.compiler.target> |
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
||||
</properties> |
||||
|
||||
</project> |
||||
@ -1,13 +0,0 @@
|
||||
package com.logpm.business.dto; |
||||
|
||||
import com.logpm.business.entity.DistributionBusinessPreOrderEntity; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* |
||||
*/ |
||||
public class DistributionBusinessPreOrderDTO extends DistributionBusinessPreOrderEntity { |
||||
|
||||
|
||||
|
||||
} |
||||
@ -1,14 +0,0 @@
|
||||
package com.logpm.business.vo; |
||||
|
||||
import com.logpm.business.entity.DistributionBusinessPreOrderEntity; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* |
||||
*/ |
||||
@Data |
||||
public class DistributionBusinessPreOrderVO extends DistributionBusinessPreOrderEntity { |
||||
|
||||
|
||||
|
||||
} |
||||
@ -1,18 +0,0 @@
|
||||
package com.logpm.distribution.feign; |
||||
|
||||
import org.springblade.common.constant.ModuleNameConstant; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
||||
@FeignClient( |
||||
value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME |
||||
) |
||||
public interface IDistributionBusinessPreOrderClient { |
||||
|
||||
|
||||
String API_PREFIX = "/client"; |
||||
String INORDERBYORDERPACKAGECODE = API_PREFIX + "/inOrderByOrderPackageCode"; |
||||
@GetMapping(INORDERBYORDERPACKAGECODE) |
||||
Integer inOrderByOrderPackageCode(@RequestParam("orderPackageCode") String orderPackageCode, @RequestParam("carNum") String carNum); |
||||
} |
||||
@ -0,0 +1,28 @@
|
||||
package com.logpm.business.feign; |
||||
|
||||
import com.logpm.business.entity.BusinessPreOrderEntity; |
||||
import com.logpm.business.service.IBusinessAsyncService; |
||||
import com.logpm.business.service.IBusinessPreOrderService; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
import java.util.List; |
||||
|
||||
@ApiIgnore() |
||||
@RestController |
||||
@AllArgsConstructor |
||||
public class BusinessPreOrderClient implements IBusinessPreOrderClient{ |
||||
private final IBusinessPreOrderService distributionIBusinessPreOrderService; |
||||
private final IBusinessAsyncService businessAsyncService; |
||||
|
||||
@Override |
||||
public Integer inOrderByOrderPackageCode(String orderPackageCode, String carNum) { |
||||
return distributionIBusinessPreOrderService.inOrderByOrderPackageCode(orderPackageCode,carNum); |
||||
} |
||||
|
||||
@Override |
||||
public void saveOtherDataBaseNew(String tenantId, List<BusinessPreOrderEntity> dataResult, String mallName) { |
||||
businessAsyncService.saveOtherDataBaseNew(tenantId,dataResult,mallName); |
||||
} |
||||
} |
||||
@ -1,62 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.business.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.logpm.business.dto.BusinessPreListDTO; |
||||
import com.logpm.business.dto.DistributionBusinessPreOrderDTO; |
||||
import com.logpm.business.entity.DistributionBusinessPreOrderEntity; |
||||
import com.logpm.business.vo.DistributionBusinessPreCarNumberVO; |
||||
import com.logpm.business.vo.DistributionBusinessPreOrderVO; |
||||
import org.apache.ibatis.annotations.Param; |
||||
|
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* 商家预备导入数据信息 Mapper 接口 |
||||
* |
||||
* @author cyz |
||||
* @since 2023-06-13 |
||||
*/ |
||||
public interface DistributionBusinessPreOrderMapper extends BaseMapper<DistributionBusinessPreOrderEntity> { |
||||
|
||||
|
||||
/** |
||||
* 查询DistributionBusinessPreOrderVO列表 |
||||
* |
||||
* @param page |
||||
* @param param |
||||
* @return |
||||
*/ |
||||
IPage<DistributionBusinessPreOrderVO> pageList(IPage<DistributionBusinessPreOrderVO> page, @Param("param") DistributionBusinessPreOrderDTO param); |
||||
|
||||
/** |
||||
* 删除商家端数据 |
||||
* |
||||
* @param deletedPackageList |
||||
* @return |
||||
*/ |
||||
Integer deleteBusinessPreOrder(String reservationCode, List<String> deletedPackageList); |
||||
|
||||
List<DistributionBusinessPreOrderEntity> listByBusinessPreListDTO(@Param("queryrderDTO") BusinessPreListDTO queryrderDTO); |
||||
|
||||
Integer updateBusinessPreOrderByOrderPackageCode(@Param("orderPackageCode") String orderPackageCode); |
||||
|
||||
IPage<DistributionBusinessPreCarNumberVO> pageByCarNum(IPage<DistributionBusinessPreCarNumberVO> page, Map<String, Object> distributionBusinessPreOrderDTO); |
||||
} |
||||
@ -1,187 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="com.logpm.business.mapper.DistributionBusinessPreOrderMapper"> |
||||
<update id="updateBusinessPreOrderByOrderPackageCode"> |
||||
|
||||
|
||||
update logpm_business_pre_order set in_warehouse=1 |
||||
|
||||
where order_package_code=#{orderPackageCode} and is_deleted=0 and in_warehouse=0 |
||||
|
||||
</update> |
||||
<delete id="deleteBusinessPreOrder"> |
||||
DELETE FROM logpm_business_pre_order WHERE reservation_code = #{reservationCode} |
||||
AND order_package_code IN |
||||
<foreach |
||||
collection="orderPackageList" item="orderPackageCode" open="(" separator="," close=")"> |
||||
#{orderPackageCode} |
||||
</foreach> |
||||
</delete> |
||||
|
||||
|
||||
<select id="pageList" resultType="com.logpm.business.vo.DistributionBusinessPreOrderVO"> |
||||
SELECT |
||||
id, |
||||
firsts, |
||||
`SECOND`, |
||||
third_product, |
||||
quantity, |
||||
train_number, |
||||
order_code, |
||||
service_number, |
||||
material_name, |
||||
material_code, |
||||
brand_name, |
||||
waybill_number, |
||||
dealer_name, |
||||
dealer_code, |
||||
order_package_code, |
||||
reservation_code, |
||||
operation_status, |
||||
distr_car_number, |
||||
send_warehouse_name, |
||||
accept_warehouse_name, |
||||
weight, |
||||
volume, |
||||
driver_name, |
||||
vehicle_name, |
||||
in_warehouse |
||||
FROM |
||||
logpm_business_pre_order |
||||
<where> |
||||
is_deleted = 0 |
||||
<if test="param.id != null and param.id != ''"> |
||||
AND id = #{param.id} |
||||
</if> |
||||
<if test="param.firsts != null and param.firsts != ''"> |
||||
AND firsts like concat(#{param.id},'%') |
||||
</if> |
||||
<if test="param.second != null and param.second != ''"> |
||||
AND `SECOND` like concat(#{param.second},'%') |
||||
</if> |
||||
<if test="param.thirdProduct != null and param.thirdProduct != ''"> |
||||
AND third_product like concat(#{param.thirdProduct},'%') |
||||
</if> |
||||
<if test="param.trainNumber != null and param.trainNumber != ''"> |
||||
AND train_number like concat(#{param.trainNumber},'%') |
||||
</if> |
||||
<if test="param.orderCode != null and param.orderCode != ''"> |
||||
AND order_code like concat(#{param.orderCode},'%') |
||||
</if> |
||||
<if test="param.serviceNumber != null and param.serviceNumber != ''"> |
||||
AND service_number like concat(#{param.serviceNumber},'%') |
||||
</if> |
||||
<if test="param.materialName != null and param.materialName != ''"> |
||||
AND material_name like concat(#{param.materialName},'%') |
||||
</if> |
||||
<if test="param.materialCode != null and param.materialCode != ''"> |
||||
AND material_code like concat(#{param.materialCode},'%') |
||||
</if> |
||||
<if test="param.brandName != null and param.brandName != ''"> |
||||
AND brand_name like concat(#{param.brandName},'%') |
||||
</if> |
||||
<if test="param.waybillNumber != null and param.waybillNumber != ''"> |
||||
AND waybill_number like concat(#{param.waybillNumber},'%') |
||||
</if> |
||||
<if test="param.dealerName != null and param.dealerName != ''"> |
||||
AND dealer_name like concat(#{param.dealerName},'%') |
||||
</if> |
||||
<if test="param.dealerCode != null and param.dealerCode != ''"> |
||||
AND dealer_code like concat(#{param.dealerCode},'%') |
||||
</if> |
||||
<if test="param.sendWarehouseName != null and param.sendWarehouseName != ''"> |
||||
AND send_warehouse_name like concat(#{param.sendWarehouseName},'%') |
||||
</if> |
||||
<if test="param.acceptWarehouseName != null and param.acceptWarehouseName != ''"> |
||||
AND accept_warehouse_name like concat(#{param.acceptWarehouseName},'%') |
||||
</if> |
||||
<if test="param.driverName != null and param.driverName != ''"> |
||||
AND driver_name like concat(#{param.driverName},'%') |
||||
</if> |
||||
<if test="param.vehicleName != null and param.vehicleName != ''"> |
||||
AND vehicle_name like concat(#{param.vehicleName},'%') |
||||
</if> |
||||
<if test="param.distrCarNumber != null and param.distrCarNumber != ''"> |
||||
AND distr_car_number like concat(#{param.distrCarNumber},'%') |
||||
</if> |
||||
<if test="param.inWarehouse != null "> |
||||
AND in_warehouse = #{param.inWarehouse} |
||||
</if> |
||||
|
||||
|
||||
</where> |
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</select> |
||||
<select id="listByBusinessPreListDTO" resultType="com.logpm.business.entity.DistributionBusinessPreOrderEntity"> |
||||
|
||||
SELECT |
||||
id, |
||||
firsts, |
||||
`SECOND`, |
||||
third_product, |
||||
quantity, |
||||
train_number, |
||||
order_code, |
||||
order_package_code, |
||||
service_number, |
||||
material_name, |
||||
material_code, |
||||
brand_name, |
||||
waybill_number, |
||||
dealer_name, |
||||
dealer_code, |
||||
send_warehouse_name, |
||||
accept_warehouse_name, |
||||
weight, |
||||
volume, |
||||
driver_name, |
||||
vehicle_name, |
||||
distr_car_number, |
||||
in_warehouse |
||||
FROM |
||||
logpm_business_pre_order |
||||
<where> |
||||
is_deleted = 0 |
||||
<if test="queryrderDTO.reservationCode != null and queryrderDTO.reservationCode != ''"> |
||||
AND reservation_code = #{queryrderDTO.reservationCode} |
||||
</if> |
||||
</where> |
||||
|
||||
</select> |
||||
<select id="pageByCarNum" resultType="com.logpm.business.vo.DistributionBusinessPreCarNumberVO"> |
||||
|
||||
SELECT distr_car_number, |
||||
waybill_number, |
||||
order_code, |
||||
COUNT(1) as totalNum, |
||||
COUNT(CASE WHEN in_warehouse = 1 THEN 1 END) as inNum, |
||||
COUNT(1)-COUNT(CASE WHEN in_warehouse = 1 THEN 1 END) as restNum |
||||
from logpm_business_pre_order |
||||
|
||||
<where> |
||||
is_deleted=0 |
||||
<if test="distributionBusinessPreOrderDTO.distrCarNumber != null and distributionBusinessPreOrderDTO.distrCarNumber != ''"> |
||||
AND distr_car_number = #{distributionBusinessPreOrderDTO.distrCarNumber} |
||||
</if> |
||||
<if test="distributionBusinessPreOrderDTO.waybillNumber != null and distributionBusinessPreOrderDTO.waybillNumber != ''"> |
||||
and waybill_number=#{distributionBusinessPreOrderDTO.waybillNumber} |
||||
</if> |
||||
<if test="distributionBusinessPreOrderDTO.orderCode != null and distributionBusinessPreOrderDTO.orderCode != ''"> |
||||
and order_code LIKE CONCAT(#{distributionBusinessPreOrderDTO.orderCode},'%') |
||||
</if> |
||||
|
||||
</where> |
||||
GROUP BY |
||||
distr_car_number, |
||||
waybill_number, |
||||
order_code |
||||
</select> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,11 @@
|
||||
package com.logpm.business.service; |
||||
|
||||
import com.logpm.business.entity.BusinessPreOrderEntity; |
||||
import org.springblade.common.annotations.ChangeAsync; |
||||
|
||||
import java.util.List; |
||||
|
||||
public interface IBusinessAsyncService { |
||||
|
||||
public void saveOtherDataBaseNew(String tenantId, List<BusinessPreOrderEntity> dataResult, String mallName); |
||||
} |
||||
@ -1,55 +0,0 @@
|
||||
package com.logpm.business.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.logpm.business.bean.Resp; |
||||
import com.logpm.business.dto.BusinessPreListDTO; |
||||
import com.logpm.business.entity.DistributionBusinessPreOrderEntity; |
||||
import com.logpm.business.vo.DistributionBusinessPreCarNumberVO; |
||||
import com.logpm.business.vo.DistributionBusinessPreOrderListVO; |
||||
import com.logpm.business.vo.DistributionBusinessPreOrderVO; |
||||
import org.springblade.core.log.exception.ServiceException; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
|
||||
import java.util.List; |
||||
import java.util.Map; |
||||
import java.util.concurrent.ExecutionException; |
||||
|
||||
public interface IDistributionBusinessPreOrderService extends BaseService<DistributionBusinessPreOrderEntity> { |
||||
/** |
||||
* 预备入库ID集合 |
||||
* @param ids |
||||
* @return |
||||
*/ |
||||
Boolean inOrder(String ids) throws ServiceException; |
||||
|
||||
|
||||
/** |
||||
* 更新预入库状态 |
||||
* @param orderPackageCode 包条码 |
||||
* @param carNum 入库的配送车次 |
||||
* @return |
||||
*/ |
||||
Integer inOrderByOrderPackageCode(String orderPackageCode,String carNum); |
||||
|
||||
/** |
||||
* 查询DistributionBusinessPreOrder列表 |
||||
* @param distributionBusinessPreOrderDTO |
||||
* @param page |
||||
* @return |
||||
*/ |
||||
IPage<DistributionBusinessPreOrderVO> pacgeList(Map<String, Object> distributionBusinessPreOrderDTO, IPage<DistributionBusinessPreOrderVO> page); |
||||
|
||||
/** |
||||
* 删除商家端数据 |
||||
* @param k |
||||
* @param deletedPackageList |
||||
* @return |
||||
*/ |
||||
Integer deleteBusinessPreOrder(String k, List<String> deletedPackageList); |
||||
DistributionBusinessPreOrderListVO list(BusinessPreListDTO queryrderDTO); |
||||
|
||||
Resp inOrderWarehourse(String orderPackageCode, String reservationCode) throws ExecutionException, InterruptedException; |
||||
|
||||
IPage<DistributionBusinessPreCarNumberVO> pageByCarNum(Map<String, Object> distributionBusinessPreOrderDTO, IPage<DistributionBusinessPreCarNumberVO> page); |
||||
|
||||
} |
||||
@ -0,0 +1,83 @@
|
||||
package com.logpm.business.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
||||
import com.logpm.business.entity.BusinessPreOrderEntity; |
||||
import com.logpm.business.service.IBusinessAsyncService; |
||||
import com.logpm.business.service.IBusinessPreOrderService; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.log4j.Log4j2; |
||||
import org.springblade.common.annotations.ChangeAsync; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.core.tool.utils.ObjectUtil; |
||||
import org.springblade.system.entity.Tenant; |
||||
import org.springblade.system.feign.ISysClient; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.ArrayList; |
||||
import java.util.List; |
||||
import java.util.stream.Collectors; |
||||
|
||||
@Log4j2 |
||||
@Service |
||||
@AllArgsConstructor |
||||
public class BusinessAsyncServiceImpl implements IBusinessAsyncService { |
||||
|
||||
private final IBusinessPreOrderService businessPreOrderService; |
||||
private final ISysClient sysClient; |
||||
|
||||
@ChangeAsync() |
||||
@Override |
||||
public void saveOtherDataBaseNew(String tenantId, List<BusinessPreOrderEntity> dataResult, String mallName) { |
||||
|
||||
List<Long> orderIdList = dataResult.stream() |
||||
.map(BusinessPreOrderEntity::getStockArticleId) |
||||
.collect(Collectors.toList()); |
||||
R<Tenant> tenantByName = sysClient.getTenantByName(mallName); |
||||
if (tenantByName.isSuccess()) { |
||||
Tenant tenant = tenantByName.getData(); |
||||
if (ObjectUtil.isEmpty(tenant)) { |
||||
log.info(">>>>>>>>>>>>> saveOtherDataBaseNew 租户不存在"); |
||||
return; |
||||
} |
||||
if (dataResult.isEmpty()) { |
||||
log.info(" saveOtherDataBaseNew dataResult 参数错误"); |
||||
} |
||||
|
||||
LambdaQueryWrapper<BusinessPreOrderEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>(); |
||||
lambdaQueryWrapper.eq(BusinessPreOrderEntity::getInWarehouse, 0); |
||||
lambdaQueryWrapper.in(BusinessPreOrderEntity::getStockArticleId, orderIdList); |
||||
List<BusinessPreOrderEntity> list = businessPreOrderService.list(lambdaQueryWrapper); |
||||
|
||||
|
||||
// 找到已经推送的包件信息 并将其标记为删除状态
|
||||
List<Long> temsp = new ArrayList<>(); |
||||
for (BusinessPreOrderEntity distributionBusinessPreOrderEntity : list) { |
||||
|
||||
for (BusinessPreOrderEntity businessPreOrderEntity : dataResult) { |
||||
businessPreOrderEntity.setTenantId(tenant.getTenantId()); |
||||
|
||||
|
||||
if (businessPreOrderEntity.getStockArticleId().equals(distributionBusinessPreOrderEntity.getStockArticleId())) { |
||||
// 找到订单
|
||||
|
||||
if (businessPreOrderEntity.getOrderPackageCode().equals(distributionBusinessPreOrderEntity.getOrderPackageCode())) { |
||||
//找到包件 并标记为删除状态
|
||||
temsp.add(distributionBusinessPreOrderEntity.getId()); |
||||
} |
||||
} |
||||
} |
||||
} |
||||
if (!temsp.isEmpty()) { |
||||
// 更新删除状态
|
||||
businessPreOrderService.deleteLogic(temsp); |
||||
} |
||||
for (BusinessPreOrderEntity distributionBusinessPreOrderEntity : dataResult) { |
||||
distributionBusinessPreOrderEntity.setTenantId(tenant.getTenantId()); |
||||
} |
||||
|
||||
// 执行保存操作
|
||||
businessPreOrderService.saveBatch(dataResult); |
||||
|
||||
} |
||||
} |
||||
} |
||||
@ -1,249 +0,0 @@
|
||||
package com.logpm.business.service.impl; |
||||
|
||||
import com.alibaba.fastjson.JSONObject; |
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; |
||||
import com.logpm.basicdata.entity.BasicdataWarehouseEntity; |
||||
import com.logpm.basicdata.feign.IBasicdataWarehouseClient; |
||||
import com.logpm.business.bean.Resp; |
||||
import com.logpm.business.dto.BusinessPreListDTO; |
||||
import com.logpm.business.dto.DistributionBusinessPreOrderDTO; |
||||
import com.logpm.business.entity.DistributionBusinessPreOrderEntity; |
||||
import com.logpm.business.mapper.DistributionBusinessPreOrderMapper; |
||||
import com.logpm.business.service.IDistributionBusinessPreOrderService; |
||||
import com.logpm.business.vo.DistributionBusinessPreCarNumberVO; |
||||
import com.logpm.business.vo.DistributionBusinessPreOrderListVO; |
||||
import com.logpm.business.vo.DistributionBusinessPreOrderVO; |
||||
import com.logpm.trunkline.dto.InComingDTO; |
||||
import com.logpm.trunkline.feign.IInComingClient; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.common.constant.IncomingTypeEnum; |
||||
import org.springblade.core.log.exception.ServiceException; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.ArrayList; |
||||
import java.util.Arrays; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
import java.util.stream.Collectors; |
||||
|
||||
@Service |
||||
@AllArgsConstructor |
||||
public class IDistributionBusinessPreOrderServiceImpl extends BaseServiceImpl<DistributionBusinessPreOrderMapper, DistributionBusinessPreOrderEntity> implements IDistributionBusinessPreOrderService { |
||||
|
||||
|
||||
private final IBasicdataWarehouseClient basicdataWarehouseClient; |
||||
|
||||
private final IInComingClient inComingClient; |
||||
|
||||
@Override |
||||
public Boolean inOrder(String ids) throws ServiceException { |
||||
|
||||
// 查询出来需要处理的包条码
|
||||
List<String> idArray = Arrays.asList(ids.split(",")); |
||||
QueryWrapper wrapper = new QueryWrapper(); |
||||
wrapper.in("id", idArray); |
||||
|
||||
InComingDTO inComingDTO = new InComingDTO(); |
||||
StringBuffer sb = new StringBuffer(); |
||||
List<DistributionBusinessPreOrderEntity> list = baseMapper.selectList(wrapper); |
||||
|
||||
List<DistributionBusinessPreOrderEntity> data = new ArrayList<>(); |
||||
for (DistributionBusinessPreOrderEntity distributionBusinessPreOrderEntity : list) { |
||||
|
||||
if (distributionBusinessPreOrderEntity.getInWarehouse() == 1) { |
||||
throw new ServiceException("存在已入库的包件"); |
||||
} |
||||
if(!sb.toString().isEmpty()){ |
||||
sb.append(","); |
||||
} |
||||
sb.append(distributionBusinessPreOrderEntity.getOrderPackageCode()); |
||||
data.add(distributionBusinessPreOrderEntity); |
||||
} |
||||
|
||||
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); |
||||
inComingDTO.setOrderPackageCode(sb.toString()); |
||||
inComingDTO.setIncomingType(IncomingTypeEnum.LINE_INCOMING.getCode()); |
||||
inComingDTO.setWarehouseId(myCurrentWarehouse.getId()); |
||||
inComingDTO.setWarehouseName(myCurrentWarehouse.getName()); |
||||
R r = inComingClient.incomingPackage(inComingDTO); |
||||
if(r.isSuccess()){ |
||||
// 更新成功
|
||||
for (DistributionBusinessPreOrderEntity distributionBusinessPreOrderEntity : data) { |
||||
distributionBusinessPreOrderEntity.setInWarehouse(1); |
||||
baseMapper.updateById(distributionBusinessPreOrderEntity); |
||||
} |
||||
} |
||||
return true; |
||||
} |
||||
|
||||
|
||||
|
||||
@Override |
||||
public Integer inOrderByOrderPackageCode(String orderPackageCode,String carNum) { |
||||
|
||||
|
||||
QueryWrapper wrapper = new QueryWrapper(); |
||||
wrapper.eq("order_package_code", orderPackageCode); |
||||
// wrapper.eq("in_warehouse",0);
|
||||
wrapper.eq("is_deleted","0"); |
||||
List<DistributionBusinessPreOrderEntity> list = baseMapper.selectList(wrapper); |
||||
if(!list.isEmpty()){ |
||||
DistributionBusinessPreOrderEntity distributionBusinessPreOrderEntity = list.get(0); |
||||
|
||||
distributionBusinessPreOrderEntity.setInWarehouse(1); |
||||
return baseMapper.updateById(distributionBusinessPreOrderEntity); |
||||
} |
||||
return 0; |
||||
|
||||
|
||||
} |
||||
|
||||
|
||||
@Override |
||||
public IPage<DistributionBusinessPreOrderVO> pacgeList(Map<String, Object> distributionBusinessPreOrderDTO, IPage<DistributionBusinessPreOrderVO> page) { |
||||
DistributionBusinessPreOrderDTO param = JSONObject.parseObject(JSONObject.toJSONString(distributionBusinessPreOrderDTO), DistributionBusinessPreOrderDTO.class); |
||||
return baseMapper.pageList(page, param); |
||||
} |
||||
|
||||
@Override |
||||
public Integer deleteBusinessPreOrder(String k, List<String> deletedPackageList) { |
||||
|
||||
return baseMapper.deleteBusinessPreOrder(k, deletedPackageList); |
||||
} |
||||
|
||||
|
||||
@Override |
||||
public DistributionBusinessPreOrderListVO list(BusinessPreListDTO queryrderDTO) { |
||||
|
||||
DistributionBusinessPreOrderListVO distributionBusinessPreOrderListVO = new DistributionBusinessPreOrderListVO(); |
||||
|
||||
|
||||
List<DistributionBusinessPreOrderEntity> data = baseMapper.listByBusinessPreListDTO(queryrderDTO); |
||||
|
||||
|
||||
// data 分组
|
||||
Map<Integer, List<DistributionBusinessPreOrderEntity>> groupedData = data.stream() |
||||
.collect(Collectors.groupingBy(DistributionBusinessPreOrderEntity::getInWarehouse)); |
||||
|
||||
// 已入库的
|
||||
List<DistributionBusinessPreOrderEntity> distributionBusinessPreOrderEntities = groupedData.get(1); |
||||
|
||||
|
||||
List<DistributionBusinessPreOrderVO> result = new ArrayList<>(); |
||||
for (DistributionBusinessPreOrderEntity datum : data) { |
||||
|
||||
if(datum.getInWarehouse() .equals(queryrderDTO.getInWarehouse()) ){ |
||||
DistributionBusinessPreOrderVO copy = BeanUtil.copy(datum, DistributionBusinessPreOrderVO.class); |
||||
result.add(copy); |
||||
} |
||||
|
||||
} |
||||
distributionBusinessPreOrderListVO.setList(result); |
||||
distributionBusinessPreOrderListVO.setSumNum(data.size()); |
||||
distributionBusinessPreOrderListVO.setInNum(ObjectUtils.isEmpty(distributionBusinessPreOrderEntities) ? 0 : distributionBusinessPreOrderEntities.size()); |
||||
|
||||
|
||||
return distributionBusinessPreOrderListVO; |
||||
|
||||
|
||||
} |
||||
|
||||
@Override |
||||
public Resp inOrderWarehourse(String orderPackageCode, String reservationCode) { |
||||
|
||||
|
||||
// // 查询当前预约单所有的包件
|
||||
//
|
||||
// LambdaQueryWrapper<DistributionBusinessPreOrderEntity> queryWrapper = new LambdaQueryWrapper<>();
|
||||
// queryWrapper.eq(DistributionBusinessPreOrderEntity::getReservationCode, reservationCode);
|
||||
// List<DistributionBusinessPreOrderEntity> list = baseMapper.selectList(queryWrapper);
|
||||
//
|
||||
// // 寻找 当前匹配的包条
|
||||
// DistributionBusinessPreOrderEntity t = null;
|
||||
// DistributionBusinessPreOrderEntity t1 = null;
|
||||
// for (DistributionBusinessPreOrderEntity distributionBusinessPreOrderEntity : list) {
|
||||
// if (distributionBusinessPreOrderEntity.getOrderPackageCode().equals(orderPackageCode)) {
|
||||
// // 找到匹配的包条码
|
||||
// if (distributionBusinessPreOrderEntity.getInWarehouse() == 1) {
|
||||
// return Resp.scanSuccess("扫描成功", "包件已入库");
|
||||
// } else {
|
||||
// t = distributionBusinessPreOrderEntity;
|
||||
// }
|
||||
// }
|
||||
// if (t1 == null) {
|
||||
// t1 = distributionBusinessPreOrderEntity;
|
||||
// }
|
||||
// }
|
||||
// if (t == null) {
|
||||
// try {
|
||||
// DistributionBusinessPreOrderEntity finalT = t1;
|
||||
// CompletableFuture<DistributionParcelListEntity> distributionParcelListEntityCompletableFuture = CompletableFuture.supplyAsync(() -> this.selectByOrderPackageCode(orderPackageCode, finalT.getAcceptWarehouseId()));
|
||||
//
|
||||
// DistributionParcelListEntity distributionParcelListEntity = distributionParcelListEntityCompletableFuture.get();
|
||||
//
|
||||
// // 如找到了 保存在当前的这个配送计划任务中
|
||||
// if (distributionParcelListEntity != null) {
|
||||
// // 保存包件
|
||||
// t = BeanUtil.copy(distributionParcelListEntity, DistributionBusinessPreOrderEntity.class);
|
||||
// t.setDriverName(finalT.getDriverName());
|
||||
// t.setVehicleName(finalT.getVehicleName());
|
||||
// t.setDistrCarNumber(finalT.getTrainNumber());
|
||||
// t.setOperationStatus(1);
|
||||
// t.setInWarehouse(0);
|
||||
// this.save(t);
|
||||
// list.add(t);
|
||||
//
|
||||
// }
|
||||
// } catch (InterruptedException | ExecutionException e) {
|
||||
// log.error("inOrderWarehourse:", e);
|
||||
// throw new ServiceException("包件信息不存在！");
|
||||
// }
|
||||
//
|
||||
//
|
||||
// }
|
||||
//
|
||||
// // 保存订单
|
||||
// DistributionStockArticleEntity stockArticleEntity = buildDistributionStockArticleEntity(t);
|
||||
// if (stockArticleEntity == null) {
|
||||
// return Resp.scanFail("操作失败", "包件数据不存在");
|
||||
// }
|
||||
// // 保存包件
|
||||
// t.setWarehouseId(stockArticleEntity.getWarehouseId());
|
||||
// t.setWarehouse(stockArticleEntity.getWarehouse());
|
||||
// t.setStockArticleId(stockArticleEntity.getId());
|
||||
// buildDistributionParcelListEntity(t);
|
||||
//
|
||||
// // 调用入库方法
|
||||
// t.setInWarehouse(1);
|
||||
// baseMapper.updateById(t);
|
||||
//
|
||||
// queryWrapper.eq(DistributionBusinessPreOrderEntity::getInWarehouse, 1);
|
||||
// Long l = baseMapper.selectCount(queryWrapper);
|
||||
|
||||
|
||||
return Resp.scanSuccess("扫描成功", "请前往码板打托进行入库！"); |
||||
} |
||||
|
||||
|
||||
@Override |
||||
public IPage<DistributionBusinessPreCarNumberVO> pageByCarNum(Map<String, Object> distributionBusinessPreOrderDTO, IPage<DistributionBusinessPreCarNumberVO> page) { |
||||
|
||||
IPage<DistributionBusinessPreCarNumberVO> pageByCarNum =baseMapper.pageByCarNum(page, distributionBusinessPreOrderDTO); |
||||
|
||||
return pageByCarNum; |
||||
|
||||
} |
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
} |
||||
@ -1,4 +1,4 @@
|
||||
package com.logpm.distribution.appcontroller; |
||||
package com.logpm.distribution.api; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
@ -1,4 +1,4 @@
|
||||
package com.logpm.distribution.appcontroller; |
||||
package com.logpm.distribution.api; |
||||
|
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import com.logpm.distribution.dto.app.queryOrderDTO; |
||||
@ -1,4 +1,4 @@
|
||||
package com.logpm.distribution.appcontroller; |
||||
package com.logpm.distribution.api; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils; |
||||
@ -1,36 +0,0 @@
|
||||
package com.logpm.distribution.config; |
||||
|
||||
import org.redisson.Redisson; |
||||
import org.redisson.config.Config; |
||||
import org.springblade.core.redis.cache.BladeRedis; |
||||
import org.springblade.core.tool.utils.SpringUtil; |
||||
import org.springframework.context.annotation.Bean; |
||||
import org.springframework.context.annotation.Configuration; |
||||
import org.springframework.data.redis.connection.RedisConnectionFactory; |
||||
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; |
||||
import org.springframework.stereotype.Component; |
||||
|
||||
@Configuration |
||||
public class RedissonConfig { |
||||
|
||||
@Bean |
||||
public Redisson redisson() { |
||||
// 单机模式
|
||||
Config config = new Config(); |
||||
|
||||
BladeRedis bean = SpringUtil.getBean(BladeRedis.class); |
||||
|
||||
RedisConnectionFactory connectionFactory = bean.getRedisTemplate().getConnectionFactory(); |
||||
|
||||
LettuceConnectionFactory factory = (LettuceConnectionFactory) connectionFactory; |
||||
|
||||
String hostName = factory.getHostName(); |
||||
int port = factory.getPort(); |
||||
String password = factory.getPassword(); |
||||
|
||||
config.useSingleServer().setAddress("redis://"+hostName+":"+port).setDatabase(1); |
||||
config.useSingleServer().setPassword(password); |
||||
return (Redisson) Redisson.create(config); |
||||
} |
||||
|
||||
} |
||||
@ -1,83 +0,0 @@
|
||||
package com.logpm.distribution.controller; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import com.logpm.business.entity.DistributionBusinessPreOrderEntity; |
||||
import com.logpm.business.vo.DistributionBusinessPreCarNumberVO; |
||||
import com.logpm.business.vo.DistributionBusinessPreOrderVO; |
||||
import com.logpm.distribution.entity.DistributionDeliveryListEntity; |
||||
import com.logpm.distribution.service.IDistributionBusinessPreOrderService; |
||||
import com.logpm.distribution.vo.DistributionDeliveryListVO; |
||||
import com.logpm.distribution.wrapper.DistributionDeliveryListWrapper; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import io.swagger.annotations.ApiParam; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
import java.util.Map; |
||||
|
||||
@RestController |
||||
@AllArgsConstructor |
||||
@Slf4j |
||||
@RequestMapping("/businessPreOrder") |
||||
@Api(value = "预入库信息控制器", tags = "预入库信息控制器") |
||||
public class DistributionBusinessPreOrderController extends BladeController { |
||||
|
||||
private final IDistributionBusinessPreOrderService distributionBusinessPreOrderService; |
||||
|
||||
/** |
||||
* 预入库信息 分页 |
||||
*/ |
||||
@GetMapping("/page") |
||||
@ApiOperationSupport(order = 2) |
||||
@ApiOperation(value = "分页", notes = "传入distributionDeliveryList") |
||||
public R<IPage<DistributionBusinessPreOrderVO>> page(@ApiIgnore @RequestParam Map<String, Object> distributionBusinessPreOrderDTO, Query query) { |
||||
IPage<DistributionBusinessPreOrderVO> page = Condition.getPage(query); |
||||
IPage<DistributionBusinessPreOrderVO> data= distributionBusinessPreOrderService.pacgeList(distributionBusinessPreOrderDTO,page); |
||||
return R.data(data); |
||||
} |
||||
|
||||
/** |
||||
* 预入库信息--配送车次 |
||||
*/ |
||||
@GetMapping("/pageByCarNum") |
||||
@ApiOperationSupport(order = 2) |
||||
@ApiOperation(value = "分页", notes = "传入distributionDeliveryList") |
||||
public R<IPage<DistributionBusinessPreCarNumberVO>> pageByCarNum(@ApiIgnore @RequestParam Map<String, Object> distributionBusinessPreOrderDTO, Query query) { |
||||
IPage<DistributionBusinessPreCarNumberVO> page = Condition.getPage(query); |
||||
IPage<DistributionBusinessPreCarNumberVO> data= distributionBusinessPreOrderService.pageByCarNum(distributionBusinessPreOrderDTO,page); |
||||
return R.data(data); |
||||
} |
||||
|
||||
|
||||
|
||||
|
||||
@GetMapping("/inOrder") |
||||
@ApiOperationSupport(order = 2) |
||||
@ApiOperation(value = "页面ID", notes = "传入distributionDeliveryList") |
||||
public R<Boolean> inOrder(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { |
||||
// try {
|
||||
Boolean isSuccess =distributionBusinessPreOrderService.inOrder(ids); |
||||
return R.data(isSuccess); |
||||
// }catch (Exception e){
|
||||
// log.error("预入库信息入库失败",e);
|
||||
// return R.fail(500,e.getMessage());
|
||||
// }
|
||||
|
||||
} |
||||
|
||||
|
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,14 @@
|
||||
package com.logpm.distribution.dto; |
||||
|
||||
import com.logpm.business.entity.BusinessPreOrderEntity; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* |
||||
*/ |
||||
@Data |
||||
public class BusinessPreOrderDTO extends BusinessPreOrderEntity { |
||||
|
||||
|
||||
|
||||
} |
||||
@ -1,14 +0,0 @@
|
||||
package com.logpm.distribution.dto; |
||||
|
||||
import com.logpm.business.entity.DistributionBusinessPreOrderEntity; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* |
||||
*/ |
||||
@Data |
||||
public class DistributionBusinessPreOrderDTO extends DistributionBusinessPreOrderEntity { |
||||
|
||||
|
||||
|
||||
} |
||||
@ -1,17 +0,0 @@
|
||||
package com.logpm.distribution.feign; |
||||
|
||||
import com.logpm.distribution.service.IDistributionBusinessPreOrderService; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
@ApiIgnore() |
||||
@RestController |
||||
@AllArgsConstructor |
||||
public class DistributionBusinessPreOrderClient implements IDistributionBusinessPreOrderClient { |
||||
private final IDistributionBusinessPreOrderService distributionBusinessPreOrderService; |
||||
@Override |
||||
public Integer inOrderByOrderPackageCode(String orderPackageCode, String carNum) { |
||||
return distributionBusinessPreOrderService.inOrderByOrderPackageCode(orderPackageCode,carNum); |
||||
} |
||||
} |
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in new issue