diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index 01ee4df5f..0be83b3bc 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -32,6 +32,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; @Service @@ -436,8 +437,15 @@ public class UdiRelevanceServiceImpl extends ServiceImpl udiRelevanceEntityList = udiRelevanceDao.selectList(qw); if (CollectionUtil.isNotEmpty(udiRelevanceEntityList)) { - mainIdRelIdMap = udiRelevanceEntityList.stream().collect(Collectors.toMap(UdiRelevanceEntity::getMainId, udiRelevanceEntity -> udiRelevanceEntity)); -// List relIds = udiRelevanceEntityList.stream().map(UdiRelevanceEntity::getId).collect(Collectors.toList()); +// mainIdRelIdMap = udiRelevanceEntityList.stream().collect(Collectors.toMap(UdiRelevanceEntity::getMainId, udiRelevanceEntity -> udiRelevanceEntity)); + mainIdRelIdMap = udiRelevanceEntityList.stream() + .collect(Collectors.toMap( + UdiRelevanceEntity::getMainId, + Function.identity(), + // 合并函数,这里我们假设你想保留第一个遇到的实体 + (existing, replacement) -> existing + )); + // List relIds = udiRelevanceEntityList.stream().map(UdiRelevanceEntity::getId).collect(Collectors.toList()); // List basicProductsEntities = udiRelevanceDao.selectProductByRelIds(relIds); // if (CollectionUtil.isNotEmpty(basicProductsEntities)){ // relIdBasicProductsEntityMap = basicProductsEntities.stream().collect(Collectors.toMap(BasicProductsEntity::getId, x -> x)); diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 873ccd423..0a6872be3 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3923,29 +3923,30 @@ CREATE TABLE IF NOT EXISTS `device_asset_contract` INSERT ignore INTO `basic_bussiness_type`(`id`, `mainAction`, `action`, `name`, `enable`, `remark`, `thirdSysFk`, - `genUnit`, `innerOrder`, `secCheckEnable`, `checkEnable`, `checkUdims`, - `checkPdaEd`, `checkPdaUn`, `checkPc`, `checkWebNew`, `checkSp`, - `checkChange`, `secCheckUdims`, `secCheckPdaEd`, `secCheckPdaUn`, - `secCheckPc`, `secCheckWebNew`, `secCheckChange`, `secCheckSp`, `corpType`, - `supplementOrderType`, `checkBalance`, `secCheckBalance`, `useDyCount`, - `expireTip`, `updateTime`, `defaultUnit`, `prefix`, `outToSpms`, `ullageFill`, - `scanPreIn`, `vailInv`, `entrutSpms`, `codeFillCheck`, `defaultSubInv`, - `defaultInv`, `orderVisibleType`, `checkCopy`, `secCheckCopy`, `originAction`, - `advanceType`, `changeEnable`, `spUse`, `preIn`, `preInBack`, `supplementAll`, - `createUser`, `createTime`, `updateUser`, `vailDispatch`, `vailGroupBuy`, - `busType`, `inStock`, `actionType`, `thrCheckEnable`, `thrCheckWebNew`, - `thrCheckPdaUn`, `thrCheckPdaEd`, `thrCheckUdims`, `thrCheckPc`, `thrCheckSp`, - `thrCheckChange`, `thrCheckBalance`, `thrCheckCopy`, `fillCodeRel`, - `checkVailDate`, `checkExpire`, `checkCertExpire`, `preInBackAction`, - `backPreinType`, `advancePreIn`, `sortNum`, `spaceOut`, `checkReview`, - `secCheckReview`, `thrCheckReview`, `checkWebNewType`, `editType`, - `inPreInBack`, `deptNoInvType`, `vailPrescribe`, `inputSick`, `groupBuySplit`, - `vailInvBatchNo`, `vailProductAttributes`, `devInType`, `vailHcType`, - `requireScanCode`, `codeCheck`) -VALUES (1844274444567728128, 'WareHouseIn', 'SC72854426720051', '科室退费入库', 1, '', '', 0, 0, 0, 1, 0, 0, 0, 0, 4, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, '', 0, 0, 0, 1, '2024-10-10 15:49:37', NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0, 0, - NULL, NULL, 0, 0, NULL, 0, 0, NULL, NULL, '1', 0, 0, NULL, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, NULL, - 1, 0, 999, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, NULL, 0, NULL, 0, NULL, b'0', NULL); + `genUnit`, `innerOrder`, `secCheckEnable`, `checkEnable`, `checkUdims`, + `checkPdaEd`, `checkPdaUn`, `checkPc`, `checkWebNew`, `checkSp`, + `checkChange`, `secCheckUdims`, `secCheckPdaEd`, `secCheckPdaUn`, + `secCheckPc`, `secCheckWebNew`, `secCheckChange`, `secCheckSp`, `corpType`, + `supplementOrderType`, `checkBalance`, `secCheckBalance`, `useDyCount`, + `expireTip`, `updateTime`, `defaultUnit`, `prefix`, `outToSpms`, + `ullageFill`, `scanPreIn`, `vailInv`, `entrutSpms`, `codeFillCheck`, + `defaultSubInv`, `defaultInv`, `orderVisibleType`, `checkCopy`, + `secCheckCopy`, `originAction`, `advanceType`, `changeEnable`, `spUse`, + `preIn`, `preInBack`, `supplementAll`, `createUser`, `createTime`, + `updateUser`, `vailDispatch`, `vailGroupBuy`, `busType`, `inStock`, + `actionType`, `thrCheckEnable`, `thrCheckWebNew`, `thrCheckPdaUn`, + `thrCheckPdaEd`, `thrCheckUdims`, `thrCheckPc`, `thrCheckSp`, + `thrCheckChange`, `thrCheckBalance`, `thrCheckCopy`, `fillCodeRel`, + `checkVailDate`, `checkExpire`, `checkCertExpire`, `preInBackAction`, + `backPreinType`, `sortNum`, `advancePreIn`, `spaceOut`, `checkReview`, + `secCheckReview`, `thrCheckReview`, `editType`, `inPreInBack`, + `vailProductAttributes`, `vailHcType`, `checkWebNewType`, `deptNoInvType`, + `vailPrescribe`, `inputSick`, `groupBuySplit`, `vailInvBatchNo`, + `devInType`, `requireScanCode`, `codeCheck`, `requireCost`) +VALUES (1859776049824198656, 'WareHouseIn', 'SC72854426720051', '临床退库(普耗退费)', 1, '', '', 0, 0, 0, 1, 0, 0, 0, 0, 4, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 3, '', 0, 0, 0, 1, '2024-11-22 11:55:24', NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, + 0, 0, NULL, NULL, 0, 0, NULL, 0, 0, NULL, NULL, '1', 0, 0, NULL, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, + NULL, 1, 999, 0, 0, 0, 0, 0, 1, 1, NULL, 0, 0, 0, 0, 0, 2, 1, 0, b'0', 0, b'0'); CALL Pro_Temp_ColumnWork('basic_products', 'requireCost', 'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要收费 1是;0否''',