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

代码备份

Browse Source
dev_no_inv
yewj 9 months ago
parent 3813dd8295
commit e3f53aabac
3 changed files with 200 additions and 197 deletions
Show Stats Download Patch File Download Diff File

358
src/main/java/com/glxp/api/controller/inv/UdiTraceController.java
Unescape Escape View File

@ -44,188 +44,190 @@ public class UdiTraceController {
IoOrderService orderService; IoOrderService orderService;
@Resource @Resource
InvProductServiceNew invProductServiceNew; InvProductServiceNew invProductServiceNew;
//TODO 20241017 先把这个接口注释了 //TODO 20241017 先把这个接口注释了
// @AuthRuleAnnotation("") @AuthRuleAnnotation("")
// @GetMapping("udiwarehouse/trace/filter") @GetMapping("udiwarehouse/trace/filter")
// public BaseResponse list(FilterCodeTraceRequest filterCodeTraceRequest) { public BaseResponse list(FilterCodeTraceRequest filterCodeTraceRequest) {
// if (StrUtil.isEmpty(filterCodeTraceRequest.getCode())) { if (StrUtil.isEmpty(filterCodeTraceRequest.getCode())) {
// return ResultVOUtils.error(500, "UDI码不能为空"); return ResultVOUtils.error(500, "UDI码不能为空");
// } }
// UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeTraceRequest.getCode()); UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeTraceRequest.getCode());
// if (udiEntity == null) { if (udiEntity == null) {
// return ResultVOUtils.error(500, "无效条码"); return ResultVOUtils.error(500, "无效条码");
// } }
// UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
// if (udiInfoBean == null) { if (udiInfoBean == null) {
// return ResultVOUtils.error(500, "耗材字典不存在此产品！"); return ResultVOUtils.error(500, "耗材字典不存在此产品！");
// } }
// List<UdiProductEntity> udiInfoEntities = udiProductService.findByUuids(udiInfoBean.getUuid()); List<UdiProductEntity> udiInfoEntities = udiProductService.findByUuids(udiInfoBean.getUuid());
// FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
// if (udiInfoEntities != null && udiInfoEntities.size() > 1) { if (udiInfoEntities != null && udiInfoEntities.size() > 1) {
// filterInvProductDetailRequest.setRelId(udiInfoBean.getId() + ""); filterInvProductDetailRequest.setRelId(udiInfoBean.getId() + "");
// filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo()); filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo());
// } else { } else {
// filterInvProductDetailRequest.setCode(filterCodeTraceRequest.getCode()); filterInvProductDetailRequest.setCode(filterCodeTraceRequest.getCode());
// } }
//
// // IoCodeEntity;
// filterInvProductDetailRequest.setSupId(filterCodeTraceRequest.getSupId()); filterInvProductDetailRequest.setSupId(filterCodeTraceRequest.getSupId());
// List<InvProductNewVo> invProductDetailEntities = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest); List<InvProductNewVo> invProductDetailEntities = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest);
// if (invProductDetailEntities.size() > 0) { if (invProductDetailEntities.size() > 0) {
// Map<String, String> filterMap = new HashMap<>(); Map<String, String> filterMap = new HashMap<>();
//
// for (InvProductNewVo invProductDetailEntity : invProductDetailEntities) { for (InvProductNewVo invProductDetailEntity : invProductDetailEntities) {
// filterMap.put(invProductDetailEntity.getOrderId(), invProductDetailEntity.getOrderId()); filterMap.put(invProductDetailEntity.getOrderId(), invProductDetailEntity.getOrderId());
// } }
// List<String> orderIds = new ArrayList<>(); List<String> orderIds = new ArrayList<>();
// for (String key : filterMap.keySet()) { for (String key : filterMap.keySet()) {
// orderIds.add(key); orderIds.add(key);
// } }
// FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
// filterOrderRequest.setOrderIds(orderIds); filterOrderRequest.setOrderIds(orderIds);
// List<IoOrderResponse> orderEntities = orderService.filterList(filterOrderRequest); List<IoOrderResponse> orderEntities = orderService.filterList(filterOrderRequest);
//
//
// FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest(); FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
// filterUdiInfoRequest.setNameCode(udiEntity.getUdi()); filterUdiInfoRequest.setNameCode(udiEntity.getUdi());
// List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
// UdiRelevanceResponse udiRelevance = null; UdiRelevanceResponse udiRelevance = null;
// if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
// udiRelevance = udiRelevanceResponses.get(0); udiRelevance = udiRelevanceResponses.get(0);
// } }
//
// UdiRelevanceResponse finalUdiRelevance = udiRelevance; UdiRelevanceResponse finalUdiRelevance = udiRelevance;
// List<UdiTraceResponse> udiTraceResponseList = orderEntities.stream().map(item -> List<UdiTraceResponse> udiTraceResponseList = orderEntities.stream().map(item ->
// { {
// UdiTraceResponse udiTraceResponse = new UdiTraceResponse(); UdiTraceResponse udiTraceResponse = new UdiTraceResponse();
//
// udiTraceResponse.setOrderId(item.getBillNo()); udiTraceResponse.setOrderId(item.getBillNo());
// udiTraceResponse.setBillTypeName(item.getBillTypeName()); udiTraceResponse.setBillTypeName(item.getBillTypeName());
// udiTraceResponse.setFromCorp(item.getFromName()); udiTraceResponse.setFromCorp(item.getFromName());
// udiTraceResponse.setActDate(MsDateUtil.formatDate(item.getCreateTime())); udiTraceResponse.setActDate(MsDateUtil.formatDate(item.getCreateTime()));
// if (finalUdiRelevance != null) { if (finalUdiRelevance != null) {
// udiTraceResponse.setYlqxzcrbarmc(finalUdiRelevance.getYlqxzcrbarmc()); udiTraceResponse.setYlqxzcrbarmc(finalUdiRelevance.getYlqxzcrbarmc());
// udiTraceResponse.setCpmctymc(finalUdiRelevance.getCpmctymc()); udiTraceResponse.setCpmctymc(finalUdiRelevance.getCpmctymc());
// udiTraceResponse.setGgxh(finalUdiRelevance.getGgxh()); udiTraceResponse.setGgxh(finalUdiRelevance.getGgxh());
// InvProductNewVo invProductDetailEntity = invProductDetailEntities.get(0); InvProductNewVo invProductDetailEntity = invProductDetailEntities.get(0);
// udiTraceResponse.setBatchNo(invProductDetailEntity.getBatchNo()); udiTraceResponse.setBatchNo(invProductDetailEntity.getBatchNo());
// udiTraceResponse.setProduceDate(invProductDetailEntity.getProduceDate()); udiTraceResponse.setProduceDate(invProductDetailEntity.getProduceDate());
// udiTraceResponse.setExpireDate(invProductDetailEntity.getExpireDate()); udiTraceResponse.setExpireDate(invProductDetailEntity.getExpireDate());
// udiTraceResponse.setCount(invProductDetailEntity.getCount()); udiTraceResponse.setCount(invProductDetailEntity.getCount());
// } }
// return udiTraceResponse; return udiTraceResponse;
// }).collect(Collectors.toList()); }).collect(Collectors.toList());
//
//
// PageInfo<UdiTraceResponse> pageInfo; PageInfo<UdiTraceResponse> pageInfo;
// pageInfo = new PageInfo<>(udiTraceResponseList); pageInfo = new PageInfo<>(udiTraceResponseList);
// PageSimpleResponse<UdiTraceResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<UdiTraceResponse> pageSimpleResponse = new PageSimpleResponse<>();
// pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
// pageSimpleResponse.setList(udiTraceResponseList); pageSimpleResponse.setList(udiTraceResponseList);
// return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
// } else { } else {
// return ResultVOUtils.error(500, "未查询到数据！"); return ResultVOUtils.error(500, "未查询到数据！");
// } }
//
// } }
// TODO 20241017先把这个接口注释了 // TODO 20241017先把这个接口注释了
// @AuthRuleAnnotation("") @AuthRuleAnnotation("")
// @GetMapping("spms/inv/products/order/trace") @GetMapping("spms/inv/products/order/trace")
// public BaseResponse filterOrderTrace(FilterCodeTraceRequest filterCodeTraceRequest) {
// public BaseResponse filterOrderTrace(FilterCodeTraceRequest filterCodeTraceRequest) {
// if (filterCodeTraceRequest.getCode() == null) {
// return ResultVOUtils.success(); if (filterCodeTraceRequest.getCode() == null) {
// } return ResultVOUtils.success();
// System.out.println(filterCodeTraceRequest + "---------------------------------------------"); }
// UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeTraceRequest.getCode()); System.out.println(filterCodeTraceRequest + "---------------------------------------------");
// if (udiEntity == null) { UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeTraceRequest.getCode());
// return ResultVOUtils.error(500, "无效条码"); if (udiEntity == null) {
// } return ResultVOUtils.error(500, "无效条码");
// UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); }
// if (udiInfoBean == null) { UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
// return ResultVOUtils.error(500, "耗材字典不存在此产品！"); if (udiInfoBean == null) {
// } return ResultVOUtils.error(500, "耗材字典不存在此产品！");
// List<InvProductNewVo> mInvProductDetailEntities = new ArrayList<>(); }
// //判断是否多级包装 List<InvProductNewVo> mInvProductDetailEntities = new ArrayList<>();
// List<UdiProductEntity> udiInfoEntities = udiProductService.findByUuids(udiInfoBean.getUuid()); //判断是否多级包装
// List<UdiProductEntity> udiInfoEntities = udiProductService.findByUuids(udiInfoBean.getUuid());
// if (udiInfoEntities != null && udiInfoEntities.size() > 1) {
// //多级包装根据产品ID，批次号查询 if (udiInfoEntities != null && udiInfoEntities.size() > 1) {
// //多级包装根据产品ID，批次号查询
// //1.判断是否di关联多个产品ID
// List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(udiEntity.getUdi()); //1.判断是否di关联多个产品ID
// if (CollUtil.isNotEmpty(udiRelevanceResponses)) { List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(udiEntity.getUdi());
// if (CollUtil.isNotEmpty(udiRelevanceResponses)) {
// for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
// //假设条码不完整 for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
// FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); //假设条码不完整
// filterInvProductDetailRequest.setCode(filterCodeTraceRequest.getCode()); FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
// filterInvProductDetailRequest.setSupId(filterCodeTraceRequest.getSupId()); filterInvProductDetailRequest.setCode(filterCodeTraceRequest.getCode());
// List<InvProductNewVo> temps = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest); filterInvProductDetailRequest.setSupId(filterCodeTraceRequest.getSupId());
// if (CollUtil.isNotEmpty(temps)) { List<InvProductNewVo> temps = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest);
// Map<String, List<InvProductNewVo>> filterMaps = temps.stream().collect(Collectors.groupingBy(InvProductNewVo::getBatchNo)); if (CollUtil.isNotEmpty(temps)) {
// if (filterMaps.size() > 0) { Map<String, List<InvProductNewVo>> filterMaps = temps.stream().collect(Collectors.groupingBy(InvProductNewVo::getBatchNo));
// for (String bacthNo : filterMaps.keySet()) { if (filterMaps.size() > 0) {
// filterInvProductDetailRequest = new FilterInvProductDetailRequest(); for (String bacthNo : filterMaps.keySet()) {
// filterInvProductDetailRequest.setRelId(udiRelevanceResponse.getId() + ""); filterInvProductDetailRequest = new FilterInvProductDetailRequest();
// filterInvProductDetailRequest.setBatchNo(bacthNo); filterInvProductDetailRequest.setRelId(udiRelevanceResponse.getId() + "");
filterInvProductDetailRequest.setBatchNo(bacthNo);
List<InvProductNewVo> invProductDetailEntities = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest);
if (CollUtil.isNotEmpty(invProductDetailEntities)) {
mInvProductDetailEntities.addAll(invProductDetailEntities);
}
}
}
} else {
filterInvProductDetailRequest = new FilterInvProductDetailRequest();
filterInvProductDetailRequest.setRelId(udiRelevanceResponse.getId() + "");
filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo());
List<InvProductEntity> invProductDetailEntities = invProductServiceNew.selectByUnique(udiRelevanceResponse.getId(), udiEntity.getBatchNo(), null, null, null);
if (CollUtil.isNotEmpty(invProductDetailEntities)) {
mInvProductDetailEntities.addAll(invProductDetailEntities);
}
}
}
}
} else {
//单级包装
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
filterInvProductDetailRequest.setCode(filterCodeTraceRequest.getCode());
filterInvProductDetailRequest.setSupId(filterCodeTraceRequest.getSupId());
List<InvProductNewVo> invProductDetailEntities = invProductServiceNew.list(new QueryWrapper<InvProductNewVo>().likeRight("code", filterCodeTraceRequest.getCode()));
// List<InvProductNewVo> invProductDetailEntities = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest); // List<InvProductNewVo> invProductDetailEntities = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest);
// if (CollUtil.isNotEmpty(invProductDetailEntities)) { if (CollUtil.isNotEmpty(invProductDetailEntities)) {
// mInvProductDetailEntities.addAll(invProductDetailEntities); mInvProductDetailEntities.addAll(invProductDetailEntities);
// } }
// } }
// } if (mInvProductDetailEntities.size() > 0) {
// } else { Map<String, String> filterMap = new HashMap<>();
// filterInvProductDetailRequest = new FilterInvProductDetailRequest();
// filterInvProductDetailRequest.setRelId(udiRelevanceResponse.getId() + ""); for (InvProductNewVo invProductDetailEntity : mInvProductDetailEntities) {
// filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo()); filterMap.put(invProductDetailEntity.getOrderId(), invProductDetailEntity.getOrderId());
// List<InvProductEntity> invProductDetailEntities = invProductServiceNew.selectByUnique(udiRelevanceResponse.getId(), udiEntity.getBatchNo(), null, null, null); }
// if (CollUtil.isNotEmpty(invProductDetailEntities)) { List<String> orderIds = new ArrayList<>();
// mInvProductDetailEntities.addAll(invProductDetailEntities); for (String key : filterMap.keySet()) {
// } orderIds.add(key);
// } }
// } FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
// } filterOrderRequest.setOrderIds(orderIds);
// } else { filterOrderRequest.setPage(filterCodeTraceRequest.getPage());
// //单级包装 filterOrderRequest.setLimit(filterCodeTraceRequest.getLimit());
// FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); List<IoOrderResponse> orderEntities = orderService.filterList(filterOrderRequest);
// filterInvProductDetailRequest.setCode(filterCodeTraceRequest.getCode()); Collections.sort(orderEntities, Comparator.comparing(IoOrderResponse::getCreateTime));
// filterInvProductDetailRequest.setSupId(filterCodeTraceRequest.getSupId()); PageInfo<IoOrderResponse> pageInfo;
// pageInfo = new PageInfo<>(orderEntities);
// List<InvProductNewVo> invProductDetailEntities = invProductServiceNew.list(new QueryWrapper<InvProductNewVo>().likeRight("code", filterCodeTraceRequest.getCode())); PageSimpleResponse<IoOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
//// List<InvProductNewVo> invProductDetailEntities = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest); pageSimpleResponse.setTotal(pageInfo.getTotal());
// if (CollUtil.isNotEmpty(invProductDetailEntities)) { pageSimpleResponse.setList(orderEntities);
// mInvProductDetailEntities.addAll(invProductDetailEntities); return ResultVOUtils.success(pageSimpleResponse);
// } } else {
// } return ResultVOUtils.error(500, "未查询到数据！");
// if (mInvProductDetailEntities.size() > 0) { }
// Map<String, String> filterMap = new HashMap<>();
// }
// for (InvProductNewVo invProductDetailEntity : mInvProductDetailEntities) {
// filterMap.put(invProductDetailEntity.getOrderId(), invProductDetailEntity.getOrderId());
// }
// List<String> orderIds = new ArrayList<>();
// for (String key : filterMap.keySet()) {
// orderIds.add(key);
// }
// FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
// filterOrderRequest.setOrderIds(orderIds);
// filterOrderRequest.setPage(filterCodeTraceRequest.getPage());
// filterOrderRequest.setLimit(filterCodeTraceRequest.getLimit());
// List<IoOrderResponse> orderEntities = orderService.filterList(filterOrderRequest);
// Collections.sort(orderEntities, Comparator.comparing(IoOrderResponse::getCreateTime));
// PageInfo<IoOrderResponse> pageInfo;
// pageInfo = new PageInfo<>(orderEntities);
// PageSimpleResponse<IoOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
// pageSimpleResponse.setTotal(pageInfo.getTotal());
// pageSimpleResponse.setList(orderEntities);
// return ResultVOUtils.success(pageSimpleResponse);
// } else {
// return ResultVOUtils.error(500, "未查询到数据！");
// }
//
// }
} }

