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

fix:修复

Browse Source
lh_dev_fifo
chenhc 7 months ago
parent b69aee9ef6
commit 93e8319f0b
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java
Unescape Escape View File

@ -32,6 +32,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
@ -436,7 +437,14 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
List<UdiRelevanceEntity> udiRelevanceEntityList = udiRelevanceDao.selectList(qw); List<UdiRelevanceEntity> udiRelevanceEntityList = udiRelevanceDao.selectList(qw);
if (CollectionUtil.isNotEmpty(udiRelevanceEntityList)) { if (CollectionUtil.isNotEmpty(udiRelevanceEntityList)) {
mainIdRelIdMap = udiRelevanceEntityList.stream().collect(Collectors.toMap(UdiRelevanceEntity::getMainId, udiRelevanceEntity -> udiRelevanceEntity)); // mainIdRelIdMap = udiRelevanceEntityList.stream().collect(Collectors.toMap(UdiRelevanceEntity::getMainId, udiRelevanceEntity -> udiRelevanceEntity));
mainIdRelIdMap = udiRelevanceEntityList.stream()
.collect(Collectors.toMap(
UdiRelevanceEntity::getMainId,
Function.identity(),
// 合并函数，这里我们假设你想保留第一个遇到的实体
(existing, replacement) -> existing
));
// List<Long> relIds = udiRelevanceEntityList.stream().map(UdiRelevanceEntity::getId).collect(Collectors.toList()); // List<Long> relIds = udiRelevanceEntityList.stream().map(UdiRelevanceEntity::getId).collect(Collectors.toList());
// List<BasicProductsEntity> basicProductsEntities = udiRelevanceDao.selectProductByRelIds(relIds); // List<BasicProductsEntity> basicProductsEntities = udiRelevanceDao.selectProductByRelIds(relIds);
// if (CollectionUtil.isNotEmpty(basicProductsEntities)){ // if (CollectionUtil.isNotEmpty(basicProductsEntities)){

33
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -3928,24 +3928,25 @@ INSERT ignore INTO `basic_bussiness_type`(`id`, `mainAction`, `action`, `name`,
`checkChange`, `secCheckUdims`, `secCheckPdaEd`, `secCheckPdaUn`, `checkChange`, `secCheckUdims`, `secCheckPdaEd`, `secCheckPdaUn`,
`secCheckPc`, `secCheckWebNew`, `secCheckChange`, `secCheckSp`, `corpType`, `secCheckPc`, `secCheckWebNew`, `secCheckChange`, `secCheckSp`, `corpType`,
`supplementOrderType`, `checkBalance`, `secCheckBalance`, `useDyCount`, `supplementOrderType`, `checkBalance`, `secCheckBalance`, `useDyCount`,
`expireTip`, `updateTime`, `defaultUnit`, `prefix`, `outToSpms`, `ullageFill`, `expireTip`, `updateTime`, `defaultUnit`, `prefix`, `outToSpms`,
`scanPreIn`, `vailInv`, `entrutSpms`, `codeFillCheck`, `defaultSubInv`, `ullageFill`, `scanPreIn`, `vailInv`, `entrutSpms`, `codeFillCheck`,
`defaultInv`, `orderVisibleType`, `checkCopy`, `secCheckCopy`, `originAction`, `defaultSubInv`, `defaultInv`, `orderVisibleType`, `checkCopy`,
`advanceType`, `changeEnable`, `spUse`, `preIn`, `preInBack`, `supplementAll`, `secCheckCopy`, `originAction`, `advanceType`, `changeEnable`, `spUse`,
`createUser`, `createTime`, `updateUser`, `vailDispatch`, `vailGroupBuy`, `preIn`, `preInBack`, `supplementAll`, `createUser`, `createTime`,
`busType`, `inStock`, `actionType`, `thrCheckEnable`, `thrCheckWebNew`, `updateUser`, `vailDispatch`, `vailGroupBuy`, `busType`, `inStock`,
`thrCheckPdaUn`, `thrCheckPdaEd`, `thrCheckUdims`, `thrCheckPc`, `thrCheckSp`, `actionType`, `thrCheckEnable`, `thrCheckWebNew`, `thrCheckPdaUn`,
`thrCheckPdaEd`, `thrCheckUdims`, `thrCheckPc`, `thrCheckSp`,
`thrCheckChange`, `thrCheckBalance`, `thrCheckCopy`, `fillCodeRel`, `thrCheckChange`, `thrCheckBalance`, `thrCheckCopy`, `fillCodeRel`,
`checkVailDate`, `checkExpire`, `checkCertExpire`, `preInBackAction`, `checkVailDate`, `checkExpire`, `checkCertExpire`, `preInBackAction`,
`backPreinType`, `advancePreIn`, `sortNum`, `spaceOut`, `checkReview`, `backPreinType`, `sortNum`, `advancePreIn`, `spaceOut`, `checkReview`,
`secCheckReview`, `thrCheckReview`, `checkWebNewType`, `editType`, `secCheckReview`, `thrCheckReview`, `editType`, `inPreInBack`,
`inPreInBack`, `deptNoInvType`, `vailPrescribe`, `inputSick`, `groupBuySplit`, `vailProductAttributes`, `vailHcType`, `checkWebNewType`, `deptNoInvType`,
`vailInvBatchNo`, `vailProductAttributes`, `devInType`, `vailHcType`, `vailPrescribe`, `inputSick`, `groupBuySplit`, `vailInvBatchNo`,
`requireScanCode`, `codeCheck`) `devInType`, `requireScanCode`, `codeCheck`, `requireCost`)
VALUES (1844274444567728128, 'WareHouseIn', 'SC72854426720051', '科室退费入库', 1, '', '', 0, 0, 0, 1, 0, 0, 0, 0, 4, 0, 0, 0, VALUES (1859776049824198656, 'WareHouseIn', 'SC72854426720051', '临床退库（普耗退费）', 1, '', '', 0, 0, 0, 1, 0, 0, 0, 0, 4, 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, 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,
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, 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,
1, 0, 999, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, NULL, 0, NULL, 0, NULL, b'0', NULL); 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', CALL Pro_Temp_ColumnWork('basic_products', 'requireCost',
'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要收费 1是；0否''', 'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要收费 1是；0否''',

Write Preview
Loading…
Cancel
Save