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

Merge remote-tracking branch 'origin/ctyxyb' into ctyxyb

Browse Source 
# Conflicts:
#	src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
scpwxyy
yewj 7 months ago
parent af8e71e792 56d919effa
commit 256014568a
1 changed files with 73 additions and 49 deletions
Show Stats Download Patch File Download Diff File

122
src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
Unescape Escape View File

@ -1435,39 +1435,49 @@ public class CtqyyClient extends CommonHttpClient {
wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsPlanInfo::getCGDBH, udiwmsThrOrderRequest.getBillNo()); wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsPlanInfo::getCGDBH, udiwmsThrOrderRequest.getBillNo());
IPage<VYpzsPlanInfo> page = vYpzsPlanInfoMapper.selectPage(new Page<VYpzsPlanInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper); IPage<VYpzsPlanInfo> page = vYpzsPlanInfoMapper.selectPage(new Page<VYpzsPlanInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper);
List<VYpzsPlanInfo> planInfos = page.getRecords(); List<VYpzsPlanInfo> planInfos = page.getRecords();
List<IoCollectOrder> thrOrderResponses = new ArrayList<>(); List<IoCollectOrder> ioCollectOrders = new ArrayList<>();
if (CollUtil.isNotEmpty(planInfos)) { if (CollUtil.isNotEmpty(planInfos)) {
//数据处理以thr_order，thr_order_detail 主子返回
Map<String, List<VYpzsPlanInfo>> groupedByBz = planInfos.stream() Map<String, List<VYpzsPlanInfo>> groupedByBz = planInfos.stream()
.collect(Collectors.groupingBy(VYpzsPlanInfo::getCGDBH)); .collect(Collectors.groupingBy(VYpzsPlanInfo::getCGDBH));
groupedByBz.forEach((key, value) -> { groupedByBz.forEach((key, value) -> {
VYpzsPlanInfo planInfo = value.get(0); VYpzsPlanInfo planInfo = value.get(0);
IoCollectOrder thrOrderResponse = new IoCollectOrder(); StringBuilder errorMsg = new StringBuilder();
thrOrderResponse.setBillNo(planInfo.getCGDBH()); IoCollectOrder ioCollectOrder = new IoCollectOrder();
// thrOrderResponse.setBilldate(planInfo.()); ioCollectOrder.setBillNo(planInfo.getCGDBH());
thrOrderResponse.setBillTime(new Date()); // ioCollectOrder.setBilldate(planInfo.());
thrOrderResponse.setFromCorp(planInfo.getSCQYBM()); ioCollectOrder.setBillTime(new Date());
thrOrderResponse.setFromCorpName(planInfo.getSCQYMC()); ioCollectOrder.setFromCorp(planInfo.getSCQYBM());
thrOrderResponse.setCreateTime(new Date()); ioCollectOrder.setFromCorpName(planInfo.getSCQYMC());
thrOrderResponse.setUpdateTime(new Date()); ioCollectOrder.setCreateTime(new Date());
List<IoCollectOrderBiz> detailList = new ArrayList<>(); ioCollectOrder.setUpdateTime(new Date());
ioCollectOrder.setSplitStatus(0);
ioCollectOrder.setTagStatus(0);
List<IoCollectOrderBiz> bizList = new ArrayList<>();
value.forEach(entity -> { value.forEach(entity -> {
IoCollectOrderBiz detail = new IoCollectOrderBiz(); IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
detail.setThrCode(entity.getYPBM()); BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getYPBM()));
detail.setCpmctymc(entity.getYPMC()); if (basicUdirelEntity != null) {
detail.setBatchNo(entity.getYPBM()); collectOrderBiz.setRelId(basicUdirelEntity.getId());
detail.setGgxh(entity.getGGMC()); } else {
detail.setCount(entity.getGMSL()); errorMsg.append(entity.getYPMC()).append("字典未对照").append(";");
detail.setOrderIdFk(thrOrderResponse.getBillNo()); }
detail.setMeasureUnit(entity.getBZDW()); collectOrderBiz.setThrCode(entity.getYPBM());
detailList.add(detail); collectOrderBiz.setCpmctymc(entity.getYPMC());
collectOrderBiz.setBatchNo(entity.getYPBM());
collectOrderBiz.setGgxh(entity.getGGMC());
collectOrderBiz.setCount(entity.getGMSL());
collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
collectOrderBiz.setMeasureUnit(entity.getBZDW());
collectOrderBiz.setTagStatus(1);
collectOrderBiz.setUnTagCount(0);
bizList.add(collectOrderBiz);
}); });
thrOrderResponse.setBizList(detailList); ioCollectOrder.setBizList(bizList);
thrOrderResponses.add(thrOrderResponse); ioCollectOrders.add(ioCollectOrder);
}); });
} }
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(thrOrderResponses); pageSimpleResponse.setList(ioCollectOrders);
} else { } else {
LambdaQueryWrapper<VYpzsIoInfo> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<VYpzsIoInfo> wrapper = new LambdaQueryWrapper<>();
//补充其他查询条件 //补充其他查询条件
@ -1475,41 +1485,55 @@ public class CtqyyClient extends CommonHttpClient {
wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()), VYpzsIoInfo::getIO_SORT, udiwmsThrOrderRequest.getBusType()); wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()), VYpzsIoInfo::getIO_SORT, udiwmsThrOrderRequest.getBusType());
Page<VYpzsIoInfo> page = vYpzsIoInfoMapper.selectPage(new Page<VYpzsIoInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper); Page<VYpzsIoInfo> page = vYpzsIoInfoMapper.selectPage(new Page<VYpzsIoInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper);
List<VYpzsIoInfo> ioInfos = page.getRecords(); List<VYpzsIoInfo> ioInfos = page.getRecords();
List<IoCollectOrder> thrOrderResponses = new ArrayList<>(); List<IoCollectOrder> ioCollectOrders = new ArrayList<>();
if (CollUtil.isNotEmpty(ioInfos)) { if (CollUtil.isNotEmpty(ioInfos)) {
//数据处理以thr_order，thr_order_detail 主子返回
Map<String, List<VYpzsIoInfo>> groupedByPhysicCode = ioInfos.stream() Map<String, List<VYpzsIoInfo>> groupedByPhysicCode = ioInfos.stream()
.collect(Collectors.groupingBy(VYpzsIoInfo::getRECEIPT_NUMBER)); .collect(Collectors.groupingBy(VYpzsIoInfo::getPHYSIC_CODE));
groupedByPhysicCode.forEach((key, value) -> { groupedByPhysicCode.forEach((key, value) -> {
VYpzsIoInfo info = value.get(0); VYpzsIoInfo info = value.get(0);
IoCollectOrder collectOrder = new IoCollectOrder(); StringBuilder errorMsg = new StringBuilder();
collectOrder.setBillNo(info.getRECEIPT_NUMBER()); IoCollectOrder ioCollectOrder = new IoCollectOrder();
collectOrder.setBillTime(DateUtil.parseDate(info.getKEEP_BOOK_TIME())); ioCollectOrder.setBillNo(info.getPHYSIC_CODE());
collectOrder.setFromCorp(info.getCONSIGNOR()); ioCollectOrder.setBillTime(DateUtil.parseDate(info.getKEEP_BOOK_TIME()));
collectOrder.setFromCorpName(info.getCONSIGNOR_NAME()); ioCollectOrder.setFromCorp(info.getCONSIGNOR());
collectOrder.setBusType(udiwmsThrOrderRequest.getBusType()); ioCollectOrder.setFromCorpName(info.getCONSIGNOR_NAME());
collectOrder.setWorkPlaceCode(udiwmsThrOrderRequest.getWorkPlaceCode()); ioCollectOrder.setBusType(udiwmsThrOrderRequest.getBusType());
collectOrder.setCreateTime(new Date()); ioCollectOrder.setWorkPlaceCode(udiwmsThrOrderRequest.getWorkPlaceCode());
collectOrder.setUpdateTime(new Date()); ioCollectOrder.setCreateTime(new Date());
List<IoCollectOrderBiz> detailList = new ArrayList<>(); ioCollectOrder.setUpdateTime(new Date());
ioCollectOrder.setSplitStatus(0);
ioCollectOrder.setTagStatus(0);
List<IoCollectOrderBiz> bizList = new ArrayList<>();
value.forEach(entity -> { value.forEach(entity -> {
IoCollectOrderBiz detail = new IoCollectOrderBiz(); IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
detail.setThrCode(entity.getPHYSIC_CODE()); BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()));
detail.setCpmctymc(entity.getPHYSIC_NAME()); if (basicUdirelEntity != null) {
detail.setBatchNo(entity.getBATCH_NO()); collectOrderBiz.setRelId(basicUdirelEntity.getId());
detail.setCount(entity.getQUANTITY()); } else {
detail.setYbbm(entity.getCOUNTRY_CODE()); errorMsg.append(entity.getPHYSIC_NAME()).append("字典未对照").append(";");
detail.setOrderIdFk(collectOrder.getBillNo()); }
detail.setMeasureUnit(entity.getPACK_UNIT1()); collectOrderBiz.setThrCode(entity.getPHYSIC_CODE());
detail.setGgxh(entity.getPACK_SPEC() + ":" + entity.getPHYSIC_UNIT()); collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME());
detailList.add(detail); collectOrderBiz.setBatchNo(entity.getBATCH_NO());
collectOrderBiz.setCount(entity.getQUANTITY());
collectOrderBiz.setYbbm(entity.getCOUNTRY_CODE());
collectOrderBiz.setOrderIdFk(info.getPHYSIC_CODE());
collectOrderBiz.setMeasureUnit(entity.getPACK_UNIT1());
collectOrderBiz.setGgxh(entity.getPACK_SPEC() + ":" + entity.getPHYSIC_UNIT());
collectOrderBiz.setTagStatus(1);
collectOrderBiz.setUnTagCount(0);
bizList.add(collectOrderBiz);
}); });
collectOrder.setBizList(detailList); if (StrUtil.isNotBlank(errorMsg)) {
thrOrderResponses.add(collectOrder); ioCollectOrder.setErrorMsg(errorMsg.toString());
ioCollectOrder.setTagStatus(4);
}
ioCollectOrder.setBizList(bizList);
ioCollectOrders.add(ioCollectOrder);
}); });
} }
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(thrOrderResponses); pageSimpleResponse.setList(ioCollectOrders);
} }
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }

Write Preview
Loading…
Cancel
Save