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

代码备份

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

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

24
src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java
Unescape Escape View File

@ -76,7 +76,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请添加领用设备！"); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请添加领用设备！");
} }
if (StrUtil.isNotBlank(addDetailRequest.getCode())) { if (StrUtil.isNotBlank(addDetailRequest.getCode())) {
if(addDetailRequest.getType() == 1){ if (addDetailRequest.getType() == 1) {
//通过条码添加 //通过条码添加
//解析此条码，判断此条码是否已经存在 //解析此条码，判断此条码是否已经存在
UdiEntity udi = FilterUdiUtils.getUdi(addDetailRequest.getCode()); UdiEntity udi = FilterUdiUtils.getUdi(addDetailRequest.getCode());
@ -107,11 +107,11 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
InvProductNewVo invProductDetailEntity = invProductDetailEntities.get(0); InvProductNewVo invProductDetailEntity = invProductDetailEntities.get(0);
DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), addDetailRequest.getCode(), invProductDetailEntity); DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), addDetailRequest.getCode(), invProductDetailEntity);
deviceReceiveOrderDetailDao.insert(orderDetail); deviceReceiveOrderDetailDao.insert(orderDetail);
}else if(addDetailRequest.getType() == 2){ } else if (addDetailRequest.getType() == 2) {
DeptDeviceDetailEntity deptDeviceDetailEntity= deptDeviceDetailDao.selectOne(new QueryWrapper<DeptDeviceDetailEntity>().eq("originCode", addDetailRequest.getCode()).last("limit 1")); DeptDeviceDetailEntity deptDeviceDetailEntity = deptDeviceDetailDao.selectOne(new QueryWrapper<DeptDeviceDetailEntity>().eq("originCode", addDetailRequest.getCode()).last("limit 1"));
DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = getDeviceReceiveOrderDetailAndDelectEntity(addDetailRequest.getOrderIdFk(),deptDeviceDetailEntity); DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = getDeviceReceiveOrderDetailAndDelectEntity(addDetailRequest.getOrderIdFk(), deptDeviceDetailEntity);
deviceReceiveOrderDetailDao.insert(deviceReceiveOrderDetailEntity); deviceReceiveOrderDetailDao.insert(deviceReceiveOrderDetailEntity);
}else if(addDetailRequest.getType() == 3){ } else if (addDetailRequest.getType() == 3) {
UdiEntity udi = FilterUdiUtils.getUdi(addDetailRequest.getCode()); UdiEntity udi = FilterUdiUtils.getUdi(addDetailRequest.getCode());
UdiProductEntity udiProductEntity = udiProductService.selectUdiByName(udi.getUdi()); UdiProductEntity udiProductEntity = udiProductService.selectUdiByName(udi.getUdi());
DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity(); DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity();
@ -125,7 +125,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
} }
} else { } else {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("device_product"); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("device_product");
if(systemParamConfigEntity.getParamValue().equals("0") || addDetailRequest.getType() == 1){ if (systemParamConfigEntity.getParamValue().equals("0") || addDetailRequest.getType() == 1) {
//TODO 20241017 这个插入设备领用记录详情需要依赖订单详情表先注释了看下要不要用其他方式写 //TODO 20241017 这个插入设备领用记录详情需要依赖订单详情表先注释了看下要不要用其他方式写
// //通过选库存添加 // //通过选库存添加
// //查询选中的库存信息 // //查询选中的库存信息
@ -136,7 +136,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
// //插入设备领用记录详情 // //插入设备领用记录详情
// deviceReceiveOrderDetailDao.insert(orderDetail); // deviceReceiveOrderDetailDao.insert(orderDetail);
// } // }
}else if(systemParamConfigEntity.getParamValue().equals("1") || addDetailRequest.getType() == 3 ){ } else if (systemParamConfigEntity.getParamValue().equals("1") || addDetailRequest.getType() == 3) {
for (String invProductId : addDetailRequest.getInvProductIds()) { for (String invProductId : addDetailRequest.getInvProductIds()) {
DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity(); DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity();
@ -151,11 +151,11 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
deviceReceiveOrderDetailDao.insert(deviceReceiveOrderDetailEntity); deviceReceiveOrderDetailDao.insert(deviceReceiveOrderDetailEntity);
} }
}else if(addDetailRequest.getType() == 2){ } else if (addDetailRequest.getType() == 2) {
for (String invProductId : addDetailRequest.getInvProductIds()) { for (String invProductId : addDetailRequest.getInvProductIds()) {
DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity(); DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity();
DeptDeviceDetailEntity deptDeviceDetailEntity= deptDeviceDetailDao.selectById(invProductId); DeptDeviceDetailEntity deptDeviceDetailEntity = deptDeviceDetailDao.selectById(invProductId);
//查询库存详情 //查询库存详情
deviceReceiveOrderDetailEntity.setNameCode(deptDeviceDetailEntity.getNameCode()); deviceReceiveOrderDetailEntity.setNameCode(deptDeviceDetailEntity.getNameCode());
deviceReceiveOrderDetailEntity.setRelId(Long.valueOf(deptDeviceDetailEntity.getRelId())); deviceReceiveOrderDetailEntity.setRelId(Long.valueOf(deptDeviceDetailEntity.getRelId()));
@ -205,7 +205,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
return orderDetail; return orderDetail;
} }
private static DeviceReceiveOrderDetailEntity getDeviceReceiveOrderDetailAndDelectEntity(String orderIdFk,DeptDeviceDetailEntity deptDeviceDetailEntity) { private static DeviceReceiveOrderDetailEntity getDeviceReceiveOrderDetailAndDelectEntity(String orderIdFk, DeptDeviceDetailEntity deptDeviceDetailEntity) {
DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity(); DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity();
//查询库存详情 //查询库存详情
@ -231,7 +231,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
} }
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("device_product"); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("device_product");
if(systemParamConfigEntity.getParamValue().equals("0")){ if (systemParamConfigEntity.getParamValue().equals("0")) {
//判断新的条码是否重复 //判断新的条码是否重复
FilterDeviceReceiveOrderDetailRequest detailRequest = new FilterDeviceReceiveOrderDetailRequest(); FilterDeviceReceiveOrderDetailRequest detailRequest = new FilterDeviceReceiveOrderDetailRequest();
detailRequest.setOrderIdFk(detailEntity.getOrderIdFk()); detailRequest.setOrderIdFk(detailEntity.getOrderIdFk());
@ -240,7 +240,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
if (CollUtil.isNotEmpty(list)) { if (CollUtil.isNotEmpty(list)) {
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "条码重复！"); return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "条码重复！");
} }
}else{ } else {
} }
deviceReceiveOrderDetailDao.updateById(detailEntity); deviceReceiveOrderDetailDao.updateById(detailEntity);

11
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) {
@ -516,7 +516,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
return "该产品库存不足！"; return "该产品库存不足！";
} }
} else { } else {
count = invPreInProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode(),bindInvSpaceRequest.getInvCode()); count = invPreInProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode(), bindInvSpaceRequest.getInvCode());
} }
if (count == null || count <= 0) { if (count == null || count <= 0) {
return "该产品库存不足！"; return "该产品库存不足！";
@ -546,7 +546,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
} }
count = invPreProductDetailEntity.getInCount(); count = invPreProductDetailEntity.getInCount();
} else { } else {
count = invPreProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode(),bindInvSpaceRequest.getInvCode()); count = invPreProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode(), bindInvSpaceRequest.getInvCode());
} }
if (count == null || count <= 0) { if (count == null || count <= 0) {
@ -577,7 +577,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
} }
count = invProductDetailEntity.getInCount(); count = invProductDetailEntity.getInCount();
} else { } else {
count = invProductNewDao.getInventoryQuantity(bindInvSpaceRequest.getCode(),bindInvSpaceRequest.getInvCode()); count = invProductNewDao.getInventoryQuantity(bindInvSpaceRequest.getCode(), bindInvSpaceRequest.getInvCode());
} }
if (count == null || count <= 0) { if (count == null || count <= 0) {
@ -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