5
src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java
Unescape Escape View File

@ -81,12 +81,12 @@ public class InvPlaceServiceImpl implements InvPlaceService {
return invProductNewDao.selectPlaceDetailList(filterInvPlaceRequest); return invProductNewDao.selectPlaceDetailList(filterInvPlaceRequest);
} }
//TODO 20241017 绑定货位先注释 //TODO 20241017 绑定货位先注释 confirm
@Override @Override
public BaseResponse bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest) { public BaseResponse bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest) {
return null; return null;
// //查询仓库的部门ID // //查询仓库的部门ID
//// String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode()); // String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
// InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode()); // InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode());
// List<InvPlaceOrderDetailEntity> invPlaceOrderDetailEntityList = new ArrayList<>(); // List<InvPlaceOrderDetailEntity> invPlaceOrderDetailEntityList = new ArrayList<>();
// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { // if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
@ -706,6 +706,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
return actCount; return actCount;
} }
//TODO 20241017 下架货位接口先注释 //TODO 20241017 下架货位接口先注释
@Override @Override
public BaseResponse unbindInvOrderSpace(BindInvSpaceRequest bindInvSpaceRequest) { public BaseResponse unbindInvOrderSpace(BindInvSpaceRequest bindInvSpaceRequest) {

Write Preview
Loading…
Cancel
Save