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

单据下载

Browse Source
workplace
zane 10 months ago
parent 3fddf12cf3
commit 02e524b56f
2 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java
Unescape Escape View File

@ -155,7 +155,7 @@ public class SysWorkplaceController extends BaseController {
return ResultVOUtils.error("当前工位已有员工绑定,请解绑之后在删除"); return ResultVOUtils.error("当前工位已有员工绑定,请解绑之后在删除");
} }
WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest(); WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
workBindBusTypeRequest.setWorkplaceCode(String.valueOf(sysWorkplace.getWorkplaceId())); workBindBusTypeRequest.setWorkplaceCode(sysWorkplace.getWorkplaceId());
List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest); List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
if (sysWorkplaceDocumentResponses.size() > 0) { if (sysWorkplaceDocumentResponses.size() > 0) {
return ResultVOUtils.error("当前工位已绑定单据,请解绑之后在删除"); return ResultVOUtils.error("当前工位已绑定单据,请解绑之后在删除");

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

@ -19,6 +19,7 @@ import com.glxp.api.req.thrsys.FilterThrOrderRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.res.thrsys.ThrOrderResponse;
import com.glxp.api.service.collect.IoCollectOrderService; import com.glxp.api.service.collect.IoCollectOrderService;
import com.glxp.api.util.IntUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -50,42 +51,59 @@ public class ThrOrderDownload implements IDownload {
if (CollUtil.isNotEmpty(thrOrderEntities)) { if (CollUtil.isNotEmpty(thrOrderEntities)) {
return this.importThrOrder(thrOrderEntities, collectOrderRequest); return this.importThrOrder(thrOrderEntities, collectOrderRequest);
} else { } else {
//三方拉取 int page = 1;
int limit = 100;
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
filterThrOrderRequest.setPage(1); filterThrOrderRequest.setLimit(limit);
filterThrOrderRequest.setLimit(100);
filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo()); filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo());
filterThrOrderRequest.setThirdSys("thirdId"); filterThrOrderRequest.setThirdSys("thirdId");
filterThrOrderRequest.setBusType(collectOrderRequest.getBusType()); filterThrOrderRequest.setBusType(collectOrderRequest.getBusType());
filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
filterThrOrderRequest.setFromType(collectOrderRequest.getFromType()); filterThrOrderRequest.setFromType(collectOrderRequest.getFromType());
BaseResponse<PageSimpleResponse<ThrOrderResponse>> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest); while (true){
if (baseResponse.getCode() == 20000) { filterThrOrderRequest.setPage(page);
List<ThrOrderResponse> list = baseResponse.getData().getList(); BaseResponse<PageSimpleResponse<ThrOrderResponse>> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest);
if (CollUtil.isNotEmpty(list)) { if (baseResponse.getCode() == 20000) {
list.forEach(item -> { List<ThrOrderResponse> list = baseResponse.getData().getList();
ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); if (CollUtil.isNotEmpty(list)) {
BeanUtil.copyProperties(item, thrOrderEntity); list.forEach(item -> {
thrOrderEntity.setCreateTime(new Date()); ThrOrderEntity thrOrderEntity = new ThrOrderEntity();
thrOrderEntity.setUpdateTime(new Date()); ThrOrderEntity old = thrOrderDao.selectOne(new LambdaQueryWrapper<ThrOrderEntity>().eq(ThrOrderEntity::getBillNo, item.getBillNo()).last("limit 1"));
List<ThrOrderDetailEntity> detailList = item.getDetailList(); BeanUtil.copyProperties(item, thrOrderEntity);
if (CollUtil.isNotEmpty(detailList)) { if(old == null){
thrOrderDetailDao.delete(new LambdaQueryWrapper<ThrOrderDetailEntity>().eq(ThrOrderDetailEntity::getOrderIdFk, item.getBillNo())); //新增
for (ThrOrderDetailEntity detail : detailList) { thrOrderEntity.setCreateTime(new Date());
detail.setCreateTime(thrOrderEntity.getCreateTime()); thrOrderEntity.setUpdateTime(new Date());
detail.setUpdateTime(thrOrderEntity.getUpdateTime()); }else{
thrOrderDetailDao.insert(detail); //更新
thrOrderEntity.setId(old.getId());
thrOrderEntity.setUpdateTime(new Date());
} }
} List<ThrOrderDetailEntity> detailList = item.getDetailList();
thrOrderDao.insertOrUpdate(thrOrderEntity); if (CollUtil.isNotEmpty(detailList)) {
}); thrOrderDetailDao.delete(new LambdaQueryWrapper<ThrOrderDetailEntity>().eq(ThrOrderDetailEntity::getOrderIdFk, item.getBillNo()));
//再次获取 for (ThrOrderDetailEntity detail : detailList) {
thrOrderEntities = thrOrderDao.selectList(w); detail.setCreateTime(thrOrderEntity.getCreateTime());
return this.importThrOrder(thrOrderEntities, collectOrderRequest); detail.setUpdateTime(thrOrderEntity.getUpdateTime());
thrOrderDetailDao.insert(detail);
}
}
thrOrderDao.insertOrUpdate(thrOrderEntity);
});
}
if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) {
page++;
} else {
break;
}
}else {
return ResultVOUtils.error(500, "下载第三方系统产品信息异常");
} }
} }
//再次获取
thrOrderEntities = thrOrderDao.selectList(w);
return this.importThrOrder(thrOrderEntities, collectOrderRequest);
} }
return ResultVOUtils.error("下载失败");
} }

Write Preview
Loading…
Cancel
Save