diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java index 2a24c5522..3cc4526de 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java @@ -62,7 +62,10 @@ public class IoCollectCodeBackupController extends BaseController { ioCollectCodeResponse.setManufactory(ioCollectCodeResponse.getYlqxzcrbarmc()); } IoCollectOrder byBillNo = collectOrderService.getByBillNo(ioCollectCodeResponse.getBillNo()); - ioCollectCodeResponse.setBillTime(byBillNo.getBillTime()); + if (byBillNo.getBillTime() != null){ + ioCollectCodeResponse.setBillTime(byBillNo.getBillTime()); + } + if (byBillNo.getRemark() != null) { ioCollectCodeResponse.setRemark(byBillNo.getRemark()); } @@ -218,4 +221,26 @@ public class IoCollectCodeBackupController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + + /** + * 追溯码 + */ + @GetMapping("/udiwms/basic/collect/ioCollectCodeBackup/codeOrders") + public BaseResponse codeOrdersList(IoCollectCodeRequest IoCollectCodeRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List collectOrderCodeManResponses = ioCollectCodeBackService.filterList(IoCollectCodeRequest); + for (IoCollectCodeResponse ioCollectCodeResponse : collectOrderCodeManResponses) { + if (StrUtil.isEmpty(ioCollectCodeResponse.getManufactory())) { + ioCollectCodeResponse.setManufactory(ioCollectCodeResponse.getYlqxzcrbarmc()); + } + } + PageInfo pageInfo = new PageInfo<>(collectOrderCodeManResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(collectOrderCodeManResponses); + return ResultVOUtils.success(pageSimpleResponse); + } } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java index d005d954b..633419657 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -227,8 +227,10 @@ public class IoCollectOrderBackupController extends BaseController { collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo()); } if (StrUtil.isNotEmpty(collectOrderRequest.getYbbm())){ - collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getYbbm()); + collectOrderBizRequest.setYbbm(collectOrderRequest.getYbbm()); } + collectOrderBizRequest.setPage(collectOrderRequest.getPage()); + collectOrderBizRequest.setLimit(collectOrderRequest.getLimit()); List collectOrderBizResponses = ioCollectOrderBizBackupService.filterList(collectOrderBizRequest); PageInfo pageInfo = new PageInfo<>(collectOrderBizResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -243,14 +245,34 @@ public class IoCollectOrderBackupController extends BaseController { public BaseResponse orderStats(@RequestBody CollectOrderRequest collectOrderRequest) { List workPlaceCodes = null; List page; - // 上传医保不做登录权限限制 log.error("collectOrderRequest"+collectOrderRequest); Page orderResponses = ioCollectOrderBackupService.filterorderStatsList(collectOrderRequest); - return ResultVOUtils.success(orderResponses); } + @GetMapping("/udiwms/basic/collect/ioCollectCodeBackup/getOrderCodeDetails") + public BaseResponse getOrderCodeDetails(CollectOrderRequest collectOrderRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest(); + if (StrUtil.isNotEmpty(collectOrderRequest.getBillNo())){ + collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo()); + } + if (StrUtil.isNotEmpty(collectOrderRequest.getYbbm())){ + collectOrderBizRequest.setYbbm(collectOrderRequest.getYbbm()); + } + collectOrderBizRequest.setPage(collectOrderRequest.getPage()); + collectOrderBizRequest.setLimit(collectOrderRequest.getLimit()); + List collectOrderBizResponses = ioCollectOrderBizBackupService.getOrderCodeDetails(collectOrderBizRequest); + PageInfo pageInfo = new PageInfo<>(collectOrderBizResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(collectOrderBizResponses); + return ResultVOUtils.success(pageSimpleResponse); + } } diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizBackupMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizBackupMapper.java index 73976015f..0077e7420 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizBackupMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizBackupMapper.java @@ -15,5 +15,7 @@ public interface IoCollectOrderBizBackupMapper extends BaseMapper filterList(CollectOrderBizRequest collectOrderRequest); + List getOrderCodeDetails(CollectOrderBizRequest collectOrderRequest); + } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index a53fe4071..e55d75b9b 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -799,13 +799,11 @@ public class IoCollectOrderBackupService extends ServiceImpl orderBizBackups = ioCollectOrderBizBackupService.listByBillNo(ioCollectOrderResponse.getBillNo()); - // 遍历集合进行累加 for (IoCollectOrderBizBackup collectOrderBizResponse : orderBizBackups) { newScanCount += (collectOrderBizResponse.getScanCount() != null) ? collectOrderBizResponse.getScanCount() : 0; shouldCount += getCount(collectOrderBizResponse); } - // 设置计算结果 ioCollectOrderResponse.setScanCount(newScanCount); ioCollectOrderResponse.setShouldCount(shouldCount); ioCollectOrderResponse.setScanRate(getScanRate(shouldCount, newScanCount)); @@ -824,20 +822,16 @@ public class IoCollectOrderBackupService extends ServiceImpl pageData = filteredData.subList(start, end); - // 创建分页对象 Page page = new Page<>(); page.setCurrent(pageNum); page.setSize(pageSize); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java index 839f406a8..ad093fc03 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java @@ -57,4 +57,16 @@ public class IoCollectOrderBizBackupService extends ServiceImpl getOrderCodeDetails(CollectOrderBizRequest collectOrderRequest) { + if (collectOrderRequest == null) { + return Collections.emptyList(); + } + if (collectOrderRequest.getPage() != null) { + int offset = (collectOrderRequest.getPage() - 1) * collectOrderRequest.getLimit(); + PageHelper.offsetPage(offset, collectOrderRequest.getLimit()); + } + List data = ioCollectOrderBizBackupMapper.getOrderCodeDetails(collectOrderRequest); + return data; + } + } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java index 3b7b10c4e..9e7d2c2df 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java @@ -174,13 +174,13 @@ public class IoCollectOrderBizService extends ServiceImpl fullList = list.stream() - .filter(item -> item.getReCount() == 0 || item.getReCount() == null) + .filter(item -> item.getReCount() == null || item.getReCount() == 0) .collect(Collectors.toList()); //拆零 List spiltList = list.stream() .filter(item -> { - Integer reCount = item.getReCount(); + Integer reCount = item.getReCount() == null ? 0 : item.getReCount(); return reCount > 0; }) .collect(Collectors.toList()); @@ -204,12 +204,31 @@ public class IoCollectOrderBizService extends ServiceImpl productList = basicProductsDao.selectList( + new LambdaQueryWrapper() + .eq(BasicProductsEntity::getYbbm, collectOrderBizResponse.getYbbm()) + .eq(BasicProductsEntity::getPackLevel, "1")); + BasicProductsEntity product = productList.get(0); + Integer myBhxjsl = product.getBhxjsl(); Integer shouldCount = 0; - if (fullList.size() > 0){ - shouldCount = fullList.size(); + double quotient = (double) collectOrderBizResponse.getCount() / myBhxjsl; + int integerPart = (int) quotient; + if (quotient == integerPart) { + if (integerPart == 0) { + if (collectOrderBizResponse.getAutoTagStatus() != 2) { + shouldCount = 1; + } + } else { + shouldCount = integerPart; + } + } else { + if (IntUtil.value(collectOrderBizResponse.getAutoTagStatus()) == 2) { + shouldCount = 0; + } else { + shouldCount = integerPart + 1; + } } collectOrderBizResponse.setShouldCount(shouldCount); - collectOrderBizResponse.setShouldCount(shouldCount); if (collectOrderBizResponse.getScanCount() == null) { collectOrderBizResponse.setScanCount(0); } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index c7b5b2cab..80bdfd9fe 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -1171,7 +1171,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl spiltList = ioCollectCodeBackups.stream() .filter(item -> { - Integer reCount = item.getReCount(); + Integer reCount = item.getReCount() == null ? 0 : item.getReCount() ; return reCount > 0; }) .collect(Collectors.toList()); diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index 078f96d95..d7bad3dfd 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -129,8 +129,10 @@ public class IoSplitCodeService extends ServiceImpl 0) { ioSplitCodeEntity.setRemainCount(count); @@ -143,7 +145,24 @@ public class IoSplitCodeService extends ServiceImpl 0 ? count : 0).reCount(unCount).build()); + collectOrderCodeAutoService.save( + IoCollectOrderCodeAuto + .builder() + .codeIdFk(ioSplitCodeEntity.getId()) + .udiCode(ioSplitCodeEntity.getCode()) + .orderIdFk(collectOrder.getBillNo()) + .batchNo(ioSplitCodeEntity.getBatchNo()) + .productDate(ioSplitCodeEntity.getProduceDate()) + .expireDate(ioSplitCodeEntity.getExpireDate()) + .serialNo(ioSplitCodeEntity.getSerialNo()) + .relId(collectOrderBiz.getRelId()) + .bizIdFk(collectOrderBiz.getId()) + .fifoSplit(1) + .createTime(new Date()) + .updateTime(new Date()) + .count(count > 0 ? count : 0) + .reCount(restCount) + .build()); splitCodeMapper.updateById(ioSplitCodeEntity); } @@ -330,7 +349,22 @@ public class IoSplitCodeService extends ServiceImpl + + +