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

代码备份

Browse Source
scpwxyy
yewj 7 months ago
parent 4b00302d86
commit 1df65c3d1b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

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

@ -1429,10 +1429,10 @@ public class CtqyyClient extends CommonHttpClient {
@Override @Override
public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) { public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) {
PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
if(udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.CGJH001.getBusType())){ if (udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.CGJH001.getBusType())) {
LambdaQueryWrapper<VYpzsPlanInfo> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<VYpzsPlanInfo> wrapper = new LambdaQueryWrapper<>();
//补充其他查询条件 //补充其他查询条件
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<ThrOrderResponse> thrOrderResponses = new ArrayList<>(); List<ThrOrderResponse> thrOrderResponses = new ArrayList<>();
@ -1440,11 +1440,11 @@ public class CtqyyClient extends CommonHttpClient {
//数据处理以thr_order，thr_order_detail 主子返回 //数据处理以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);
ThrOrderResponse thrOrderResponse = new ThrOrderResponse(); ThrOrderResponse thrOrderResponse = new ThrOrderResponse();
thrOrderResponse.setBillNo(planInfo.getCGDBH()); thrOrderResponse.setBillNo(planInfo.getCGDBH());
thrOrderResponse.setBilldate(planInfo.getSCQYMC()); // thrOrderResponse.setBilldate(planInfo.getSCQYMC());
thrOrderResponse.setCorpId(planInfo.getSCQYBM()); thrOrderResponse.setCorpId(planInfo.getSCQYBM());
thrOrderResponse.setCorpName(planInfo.getSCQYMC()); thrOrderResponse.setCorpName(planInfo.getSCQYMC());
thrOrderResponse.setThirdPartyDate(1); thrOrderResponse.setThirdPartyDate(1);
@ -1468,13 +1468,13 @@ public class CtqyyClient extends CommonHttpClient {
} }
pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(thrOrderResponses); pageSimpleResponse.setList(thrOrderResponses);
}else if(udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.LYRK.getBusType()) } else if (udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.LYRK.getBusType())
|| udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.GMRK.getBusType()) || udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.GMRK.getBusType())
|| udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.LYCK.getBusType())){ || udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.LYCK.getBusType())) {
LambdaQueryWrapper<VYpzsIoInfo> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<VYpzsIoInfo> wrapper = new LambdaQueryWrapper<>();
//补充其他查询条件 //补充其他查询条件
wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()),VYpzsIoInfo::getPHYSIC_CODE,udiwmsThrOrderRequest.getBillNo()); wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsIoInfo::getPHYSIC_CODE, udiwmsThrOrderRequest.getBillNo());
wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()),VYpzsIoInfo::getSORT_NAME,BusTypeConstant.valueOf(udiwmsThrOrderRequest.getBusType()).getName()); wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()), VYpzsIoInfo::getSORT_NAME, BusTypeConstant.valueOf(udiwmsThrOrderRequest.getBusType()).getName());
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<ThrOrderResponse> thrOrderResponses = new ArrayList<>(); List<ThrOrderResponse> thrOrderResponses = new ArrayList<>();
@ -1482,11 +1482,11 @@ public class CtqyyClient extends CommonHttpClient {
//数据处理以thr_order，thr_order_detail 主子返回 //数据处理以thr_order，thr_order_detail 主子返回
Map<String, List<VYpzsIoInfo>> groupedByPhysicCode = ioInfos.stream() Map<String, List<VYpzsIoInfo>> groupedByPhysicCode = ioInfos.stream()
.collect(Collectors.groupingBy(VYpzsIoInfo::getPHYSIC_CODE)); .collect(Collectors.groupingBy(VYpzsIoInfo::getPHYSIC_CODE));
groupedByPhysicCode.forEach((key, value)->{ groupedByPhysicCode.forEach((key, value) -> {
VYpzsIoInfo info = value.get(0); VYpzsIoInfo info = value.get(0);
ThrOrderResponse thrOrderResponse = new ThrOrderResponse(); ThrOrderResponse thrOrderResponse = new ThrOrderResponse();
thrOrderResponse.setBillNo(info.getPHYSIC_CODE()); thrOrderResponse.setBillNo(info.getPHYSIC_CODE());
thrOrderResponse.setBilldate(DateUtil.formatDate(info.getKEEP_BOOK_TIME(),"yyyy-MM-dd HH:mm:ss")); thrOrderResponse.setBilldate(DateUtil.formatDate(info.getKEEP_BOOK_TIME(), "yyyy-MM-dd HH:mm:ss"));
thrOrderResponse.setCorpId(info.getCONSIGNOR()); thrOrderResponse.setCorpId(info.getCONSIGNOR());
thrOrderResponse.setCorpName(info.getCONSIGNOR_NAME()); thrOrderResponse.setCorpName(info.getCONSIGNOR_NAME());
thrOrderResponse.setThirdPartyDate(1); thrOrderResponse.setThirdPartyDate(1);
@ -1608,7 +1608,7 @@ public class CtqyyClient extends CommonHttpClient {
collectOrderBiz.setThrCode(entity.getPHYSIC_CODE()); collectOrderBiz.setThrCode(entity.getPHYSIC_CODE());
collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME()); collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME());
collectOrderBiz.setGgxh(entity.getPACK_SPEC()); collectOrderBiz.setGgxh(entity.getPACK_SPEC());
collectOrderBiz.setBatchNo(entity.getBATCH_NUMBER()); // collectOrderBiz.setBatchNo(entity.getBATCH_NUMBER());
collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
collectOrderBiz.setCount(Integer.parseInt(entity.getLAY_PHYSIC_QUANTITY())); collectOrderBiz.setCount(Integer.parseInt(entity.getLAY_PHYSIC_QUANTITY()));
collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT()); collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT());

Write Preview
Loading…
Cancel
Save