From e3f53aabac4041a650c180e3ed921b26c1315440 Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 21 Oct 2024 14:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inv/UdiTraceController.java | 362 +++++++++--------- .../DeviceReceiveOrderDetailServiceImpl.java | 24 +- .../service/inv/impl/InvPlaceServiceImpl.java | 11 +- 3 files changed, 200 insertions(+), 197 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java index c580edd16..20bbe057c 100644 --- a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java @@ -44,188 +44,190 @@ public class UdiTraceController { IoOrderService orderService; @Resource 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 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 invProductDetailEntities = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest); -// if (invProductDetailEntities.size() > 0) { -// Map filterMap = new HashMap<>(); -// -// for (InvProductNewVo invProductDetailEntity : invProductDetailEntities) { -// filterMap.put(invProductDetailEntity.getOrderId(), invProductDetailEntity.getOrderId()); -// } -// List orderIds = new ArrayList<>(); -// for (String key : filterMap.keySet()) { -// orderIds.add(key); -// } -// FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); -// filterOrderRequest.setOrderIds(orderIds); -// List orderEntities = orderService.filterList(filterOrderRequest); -// -// -// FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest(); -// filterUdiInfoRequest.setNameCode(udiEntity.getUdi()); -// List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); -// UdiRelevanceResponse udiRelevance = null; -// if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { -// udiRelevance = udiRelevanceResponses.get(0); -// } -// -// UdiRelevanceResponse finalUdiRelevance = udiRelevance; -// List 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 pageInfo; -// pageInfo = new PageInfo<>(udiTraceResponseList); -// PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); -// pageSimpleResponse.setTotal(pageInfo.getTotal()); -// pageSimpleResponse.setList(udiTraceResponseList); -// return ResultVOUtils.success(pageSimpleResponse); -// } else { -// return ResultVOUtils.error(500, "未查询到数据！"); -// } -// -// } //TODO 20241017 先把这个接口注释了 -// @AuthRuleAnnotation("") -// @GetMapping("spms/inv/products/order/trace") -// public BaseResponse filterOrderTrace(FilterCodeTraceRequest filterCodeTraceRequest) { -// -// if (filterCodeTraceRequest.getCode() == null) { -// return ResultVOUtils.success(); -// } -// 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 mInvProductDetailEntities = new ArrayList<>(); -// //判断是否多级包装 -// List udiInfoEntities = udiProductService.findByUuids(udiInfoBean.getUuid()); -// -// if (udiInfoEntities != null && udiInfoEntities.size() > 1) { -// //多级包装根据产品ID，批次号查询 -// -// //1.判断是否di关联多个产品ID -// List 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 temps = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest); -// if (CollUtil.isNotEmpty(temps)) { -// Map> 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 invProductDetailEntities = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest); -// if (CollUtil.isNotEmpty(invProductDetailEntities)) { -// mInvProductDetailEntities.addAll(invProductDetailEntities); -// } -// } -// } -// } else { -// filterInvProductDetailRequest = new FilterInvProductDetailRequest(); -// filterInvProductDetailRequest.setRelId(udiRelevanceResponse.getId() + ""); -// filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo()); -// List 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 invProductDetailEntities = invProductServiceNew.list(new QueryWrapper().likeRight("code", filterCodeTraceRequest.getCode())); -//// List invProductDetailEntities = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest); -// if (CollUtil.isNotEmpty(invProductDetailEntities)) { -// mInvProductDetailEntities.addAll(invProductDetailEntities); -// } -// } -// if (mInvProductDetailEntities.size() > 0) { -// Map filterMap = new HashMap<>(); -// -// for (InvProductNewVo invProductDetailEntity : mInvProductDetailEntities) { -// filterMap.put(invProductDetailEntity.getOrderId(), invProductDetailEntity.getOrderId()); -// } -// List 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 orderEntities = orderService.filterList(filterOrderRequest); -// Collections.sort(orderEntities, Comparator.comparing(IoOrderResponse::getCreateTime)); -// PageInfo pageInfo; -// pageInfo = new PageInfo<>(orderEntities); -// PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); -// pageSimpleResponse.setTotal(pageInfo.getTotal()); -// pageSimpleResponse.setList(orderEntities); -// return ResultVOUtils.success(pageSimpleResponse); -// } else { -// return ResultVOUtils.error(500, "未查询到数据！"); -// } -// -// } + @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 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()); + } + +// IoCodeEntity; + filterInvProductDetailRequest.setSupId(filterCodeTraceRequest.getSupId()); + List invProductDetailEntities = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest); + if (invProductDetailEntities.size() > 0) { + Map filterMap = new HashMap<>(); + + for (InvProductNewVo invProductDetailEntity : invProductDetailEntities) { + filterMap.put(invProductDetailEntity.getOrderId(), invProductDetailEntity.getOrderId()); + } + List orderIds = new ArrayList<>(); + for (String key : filterMap.keySet()) { + orderIds.add(key); + } + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + filterOrderRequest.setOrderIds(orderIds); + List orderEntities = orderService.filterList(filterOrderRequest); + + + FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest(); + filterUdiInfoRequest.setNameCode(udiEntity.getUdi()); + List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + UdiRelevanceResponse udiRelevance = null; + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + udiRelevance = udiRelevanceResponses.get(0); + } + + UdiRelevanceResponse finalUdiRelevance = udiRelevance; + List 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 pageInfo; + pageInfo = new PageInfo<>(udiTraceResponseList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiTraceResponseList); + return ResultVOUtils.success(pageSimpleResponse); + } else { + return ResultVOUtils.error(500, "未查询到数据！"); + } + + } + + // TODO 20241017先把这个接口注释了 + @AuthRuleAnnotation("") + @GetMapping("spms/inv/products/order/trace") + + public BaseResponse filterOrderTrace(FilterCodeTraceRequest filterCodeTraceRequest) { + + if (filterCodeTraceRequest.getCode() == null) { + return ResultVOUtils.success(); + } + 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 mInvProductDetailEntities = new ArrayList<>(); + //判断是否多级包装 + List udiInfoEntities = udiProductService.findByUuids(udiInfoBean.getUuid()); + + if (udiInfoEntities != null && udiInfoEntities.size() > 1) { + //多级包装根据产品ID，批次号查询 + + //1.判断是否di关联多个产品ID + List 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 temps = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest); + if (CollUtil.isNotEmpty(temps)) { + Map> 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 invProductDetailEntities = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest); + if (CollUtil.isNotEmpty(invProductDetailEntities)) { + mInvProductDetailEntities.addAll(invProductDetailEntities); + } + } + } + } else { + filterInvProductDetailRequest = new FilterInvProductDetailRequest(); + filterInvProductDetailRequest.setRelId(udiRelevanceResponse.getId() + ""); + filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo()); + List 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 invProductDetailEntities = invProductServiceNew.list(new QueryWrapper().likeRight("code", filterCodeTraceRequest.getCode())); +// List invProductDetailEntities = invProductServiceNew.filterInvProductDetailList(filterInvProductDetailRequest); + if (CollUtil.isNotEmpty(invProductDetailEntities)) { + mInvProductDetailEntities.addAll(invProductDetailEntities); + } + } + if (mInvProductDetailEntities.size() > 0) { + Map filterMap = new HashMap<>(); + + for (InvProductNewVo invProductDetailEntity : mInvProductDetailEntities) { + filterMap.put(invProductDetailEntity.getOrderId(), invProductDetailEntity.getOrderId()); + } + List 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 orderEntities = orderService.filterList(filterOrderRequest); + Collections.sort(orderEntities, Comparator.comparing(IoOrderResponse::getCreateTime)); + PageInfo pageInfo; + pageInfo = new PageInfo<>(orderEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderEntities); + return ResultVOUtils.success(pageSimpleResponse); + } else { + return ResultVOUtils.error(500, "未查询到数据！"); + } + + } } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java index e0f46f57d..72b91850f 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java @@ -76,7 +76,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请添加领用设备！"); } if (StrUtil.isNotBlank(addDetailRequest.getCode())) { - if(addDetailRequest.getType() == 1){ + if (addDetailRequest.getType() == 1) { //通过条码添加 //解析此条码，判断此条码是否已经存在 UdiEntity udi = FilterUdiUtils.getUdi(addDetailRequest.getCode()); @@ -107,11 +107,11 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe InvProductNewVo invProductDetailEntity = invProductDetailEntities.get(0); DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), addDetailRequest.getCode(), invProductDetailEntity); deviceReceiveOrderDetailDao.insert(orderDetail); - }else if(addDetailRequest.getType() == 2){ - DeptDeviceDetailEntity deptDeviceDetailEntity= deptDeviceDetailDao.selectOne(new QueryWrapper().eq("originCode", addDetailRequest.getCode()).last("limit 1")); - DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = getDeviceReceiveOrderDetailAndDelectEntity(addDetailRequest.getOrderIdFk(),deptDeviceDetailEntity); + } else if (addDetailRequest.getType() == 2) { + DeptDeviceDetailEntity deptDeviceDetailEntity = deptDeviceDetailDao.selectOne(new QueryWrapper().eq("originCode", addDetailRequest.getCode()).last("limit 1")); + DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = getDeviceReceiveOrderDetailAndDelectEntity(addDetailRequest.getOrderIdFk(), deptDeviceDetailEntity); deviceReceiveOrderDetailDao.insert(deviceReceiveOrderDetailEntity); - }else if(addDetailRequest.getType() == 3){ + } else if (addDetailRequest.getType() == 3) { UdiEntity udi = FilterUdiUtils.getUdi(addDetailRequest.getCode()); UdiProductEntity udiProductEntity = udiProductService.selectUdiByName(udi.getUdi()); DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity(); @@ -125,7 +125,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe } } else { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("device_product"); - if(systemParamConfigEntity.getParamValue().equals("0") || addDetailRequest.getType() == 1){ + if (systemParamConfigEntity.getParamValue().equals("0") || addDetailRequest.getType() == 1) { //TODO 20241017 这个插入设备领用记录详情需要依赖订单详情表先注释了看下要不要用其他方式写 // //通过选库存添加 // //查询选中的库存信息 @@ -136,7 +136,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe // //插入设备领用记录详情 // 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()) { DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity(); @@ -151,11 +151,11 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe deviceReceiveOrderDetailDao.insert(deviceReceiveOrderDetailEntity); } - }else if(addDetailRequest.getType() == 2){ + } else if (addDetailRequest.getType() == 2) { for (String invProductId : addDetailRequest.getInvProductIds()) { DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity(); - DeptDeviceDetailEntity deptDeviceDetailEntity= deptDeviceDetailDao.selectById(invProductId); + DeptDeviceDetailEntity deptDeviceDetailEntity = deptDeviceDetailDao.selectById(invProductId); //查询库存详情 deviceReceiveOrderDetailEntity.setNameCode(deptDeviceDetailEntity.getNameCode()); deviceReceiveOrderDetailEntity.setRelId(Long.valueOf(deptDeviceDetailEntity.getRelId())); @@ -205,7 +205,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe return orderDetail; } - private static DeviceReceiveOrderDetailEntity getDeviceReceiveOrderDetailAndDelectEntity(String orderIdFk,DeptDeviceDetailEntity deptDeviceDetailEntity) { + private static DeviceReceiveOrderDetailEntity getDeviceReceiveOrderDetailAndDelectEntity(String orderIdFk, DeptDeviceDetailEntity deptDeviceDetailEntity) { DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity(); //查询库存详情 @@ -231,7 +231,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe } SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("device_product"); - if(systemParamConfigEntity.getParamValue().equals("0")){ + if (systemParamConfigEntity.getParamValue().equals("0")) { //判断新的条码是否重复 FilterDeviceReceiveOrderDetailRequest detailRequest = new FilterDeviceReceiveOrderDetailRequest(); detailRequest.setOrderIdFk(detailEntity.getOrderIdFk()); @@ -240,7 +240,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe if (CollUtil.isNotEmpty(list)) { return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "条码重复！"); } - }else{ + } else { } deviceReceiveOrderDetailDao.updateById(detailEntity); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index 6fdaa9e10..cc50151ce 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -81,12 +81,12 @@ public class InvPlaceServiceImpl implements InvPlaceService { return invProductNewDao.selectPlaceDetailList(filterInvPlaceRequest); } - //TODO 20241017 绑定货位先注释 + //TODO 20241017 绑定货位先注释 confirm @Override public BaseResponse bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest) { return null; // //查询仓库的部门ID -//// String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode()); +// String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode()); // InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode()); // List invPlaceOrderDetailEntityList = new ArrayList<>(); // if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { @@ -516,7 +516,7 @@ public class InvPlaceServiceImpl implements InvPlaceService { return "该产品库存不足！"; } } else { - count = invPreInProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode(),bindInvSpaceRequest.getInvCode()); + count = invPreInProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode(), bindInvSpaceRequest.getInvCode()); } if (count == null || count <= 0) { return "该产品库存不足！"; @@ -546,7 +546,7 @@ public class InvPlaceServiceImpl implements InvPlaceService { } count = invPreProductDetailEntity.getInCount(); } else { - count = invPreProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode(),bindInvSpaceRequest.getInvCode()); + count = invPreProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode(), bindInvSpaceRequest.getInvCode()); } if (count == null || count <= 0) { @@ -577,7 +577,7 @@ public class InvPlaceServiceImpl implements InvPlaceService { } count = invProductDetailEntity.getInCount(); } else { - count = invProductNewDao.getInventoryQuantity(bindInvSpaceRequest.getCode(),bindInvSpaceRequest.getInvCode()); + count = invProductNewDao.getInventoryQuantity(bindInvSpaceRequest.getCode(), bindInvSpaceRequest.getInvCode()); } if (count == null || count <= 0) { @@ -706,6 +706,7 @@ public class InvPlaceServiceImpl implements InvPlaceService { return actCount; } + //TODO 20241017 下架货位接口先注释 @Override public BaseResponse unbindInvOrderSpace(BindInvSpaceRequest bindInvSpaceRequest) {