UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

第三方单据下载问题

Browse Source
workplace
yewj 10 months ago
parent a7747416c5
commit 969afd4a6a
4 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
Unescape Escape View File

@ -30,6 +30,7 @@ public class IoCollectOriginController {
/**
* 异常处理
*
* @param collectOrderRequest
* @return
*/

1
src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java
Unescape Escape View File

@ -41,5 +41,6 @@ public class FilterThrOrderRequest extends ListPageRequest {
* 来源业务
*/
private String fromType;
private String busType;
private List<ThrOrderResponse> erpOrderResponses;
}

15
src/main/java/com/glxp/api/service/collect/DownloadFactory.java
Unescape Escape View File

@ -23,23 +23,24 @@ public class DownloadFactory {
/**
* 第三方单据类型
*
* @param collectOrderRequest
* @return
*/
public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest){
public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
String busType = collectOrderRequest.getBusType();
if(busType == null){
if (busType == null) {
return ResultVOUtils.error("下载失败，未配置业务类型");
}
if(busType.equals(BusTypeConstant.YPCF002.getBusType())){
if (busType.equals(BusTypeConstant.YPCF002.getBusType())) {
return ypcf002Download.downloadOrder(collectOrderRequest);
} else if(busType.equals(BusTypeConstant.CGJH001.getBusType())){
} else if (busType.equals(BusTypeConstant.CGJH001.getBusType())) {
return thrOrderDownload.downloadOrder(collectOrderRequest);
} else if(busType.equals(BusTypeConstant.LYRK.getBusType())){
} else if (busType.equals(BusTypeConstant.LYRK.getBusType())) {
return thrOrderDownload.downloadOrder(collectOrderRequest);
} else if(busType.equals(BusTypeConstant.GMRK.getBusType())){
} else if (busType.equals(BusTypeConstant.GMRK.getBusType())) {
return thrOrderDownload.downloadOrder(collectOrderRequest);
} else if(busType.equals(BusTypeConstant.LYCK.getBusType())){
} else if (busType.equals(BusTypeConstant.LYCK.getBusType())) {
return thrOrderDownload.downloadOrder(collectOrderRequest);
}
return ResultVOUtils.error("下载失败，未配置业务类型");

30
src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java
Unescape Escape View File

@ -32,7 +32,7 @@ import java.util.List;
* 出入信息 LYRK GMRK LYCK
*/
@Service
public class ThrOrderDownload implements IDownload{
public class ThrOrderDownload implements IDownload {
@Resource
private ErpBasicClient erpBasicClient;
@Resource
@ -45,23 +45,24 @@ public class ThrOrderDownload implements IDownload{
@Override
public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
LambdaQueryWrapper<ThrOrderEntity> w = new LambdaQueryWrapper<>();
w.eq(StrUtil.isNotBlank(collectOrderRequest.getBillNo()),ThrOrderEntity::getBillNo,collectOrderRequest.getBillNo());
w.eq(StrUtil.isNotBlank(collectOrderRequest.getBillNo()), ThrOrderEntity::getBillNo, collectOrderRequest.getBillNo());
List<ThrOrderEntity> thrOrderEntities = thrOrderDao.selectList(w);
if(CollUtil.isNotEmpty(thrOrderEntities)){
return this.importThrOrder(thrOrderEntities,collectOrderRequest);
}else{
if (CollUtil.isNotEmpty(thrOrderEntities)) {
return this.importThrOrder(thrOrderEntities, collectOrderRequest);
} else {
//三方拉取
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
filterThrOrderRequest.setPage(1);
filterThrOrderRequest.setLimit(100);
filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo());
filterThrOrderRequest.setThirdSys("thirdId");
filterThrOrderRequest.setBusType(collectOrderRequest.getBusType());
filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
filterThrOrderRequest.setFromType(collectOrderRequest.getFromType());
BaseResponse<PageSimpleResponse<ThrOrderResponse>> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest);
if (baseResponse.getCode() == 20000) {
List<ThrOrderResponse> list = baseResponse.getData().getList();
if(CollUtil.isNotEmpty(list)){
if (CollUtil.isNotEmpty(list)) {
list.forEach(item -> {
ThrOrderEntity thrOrderEntity = new ThrOrderEntity();
BeanUtil.copyProperties(item, thrOrderEntity);
@ -80,7 +81,7 @@ public class ThrOrderDownload implements IDownload{
});
//再次获取
thrOrderEntities = thrOrderDao.selectList(w);
return this.importThrOrder(thrOrderEntities,collectOrderRequest);
return this.importThrOrder(thrOrderEntities, collectOrderRequest);
}
}
}
@ -90,13 +91,14 @@ public class ThrOrderDownload implements IDownload{
/**
* 下载至单据
*
* @param thrOrderEntities
* @param collectOrderRequest
*/
private BaseResponse importThrOrder(List<ThrOrderEntity> thrOrderEntities,CollectOrderRequest collectOrderRequest){
private BaseResponse importThrOrder(List<ThrOrderEntity> thrOrderEntities, CollectOrderRequest collectOrderRequest) {
List<IoCollectOrder> ioCollectOrderList = new ArrayList<>();
if(CollUtil.isNotEmpty(thrOrderEntities)){
for(ThrOrderEntity thrOrder: thrOrderEntities){
if (CollUtil.isNotEmpty(thrOrderEntities)) {
for (ThrOrderEntity thrOrder : thrOrderEntities) {
IoCollectOrder ioCollectOrder = new IoCollectOrder();
StringBuilder errorMsg = new StringBuilder();
ioCollectOrder.setBillNo(thrOrder.getBillNo());
@ -111,9 +113,9 @@ public class ThrOrderDownload implements IDownload{
ioCollectOrder.setUpdateTime(new Date());
ioCollectOrder.setSplitStatus(0);
ioCollectOrder.setTagStatus(0);
List<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailDao.selectList(new LambdaQueryWrapper<ThrOrderDetailEntity>().eq(ThrOrderDetailEntity::getOrderIdFk,thrOrder.getBillNo()));
List<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailDao.selectList(new LambdaQueryWrapper<ThrOrderDetailEntity>().eq(ThrOrderDetailEntity::getOrderIdFk, thrOrder.getBillNo()));
List<IoCollectOrderBiz> bizList = new ArrayList<>();
for(ThrOrderDetailEntity entity : thrOrderDetailEntities){
for (ThrOrderDetailEntity entity : thrOrderDetailEntities) {
IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
// BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()));
// if (basicUdirelEntity != null) {
@ -139,8 +141,8 @@ public class ThrOrderDownload implements IDownload{
ioCollectOrder.setBizList(bizList);
ioCollectOrderList.add(ioCollectOrder);
}
collectOrderService.importPrescribe(ioCollectOrderList,collectOrderRequest.getBusType());
return ResultVOUtils.success("下载成功");
collectOrderService.importPrescribe(ioCollectOrderList, collectOrderRequest.getBusType());
return ResultVOUtils.success("下载成功");
}
return ResultVOUtils.error("下载失败");
}

Write Preview
Loading…
Cancel
Save