diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 7e93830e9..3dfe574a0 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -457,7 +457,7 @@ public class IoCollectOrderController extends BaseController { //1.校验是否全部自动赋码 CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest(); collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo()); - if (collectOrderRequest.getIsCheckFinish() != null){ + if (collectOrderRequest.getIsCheckFinish() != null) { collectOrderBizRequest.setIsOrderCheck(collectOrderRequest.getIsCheckFinish()); } List collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest); 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 6a825e309..943ef3fd8 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -12,12 +12,17 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.auth.InvWarehouseDao; +import com.glxp.api.dao.auth.SysWorkplaceDao; +import com.glxp.api.dao.basic.SysWorkplaceBusMapper; import com.glxp.api.dao.collect.IoCollectOrderBackupMapper; import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; +import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.entity.basic.SysWorkplaceBus; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.entity.collect.*; import com.glxp.api.entity.inout.IoCodeEntity; @@ -38,6 +43,7 @@ import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectCodeResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.service.auth.InvWarehouseService; +import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.IoAddInoutService; import com.glxp.api.service.inout.IoCheckInoutService; @@ -183,70 +189,8 @@ public class IoCollectOrderBackupService extends ServiceImpl collectOrderCodes = collectOrderCodeManService.listByBillNo(collectOrder.getBillNo()); - BasicBussinessTypeEntity bussinessTypeEntity; - sysWorkplaceDocumentEntity.getInoutType(); - - //构造单据数据 - IoOrderEntity orderEntity = new IoOrderEntity(); - bussinessTypeEntity = bussinessTypeService.findByAction(sysWorkplaceDocumentEntity.getDocumentTypeCode()); - orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); - orderEntity.setAction(bussinessTypeEntity.getAction()); - orderEntity.setCreateTime(new Date()); - if (IntUtil.value(sysWorkplaceDocumentEntity.getCorpType()) == 2) { - orderEntity.setInvCode(collectOrder.getShipper() + ""); - orderEntity.setFromCorp(collectOrder.getFromCorp()); - InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode() + ""); - if (invWarehouseEntity != null) - orderEntity.setDeptCode(invWarehouseEntity.getParentId()); - } else { - orderEntity.setInvCode(collectOrder.getFromCorp() + ""); - orderEntity.setFromCorp(collectOrder.getShipper()); - InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode() + ""); - if (invWarehouseEntity != null) - orderEntity.setDeptCode(invWarehouseEntity.getParentId()); - } - - orderEntity.setCorpOrderId(CustomUtil.getId() + "x"); - orderEntity.setExportStatus(0); - orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_PROCESS); - orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT); - orderEntity.setCreateUser(collectOrder.getCreateUser()); - orderEntity.setCreateTime(new Date()); - orderEntity.setUpdateUser(collectOrder.getCreateUser()); - orderEntity.setUpdateTime(new Date()); - orderEntity.setCustomerId("110"); - orderEntity.setOrderType(2); - orderEntity.setProductType(bussinessTypeEntity.getProductType()); - orderEntity.setFromType(2); - String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); - orderEntity.setBillNo(orderNo); - List lossCodesList = new ArrayList<>(); - - for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodes) { - lossCodesList.add(buildCodeEntity(collectOrderCodeMan, orderEntity)); - } - - /** - * 如果单据类型为供应商的话，则进行供应商产品绑定 - */ - if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_SP) { - - Map> groupedMap = lossCodesList.stream() - .collect(Collectors.groupingBy(IoCodeTempEntity::getRelId)); - groupedMap.forEach((key, value) -> { - companyProductRelevanceService.insertOrReadId(key, collectOrder.getShipper()); - }); - for (IoCodeTempEntity codeTempEntity : lossCodesList) { - codeTempEntity.setSupId(collectOrder.getShipper()); - } - } - orderService.insertOrder(orderEntity); - codesTempDao.insertBatch(lossCodesList); - addInoutService.dealProcess(orderEntity); - if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) { - ioCheckInoutService.check(orderEntity.getBillNo()); - } + //todo + buildInnerOrder(collectOrder, sysWorkplaceDocumentEntity); } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1 && sysWorkplaceDocumentEntity.getScanType() != 1) { //更新单据为已完成 // IoOrderEntity orderEntity = orderService.findByBillNo(collectOrder.getBillNo()); @@ -297,6 +241,152 @@ public class IoCollectOrderBackupService extends ServiceImpl collectOrderCodes = collectOrderCodeManService.listByBillNo(collectOrder.getBillNo()); + BasicBussinessTypeEntity bussinessTypeEntity; + sysWorkplaceDocumentEntity.getInoutType(); + + //构造单据数据 + IoOrderEntity orderEntity = new IoOrderEntity(); + bussinessTypeEntity = bussinessTypeService.findByAction(sysWorkplaceDocumentEntity.getDocumentTypeCode()); + orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); + orderEntity.setAction(bussinessTypeEntity.getAction()); + orderEntity.setCreateTime(new Date()); + if (IntUtil.value(sysWorkplaceDocumentEntity.getCorpType()) == 2) { + orderEntity.setInvCode(collectOrder.getShipper() + ""); + orderEntity.setFromCorp(collectOrder.getFromCorp()); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode() + ""); + if (invWarehouseEntity != null) orderEntity.setDeptCode(invWarehouseEntity.getParentId()); + } else { + orderEntity.setInvCode(collectOrder.getFromCorp() + ""); + orderEntity.setFromCorp(collectOrder.getShipper()); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode() + ""); + if (invWarehouseEntity != null) orderEntity.setDeptCode(invWarehouseEntity.getParentId()); + } + + orderEntity.setCorpOrderId(CustomUtil.getId() + "x"); + orderEntity.setExportStatus(0); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_PROCESS); + orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT); + orderEntity.setCreateUser(collectOrder.getCreateUser()); + orderEntity.setCreateTime(new Date()); + orderEntity.setUpdateUser(collectOrder.getCreateUser()); + orderEntity.setUpdateTime(new Date()); + orderEntity.setCustomerId("110"); + orderEntity.setOrderType(2); + orderEntity.setProductType(bussinessTypeEntity.getProductType()); + orderEntity.setFromType(2); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + orderEntity.setBillNo(orderNo); + List lossCodesList = new ArrayList<>(); + + for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodes) { + lossCodesList.add(buildCodeEntity(collectOrderCodeMan, orderEntity)); + } + + /** + * 如果单据类型为供应商的话，则进行供应商产品绑定 + */ + if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_SP) { + + Map> groupedMap = lossCodesList.stream().collect(Collectors.groupingBy(IoCodeTempEntity::getRelId)); + groupedMap.forEach((key, value) -> { + companyProductRelevanceService.insertOrReadId(key, collectOrder.getShipper()); + }); + for (IoCodeTempEntity codeTempEntity : lossCodesList) { + codeTempEntity.setSupId(collectOrder.getShipper()); + } + } + orderService.insertOrder(orderEntity); + codesTempDao.insertBatch(lossCodesList); + addInoutService.dealProcess(orderEntity); + if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) { + ioCheckInoutService.check(orderEntity.getBillNo()); + } + } + + @Resource + SysWorkplaceBusMapper sysWorkplaceBusMapper; + @Resource + SysWorkplaceService sysWorkplaceService; + @Resource + InvWarehouseDao invWarehouseDao; + + public void uploadInnerOrder(IoCollectOrderBackup collectOrder, SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity) { + List collectOrderCodes = collectOrderCodeManService.listByBillNo(collectOrder.getBillNo()); + BasicBussinessTypeEntity bussinessTypeEntity; + sysWorkplaceDocumentEntity.getInoutType(); + + InvWarehouseEntity invWarehouseEntity = null; + SysWorkplaceBus sysWorkplaceBus = sysWorkplaceBusMapper.selectOne(new LambdaQueryWrapper().eq(SysWorkplaceBus::getBusTypeCode, sysWorkplaceDocumentEntity.getDocumentTypeCode()).last("limit 1")); + if (sysWorkplaceBus != null) { + SysWorkplace sysWorkplace = sysWorkplaceService.getWorkplace(sysWorkplaceBus.getWorkplaceCode()); + if (sysWorkplace != null) { + String deptCode = sysWorkplace.getDeptCode(); + invWarehouseEntity = invWarehouseDao.selectOne(new LambdaQueryWrapper().eq(InvWarehouseEntity::getParentId, deptCode).last("limit 1")); + } + } + if (invWarehouseEntity == null) { + throw new JsonException(500, "未找到科室"); + } + //构造单据数据 + IoOrderEntity orderEntity = new IoOrderEntity(); + bussinessTypeEntity = bussinessTypeService.findByAction(sysWorkplaceDocumentEntity.getDocumentTypeCode()); + orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); + orderEntity.setAction(bussinessTypeEntity.getAction()); + orderEntity.setPreInBillNo(collectOrder.getPreInBillNo()); + orderEntity.setCreateTime(new Date()); + if (IntUtil.value(sysWorkplaceDocumentEntity.getCorpType()) == 2) { + orderEntity.setInvCode(invWarehouseEntity.getCode()); + orderEntity.setFromCorp(collectOrder.getFromCorp()); + if (invWarehouseEntity != null) orderEntity.setDeptCode(invWarehouseEntity.getParentId()); + } else { + orderEntity.setInvCode(invWarehouseEntity.getCode()); + orderEntity.setFromCorp(collectOrder.getShipper()); + if (invWarehouseEntity != null) orderEntity.setDeptCode(invWarehouseEntity.getParentId()); + } + orderEntity.setCorpOrderId(CustomUtil.getId() + "x"); + orderEntity.setExportStatus(0); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_PROCESS); + orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT); + orderEntity.setCreateUser(collectOrder.getCreateUser()); + orderEntity.setCreateTime(new Date()); + orderEntity.setUpdateUser(collectOrder.getCreateUser()); + orderEntity.setUpdateTime(new Date()); + orderEntity.setCustomerId("110"); + orderEntity.setOrderType(2); + orderEntity.setProductType(bussinessTypeEntity.getProductType()); + orderEntity.setFromType(2); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + orderEntity.setBillNo(orderNo); + List lossCodesList = new ArrayList<>(); + for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodes) { + lossCodesList.add(buildCodeEntity(collectOrderCodeMan, orderEntity)); + } + /** + * 如果单据类型为供应商的话，则进行供应商产品绑定 + */ + if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_SP) { + + Map> groupedMap = lossCodesList.stream().collect(Collectors.groupingBy(IoCodeTempEntity::getRelId)); + groupedMap.forEach((key, value) -> { + companyProductRelevanceService.insertOrReadId(key, collectOrder.getShipper()); + }); + for (IoCodeTempEntity codeTempEntity : lossCodesList) { + codeTempEntity.setSupId(collectOrder.getShipper()); + } + } + orderService.insertOrder(orderEntity); + codesTempDao.insertBatch(lossCodesList); + addInoutService.dealProcess(orderEntity); + if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) { + ioCheckInoutService.check(orderEntity.getBillNo()); + } + } + public void updateSpmsOrder(String billNo, AuthAdmin authAdmin) { { @@ -403,8 +493,7 @@ public class IoCollectOrderBackupService extends ServiceImpl collectOrderResponses = filterList(collectOrderRequest); - if (CollUtil.isNotEmpty(collectOrderResponses)) - return collectOrderResponses.get(0); - else - return null; + if (CollUtil.isNotEmpty(collectOrderResponses)) return collectOrderResponses.get(0); + else return null; } public int updateByBillNo(IoCollectOrder collectOrder) { @@ -249,21 +247,19 @@ public class IoCollectOrderService extends ServiceImpl orderEntities2 = orderService.findAllByAction("SC72249388338364"); orderEntities.addAll(orderEntities1); orderEntities.addAll(orderEntities2); - orderEntities.parallelStream().forEach(item -> - { - List delBillNos = new ArrayList<>(); - delBillNos.add(item.getBillNo()); - orderService.deleteInvByBillNo(delBillNos); - for (String billNo : delBillNos) { - orderService.deleteByBillNo(billNo); - orderDetailBizService.deleteByOrderId(billNo); - orderDetailCodeService.deleteByOrderId(billNo); - orderDetailResultService.deleteByOrderId(billNo); - codeTempService.deleteByBillNo(billNo); - codeService.deleteCodeByOrderId(billNo); - } - } - ); + orderEntities.parallelStream().forEach(item -> { + List delBillNos = new ArrayList<>(); + delBillNos.add(item.getBillNo()); + orderService.deleteInvByBillNo(delBillNos); + for (String billNo : delBillNos) { + orderService.deleteByBillNo(billNo); + orderDetailBizService.deleteByOrderId(billNo); + orderDetailCodeService.deleteByOrderId(billNo); + orderDetailResultService.deleteByOrderId(billNo); + codeTempService.deleteByBillNo(billNo); + codeService.deleteCodeByOrderId(billNo); + } + }); } // TODO: 2024/10/14 下载本地单据类型 @@ -293,8 +289,7 @@ public class IoCollectOrderService extends ServiceImpl collectOrderOriginBizs = new ArrayList<>(); for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(bizEntity.getBindRlFk() + ""); - IoCollectOrderBiz collectOrderBiz = IoCollectOrderBiz.builder().orderIdFk(collectOrder.getBillNo()) - .relId(bizEntity.getBindRlFk()) - .thrCode(udiRelevanceResponse.getMainId()) - .ybbm(udiRelevanceResponse.getYbbm()) - .payFeeCode(udiRelevanceResponse.getPayFeeCode()) - .cpmctymc(bizEntity.getCoName()) - .nameCode(bizEntity.getNameCode()) - .ggxh(bizEntity.getSpec()) - .batchNo(bizEntity.getBatchNo()) - .productDate(bizEntity.getProductDate()) - .expireDate(bizEntity.getExpireDate()) - .count(bizEntity.getCount()) - .measureUnit(bizEntity.getMeasname()) - .tagStatus(1) - .unTagCount(bizEntity.getCount()).build(); + IoCollectOrderBiz collectOrderBiz = IoCollectOrderBiz.builder().orderIdFk(collectOrder.getBillNo()).relId(bizEntity.getBindRlFk()).thrCode(udiRelevanceResponse.getMainId()).ybbm(udiRelevanceResponse.getYbbm()).payFeeCode(udiRelevanceResponse.getPayFeeCode()).cpmctymc(bizEntity.getCoName()).nameCode(bizEntity.getNameCode()).ggxh(bizEntity.getSpec()).batchNo(bizEntity.getBatchNo()).productDate(bizEntity.getProductDate()).expireDate(bizEntity.getExpireDate()).count(bizEntity.getCount()).measureUnit(bizEntity.getMeasname()).tagStatus(1).unTagCount(bizEntity.getCount()).build(); if (IntUtil.value(udiRelevanceResponse.getProductsType()) == 2) { collectOrderBiz.setGgxh(udiRelevanceResponse.getBzgg()); @@ -375,30 +341,12 @@ public class IoCollectOrderService extends ServiceImpl collectOrderBizs = new ArrayList<>(); for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(bizEntity.getBindRlFk() + ""); - IoCollectOrderBiz collectOrderBiz = IoCollectOrderBiz.builder().orderIdFk(collectOrder.getBillNo()) - .relId(bizEntity.getBindRlFk()) - .thrCode(udiRelevanceResponse.getMainId()) - .ybbm(udiRelevanceResponse.getYbbm()) - .payFeeCode(udiRelevanceResponse.getPayFeeCode()) - .cpmctymc(bizEntity.getCoName()) - .nameCode(bizEntity.getNameCode()) - .ggxh(bizEntity.getSpec()) - .batchNo(bizEntity.getBatchNo()) - .productDate(bizEntity.getProductDate()) - .expireDate(bizEntity.getExpireDate()) - .count(bizEntity.getCount()) - .measureUnit(bizEntity.getMeasname()) - .tagStatus(1) - .remark(bizEntity.getRemark()) - .unTagCount(bizEntity.getCount()).build(); + IoCollectOrderBiz collectOrderBiz = IoCollectOrderBiz.builder().orderIdFk(collectOrder.getBillNo()).relId(bizEntity.getBindRlFk()).thrCode(udiRelevanceResponse.getMainId()).ybbm(udiRelevanceResponse.getYbbm()).payFeeCode(udiRelevanceResponse.getPayFeeCode()).cpmctymc(bizEntity.getCoName()).nameCode(bizEntity.getNameCode()).ggxh(bizEntity.getSpec()).batchNo(bizEntity.getBatchNo()).productDate(bizEntity.getProductDate()).expireDate(bizEntity.getExpireDate()).count(bizEntity.getCount()).measureUnit(bizEntity.getMeasname()).tagStatus(1).remark(bizEntity.getRemark()).unTagCount(bizEntity.getCount()).build(); if (IntUtil.value(udiRelevanceResponse.getProductsType()) == 2) { collectOrderBiz.setGgxh(udiRelevanceResponse.getBzgg()); @@ -539,16 +456,14 @@ public class IoCollectOrderService extends ServiceImpl basicSkPrescribeEntities) { //下载处方 - if (CollUtil.isEmpty(basicSkPrescribeEntities)) - basicSkPrescribeEntities = basicSkPrescribeService.list(); + if (CollUtil.isEmpty(basicSkPrescribeEntities)) basicSkPrescribeEntities = basicSkPrescribeService.list(); List allWorksList = new ArrayList<>(); for (BasicSkPrescribeEntity basicSkPrescribeEntity : basicSkPrescribeEntities) { if (collectOrderMapper.exists(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, basicSkPrescribeEntity.getCode()))) { continue; } SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(basicSkPrescribeEntity.getAddr()); - if (sysWorkplaceDocumentEntity == null) - continue; + if (sysWorkplaceDocumentEntity == null) continue; //自动分配工位 final Long[] defaultWorkplace = {null}; List sysWorkplaces = sysWorkplaceService.getAllByBusType(basicSkPrescribeEntity.getAddr()); @@ -559,16 +474,14 @@ public class IoCollectOrderService extends ServiceImpl addWorkplace = new ArrayList<>(); for (SysWorkplaceResponse sysWorkplace : sysWorkplaces) { //获取是否有正在处理的工位 - List collectOrderList1 = collectOrderMapper.selectList(new LambdaQueryWrapper() - .eq(IoCollectOrder::getWorkPlaceCode, sysWorkplace.getWorkplaceId()).in(IoCollectOrder::getTagStatus, -1, 1, 2)); + List collectOrderList1 = collectOrderMapper.selectList(new LambdaQueryWrapper().eq(IoCollectOrder::getWorkPlaceCode, sysWorkplace.getWorkplaceId()).in(IoCollectOrder::getTagStatus, -1, 1, 2)); sysWorkplace.setOrderCount(collectOrderList1.size()); if (IntUtil.value(sysWorkplace.getOrderCount()) > 0) { addWorkplace.add(sysWorkplace); } } if (addWorkplace.size() > 0) { - Optional minCountObject = addWorkplace.stream() - .min((o1, o2) -> Integer.compare(o1.getOrderCount(), o2.getOrderCount())); + Optional minCountObject = addWorkplace.stream().min((o1, o2) -> Integer.compare(o1.getOrderCount(), o2.getOrderCount())); minCountObject.ifPresent(sysWorkplace -> defaultWorkplace[0] = sysWorkplace.getWorkplaceId()); } else { defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); @@ -577,22 +490,7 @@ public class IoCollectOrderService extends ServiceImpl 0) { - IoCollectOrderBiz bizServiceOne = collectOrderBizService.getOne(new LambdaQueryWrapper() - .eq(IoCollectOrderBiz::getId, bizIdFk)); + IoCollectOrderBiz bizServiceOne = collectOrderBizService.getOne(new LambdaQueryWrapper().eq(IoCollectOrderBiz::getId, bizIdFk)); if (bizServiceOne == null) throw new JsonException("扫码详情未查找到"); //反查单据类型 查看是否来源业务单 @@ -789,11 +673,7 @@ public class IoCollectOrderService extends ServiceImpl().eq(SysWorkplaceDocumentEntity::getDocumentTypeCode, - collectOrderRequest.getBusType())); + SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.getOne(new LambdaQueryWrapper().eq(SysWorkplaceDocumentEntity::getDocumentTypeCode, collectOrderRequest.getBusType())); if (sysWorkplaceDocumentEntity.getScanType() == 1) { - IoCollectOrder collectOrder1 = - getOne(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, collectOrderRequest.getBillNo())); + IoCollectOrder collectOrder1 = getOne(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, collectOrderRequest.getBillNo())); collectOrder1.setTagStatus(3); collectOrder1.setUpdateTime(new Date()); updateById(collectOrder1); @@ -847,23 +717,14 @@ public class IoCollectOrderService extends ServiceImpl { //插入到码表 - collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo(),null); + collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo(), null); //更新数据至第三方系统 //单据更新 ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo(), authAdmin); @@ -1027,8 +888,7 @@ public class IoCollectOrderService extends ServiceImpl ioCollectOrders = collectOrderMapper.selectList(new LambdaQueryWrapper() - .eq(IoCollectOrder::getWorkPlaceCode, request.getWorkPlaceCode()) - .eq(IoCollectOrder::getTagStatus, request.getTagStatus())); + List ioCollectOrders = collectOrderMapper.selectList(new LambdaQueryWrapper().eq(IoCollectOrder::getWorkPlaceCode, request.getWorkPlaceCode()).eq(IoCollectOrder::getTagStatus, request.getTagStatus())); if (ioCollectOrders.size() > 0) { return false; @@ -1100,8 +958,7 @@ public class IoCollectOrderService extends ServiceImpl> detailsMap = a010details.stream() - .collect(Collectors.groupingBy(VA010Mx::getCodefk)); + Map> detailsMap = a010details.stream().collect(Collectors.groupingBy(VA010Mx::getCodefk)); List ioCollectOrders = new ArrayList<>();