From 992db539c95140dc9e69290101f6967217d196b3 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 31 Mar 2025 17:12:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E7=A0=81=E5=BA=93=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=A1=A5=E9=BD=90=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E4=B8=8A=E4=BC=A0=E5=8C=BB=E4=BF=9D?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/collect/IoCollectOrderBackup.java | 3 +++ .../res/collect/IoCollectOrderResponse.java | 4 +++- .../collect/IoCollectOrderBackupService.java | 6 ++++-- .../api/service/inout/IoSplitCodeService.java | 19 ++++++++++++++----- .../glxp/api/task/IoSplitFifoCodeTask.java | 2 +- .../java/com/glxp/api/task/NotCodeTask.java | 1 + .../collect/IoCollectOrderBackupMapper.xml | 1 + .../collect/IoCollectOrderBizBackupMapper.xml | 2 +- src/main/resources/schemas/schema_v2.4.sql | 5 +++++ 9 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java index 2b9ccb8cd..782acd3b4 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java @@ -279,5 +279,8 @@ public class IoCollectOrderBackup implements Serializable { @ApiModelProperty(value = "关联预验收入库单号") private String preInBillNo; + @TableField(value = "uploadYbTime") + @ApiModelProperty(value = "上传医保时间") + private Date uploadYbTime; private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java index ffd1e6657..17e97891c 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java @@ -200,7 +200,9 @@ public class IoCollectOrderResponse { */ private Integer codingStatus; - + @TableField(value = "uploadYbTime") + @ApiModelProperty(value = "上传医保时间") + private Date uploadYbTime; public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) 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 aa06f72f9..c436fc0fd 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -175,6 +175,7 @@ public class IoCollectOrderBackupService extends ServiceImpl ioCollectCodeBackupList = ioCollectCodeBackMapper.selectList(new QueryWrapper() .eq("billNo",collectOrderBizRequest.getOrderIdFk()) + .groupBy("code") ); if(CollUtil.isNotEmpty(ioCollectCodeBackupList)){ for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackupList) { @@ -571,8 +572,9 @@ public class IoCollectOrderBackupService extends ServiceImpl() + .eq("code",ioSplitFifoCodeEntity.getCode()) + .last("limit 1") + ); + if(ioCodeLostEntity!=null && StringUtils.isNotEmpty(ioCodeLostEntity.getBatchNo())){ + collectOrderBiz.setBatchNo(ioCodeLostEntity.getBatchNo()); + collectOrderBiz.setProductDate(ioCodeLostEntity.getProduceDate()); + collectOrderBiz.setExpireDate(ioCodeLostEntity.getExpireDate()); } } } diff --git a/src/main/java/com/glxp/api/task/IoSplitFifoCodeTask.java b/src/main/java/com/glxp/api/task/IoSplitFifoCodeTask.java index 7a005655b..a610a0550 100644 --- a/src/main/java/com/glxp/api/task/IoSplitFifoCodeTask.java +++ b/src/main/java/com/glxp/api/task/IoSplitFifoCodeTask.java @@ -98,7 +98,7 @@ public class IoSplitFifoCodeTask implements SchedulingConfigurer { ioSplitFifoCodeEntity.setProduceDate(ioCodeLostEntity.getProduceDate()); ioSplitFifoCodeEntity.setExpireDate(ioCodeLostEntity.getExpireDate()); ioSplitFifoCodeMapper.update(ioSplitFifoCodeEntity, - new QueryWrapper().eq("code",ioCodeLostEntity.getCode()) + new QueryWrapper().eq("code", ioCodeLostEntity.getCode()) ); IoCodeLostEntity ioCodeLostEntityNew = ioCodeLostMapper.selectOne( new QueryWrapper() diff --git a/src/main/java/com/glxp/api/task/NotCodeTask.java b/src/main/java/com/glxp/api/task/NotCodeTask.java index 3b762975e..4092092ed 100644 --- a/src/main/java/com/glxp/api/task/NotCodeTask.java +++ b/src/main/java/com/glxp/api/task/NotCodeTask.java @@ -74,6 +74,7 @@ public class NotCodeTask implements SchedulingConfigurer { appId = thrYbSetup.getAppId(); } + ybNotCodeMapper.delete(new QueryWrapper<>()); for (UdiRelevanceEntity udiRelevanceEntity : list) { try { YbNotCode ybNotCode = ybNotCodeMapper.selectOne( diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml index b343efcfd..3f7796167 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml @@ -32,6 +32,7 @@ icob.uploadError, icob.checkCodeStatus, icob.errorMsg, + icob.uploadYbTime, row_number() over ( order by case when icob.orderTime is null then icob.createTime else icob.orderTime end desc ) diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml index 5d3b988fa..458db0b60 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml @@ -37,7 +37,7 @@ AND ggxh LIKE concat( #{ggxh}, '%') - group by icobb.id + group by icobb.relId,icobb.batchNo diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index c3e39adb6..e352c49b9 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5496,3 +5496,8 @@ VALUES (3001, 'ioSplitFifoCodeTask', '0 */30 * * * ?', NULL, '工位库存定时 CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'reCount', 'int NULL DEFAULT NULL COMMENT ''实际数量''', 1); + + +CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'uploadYbTime', + ' datetime DEFAULT NULL COMMENT ''医保上传时间''', + 1);