无码库定时优化 补齐三期优化

上传医保优化

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;
 }

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))

src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java

@@ -175,6 +175,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             if(StringUtils.isEmpty(collectOrderBizResponse.getFinishUdiCode())){
                 List<IoCollectCodeBackup> ioCollectCodeBackupList = ioCollectCodeBackMapper.selectList(new QueryWrapper<IoCollectCodeBackup>()
                         .eq("billNo",collectOrderBizRequest.getOrderIdFk())
+                        .groupBy("code")
                 );
                 if(CollUtil.isNotEmpty(ioCollectCodeBackupList)){
                     for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackupList) {
@@ -571,8 +572,9 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             updateOrder.setUploadStatus(3);
             updateOrder.setUploadError(e.getMessage());
         }
-        // 更新时间修改
+//        // 上传医保时间修改
-        updateOrder.setUpdateTime(new Date());
+        updateOrder.setUploadYbTime(new Date());
+        //
         //更新状态
         this.updateByBillNo(updateOrder);
         if (updateOrder.getUploadStatus() == 3) {

src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java

@@ -5,13 +5,16 @@ import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.Constant;
+import com.glxp.api.dao.inout.IoCodeLostMapper;
 import com.glxp.api.dao.inout.IoSplitCodeMapper;
 import com.glxp.api.entity.basic.SysWorkplacePutRel;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.entity.collect.*;
+import com.glxp.api.entity.inout.IoCodeLostEntity;
 import com.glxp.api.entity.inout.IoSplitCodeEntity;
 import com.glxp.api.entity.inout.IoSplitFifoCodeEntity;
 import com.glxp.api.entity.inout.IoSplitFifoInv;
@@ -634,7 +637,8 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
         return newList;
 
     }
-
+    @Resource
+    private IoCodeLostMapper ioCodeLostMapper;
 
     /**
      * 单据预赋码
@@ -665,10 +669,15 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
 
             if(CollUtil.isNotEmpty(splitFifoCodeEntities)){
                 IoSplitFifoCodeEntity ioSplitFifoCodeEntity =  splitFifoCodeEntities.get(0);
-                if(ioSplitFifoCodeEntity!=null && StringUtils.isNotEmpty(ioSplitFifoCodeEntity.getBatchNo())){
+                IoCodeLostEntity ioCodeLostEntity =  ioCodeLostMapper.selectOne(
-                    collectOrderBiz.setBatchNo(ioSplitFifoCodeEntity.getBatchNo());
+                        new QueryWrapper<IoCodeLostEntity>()
-                    collectOrderBiz.setProductDate(ioSplitFifoCodeEntity.getProduceDate());
+                                .eq("code",ioSplitFifoCodeEntity.getCode())
-                    collectOrderBiz.setExpireDate(ioSplitFifoCodeEntity.getExpireDate());
+                                .last("limit 1")
+                );
+                if(ioCodeLostEntity!=null && StringUtils.isNotEmpty(ioCodeLostEntity.getBatchNo())){
+                    collectOrderBiz.setBatchNo(ioCodeLostEntity.getBatchNo());
+                    collectOrderBiz.setProductDate(ioCodeLostEntity.getProduceDate());
+                    collectOrderBiz.setExpireDate(ioCodeLostEntity.getExpireDate());
                 }
             }
         }

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<IoSplitFifoCodeEntity>().eq("code",ioCodeLostEntity.getCode())
+                                new QueryWrapper<IoSplitFifoCodeEntity>().eq("code", ioCodeLostEntity.getCode())
                         );
                         IoCodeLostEntity ioCodeLostEntityNew = ioCodeLostMapper.selectOne(
                                 new QueryWrapper<IoCodeLostEntity>()

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(

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 )

src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml

@@ -37,7 +37,7 @@
                 AND ggxh LIKE concat( #{ggxh}, '%')
             </if>
         </where>
-        group by icobb.id
+        group by icobb.relId,icobb.batchNo
     </select>
 
 </mapper>

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);