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

冷链报告

Browse Source
lh_dev_fifo
yewj 8 months ago
parent d0eefaa211
commit 25cafdd266
4 changed files with 112 additions and 1 deletions
Show Stats Download Patch File Download Diff File

18
src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java
Unescape Escape View File

@ -176,6 +176,24 @@ public class IoCodeTempEntity {
private BigDecimal price;
@TableField(exist = false)
private boolean checkSuccess; //临时字段校验是否成功
@TableField(exist = false)
private String filePath;
@TableField(exist = false)
private String coldFilePath;
/**
* 检验报告名称
*/
@TableField(exist = false)
private String checkFileName;
/**
* 冷链报告名称
*/
@TableField(exist = false)
private String checkColdFileName;
public int getMyCount() {
if (count == null)

19
src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java
Unescape Escape View File

@ -217,4 +217,23 @@ public class IoOrderDetailCodeEntity {
private Date updateTime;
@TableField(value = "filePath")
private String filePath;
@TableField(value = "coldFilePath")
private String coldFilePath;
/**
* 检验报告名称
*/
@TableField(value = "checkFileName")
private String checkFileName;
/**
* 冷链报告名称
*/
@TableField(value = "checkColdFileName")
private String checkColdFileName;
}

32
src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
Unescape Escape View File

@ -512,6 +512,7 @@ public class IoAddInoutService {
supplementOrder.setBusType(supplementType.getBusType());
//复制码表
List<IoCodeEntity> codes = codeService.findByOrderId(orderId);
List<IoOrderDetailBizEntity> bizEntities = orderDetailBizService.findByOrderId(orderId);
List<IoCodeTempEntity> supplementCodes = new ArrayList<>();
codes.forEach(
code -> {
@ -526,6 +527,26 @@ public class IoAddInoutService {
supplementCode.setPreInSpaceCode(null);
supplementCode.setPreSpaceCode(null);
supplementCode.setMainAction(supplementType.getMainAction());
for (IoOrderDetailBizEntity bizEntity : bizEntities) {
if (bizEntity.getBindRlFk().equals(supplementCode.getRelId())) {
if (StrUtil.isNotEmpty(bizEntity.getBatchNo())) {
if (bizEntity.getBatchNo().equals(supplementCode.getBatchNo())) {
supplementCode.setFilePath(bizEntity.getFilePath());
supplementCode.setColdFilePath(bizEntity.getColdFilePath());
supplementCode.setCheckFileName(bizEntity.getCheckFileName());
supplementCode.setCheckColdFileName(bizEntity.getCheckColdFileName());
break;
}
} else {
supplementCode.setFilePath(bizEntity.getFilePath());
supplementCode.setColdFilePath(bizEntity.getColdFilePath());
supplementCode.setCheckFileName(bizEntity.getCheckFileName());
supplementCode.setCheckColdFileName(bizEntity.getCheckColdFileName());
break;
}
}
}
supplementCodes.add(supplementCode);
}
@ -930,6 +951,17 @@ public class IoAddInoutService {
ioOrderDetailCodeEntity.setCount(codeTempEntity.getCount());
ioOrderDetailCodeEntity.setReCount(codeTempEntity.getMyReCount());
ioOrderDetailCodeEntity.setUpdateTime(new Date());
if (StrUtil.isNotEmpty(orderEntity.getSupplementNo())) {
IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.findByUnique(orderEntity.getSupplementNo(), codeTempEntity.getRelId(), codeTempEntity.getBatchNo());
if (orderDetailBizEntity != null) {
ioOrderDetailCodeEntity.setFilePath(orderDetailBizEntity.getFilePath());
ioOrderDetailCodeEntity.setColdFilePath(orderDetailBizEntity.getColdFilePath());
ioOrderDetailCodeEntity.setCheckFileName(orderDetailBizEntity.getCheckFileName());
ioOrderDetailCodeEntity.setCheckColdFileName(orderDetailBizEntity.getCheckColdFileName());
}
}
return ioOrderDetailCodeEntity;
}

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

@ -3920,7 +3920,30 @@ CREATE TABLE IF NOT EXISTS `device_asset_contract`
ROW_FORMAT = DYNAMIC;
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);
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);
CALL Pro_Temp_ColumnWork('basic_products', 'requireCost',
'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要收费 1是；0否''',
@ -3928,4 +3951,23 @@ CALL Pro_Temp_ColumnWork('basic_products', 'requireCost',
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'requireCost',
'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''校验是否需要收费 1是；0否''',
1);
CALL Pro_Temp_ColumnWork('io_order_detail_code', 'filePath',
'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''检验报告''',
1);
CALL Pro_Temp_ColumnWork('io_order_detail_code', 'coldFilePath',
'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''检验报告名称''',
1);
CALL Pro_Temp_ColumnWork('io_order_detail_code', 'checkFileName',
'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''冷链报告''',
1);
CALL Pro_Temp_ColumnWork('io_order_detail_code', 'checkColdFileName',
'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''冷链报告名称''',
1);
Write Preview
Loading…
Cancel
Save