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

定时补救阿里单据上传和关联关系

Browse Source
dev_fifo_z
qiuyt 4 months ago
parent a3d9fd6b4f
commit ad61d32e30
7 changed files with 147 additions and 13 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/glxp/api/dao/collect/IoCollectCodeBackMapper.java
Unescape Escape View File

@ -15,4 +15,8 @@ public interface IoCollectCodeBackMapper extends BaseMapper<IoCollectCodeBackup>
List<IoCollectCodeBackup> filterNotRelCode(IoCollectCodeRequest ioCollectCodeRequest);
List<IoCollectCodeBackup> filterNotRelCodeGroup(IoCollectCodeRequest ioCollectCodeRequest);
List<IoCollectCodeBackup> filterlargePackage();
}

12
src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
Unescape Escape View File

@ -20,6 +20,7 @@ import com.glxp.api.entity.system.SyncDataSetEntity;
import com.glxp.api.entity.thrsys.ThirdAliDrug;
import com.glxp.api.idc.service.FileService;
import com.glxp.api.req.alihealth.AlihealthRelCodeInsertReqeust;
import com.glxp.api.req.alihealth.local.AliBillsDisposeReqeust;
import com.glxp.api.req.alihealth.local.AlihealthGetRelCodeReqeust;
import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust;
import com.glxp.api.req.basic.BasicDataRequest;
@ -696,4 +697,15 @@ public class SpGetHttpClient {
}
return response;
}
public BaseResponse aliBillsDispose(AliBillsDisposeReqeust aliBillsDisposeReqeust) {
String json = JSONUtil.toJsonStr(aliBillsDisposeReqeust);
String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/spms/alihealth/aliBillsDispose", json, buildHeader());
BaseResponse response =
JSONObject.parseObject(result, new TypeReference<BaseResponse>() {
});
if(response == null){
return ResultVOUtils.error("访问供应商平台访问不到");
}
return response;
}
}

13
src/main/java/com/glxp/api/req/alihealth/local/AliBillsDisposeReqeust.java
Unescape Escape View File

@ -0,0 +1,13 @@
package com.glxp.api.req.alihealth.local;
import com.glxp.api.entity.inout.IoOrderEntity;
import lombok.Data;
import java.util.List;
@Data
public class AliBillsDisposeReqeust {
private List<IoOrderEntity> ioOrderEntityList;
private String erpName;
}

89
src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java
Unescape Escape View File

@ -0,0 +1,89 @@
package com.glxp.api.task;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.dao.collect.IoCollectCodeBackMapper;
import com.glxp.api.dao.schedule.ScheduledDao;
import com.glxp.api.entity.collect.IoCollectCodeBackup;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.system.ScheduledEntity;
import com.glxp.api.http.sync.SpGetHttpClient;
import com.glxp.api.req.alihealth.local.AliBillsDisposeReqeust;
import com.glxp.api.req.collect.IoCollectCodeRequest;
import com.glxp.api.req.system.ScheduledRequest;
import com.glxp.api.service.system.SystemParamConfigService;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.scheduling.support.CronTrigger;
import org.springframework.stereotype.Component;
import redis.clients.jedis.resps.Tuple;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@Component
@EnableScheduling
@Slf4j
public class AliRelCodeDetailTask implements SchedulingConfigurer {
@Resource
private ScheduledDao scheduledDao;
@Resource
private IoCollectCodeBackMapper ioCollectCodeBackMapper;
@Resource
private SpGetHttpClient spGetHttpClient;
@Resource
private SystemParamConfigService systemParamConfigService;
@Override
public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
scheduledTaskRegistrar.addTriggerTask(() -> process(),
triggerContext -> {
ScheduledRequest scheduledRequest = new ScheduledRequest();
scheduledRequest.setCronName("aliRelCodeDetailTask");
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
if (scheduledEntity == null) {
return null;
}
String cron = scheduledEntity.getCron();
if (cron.isEmpty()) {
log.error("cron is null");
}
return new CronTrigger(cron).nextExecutionTime(triggerContext);
});
}
private void process() {
String paramValue = systemParamConfigService.selectValueByParamKey("aliRelCodeDetail");
if (StrUtil.isNotEmpty(paramValue) && paramValue.equals("1")) {
List<IoCollectCodeBackup> list = ioCollectCodeBackMapper.filterNotRelCode(new IoCollectCodeRequest());
List<IoOrderEntity> ioOrderEntityList = new ArrayList<>();
log.error("开始补救上传和拉取关联关系列表==="+list);
if (CollectionUtil.isNotEmpty(list)) {
for (IoCollectCodeBackup ioCollectCodeBackup : list) {
IoOrderEntity ioOrderEntity = new IoOrderEntity();
ioOrderEntity.setBillNo(ioCollectCodeBackup.getBillNo());
ioOrderEntity.setFromCorp(ioCollectCodeBackup.getFromCorp());
ioOrderEntity.setAuditTime(ioCollectCodeBackup.getOperTime());
ioOrderEntityList.add(ioOrderEntity);
}
AliBillsDisposeReqeust aliBillsDisposeReqeust = new AliBillsDisposeReqeust();
aliBillsDisposeReqeust.setIoOrderEntityList(ioOrderEntityList);
spGetHttpClient.aliBillsDispose(aliBillsDisposeReqeust);
}
}
}
}

25
src/main/java/com/glxp/api/task/CollectOrderEelCodeCountTask.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.dao.collect.IoCollectCodeBackMapper;
import com.glxp.api.dao.collect.RelCodeDetailMapper;
import com.glxp.api.dao.schedule.ScheduledDao;
import com.glxp.api.entity.collect.IoCollectCode;
@ -42,9 +43,11 @@ public class CollectOrderEelCodeCountTask implements SchedulingConfigurer {
@Resource
private ScheduledDao scheduledDao;
@Resource
private IoCollectCodeBackService ioCollectCodeBackService;
private IoCollectCodeBackMapper ioCollectCodeBackMapper;
@Resource
private RelCodeDetailMapper relCodeDetailMapper;
@Resource
private IoCollectCodeBackService ioCollectCodeBackService;
@Override
public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
scheduledTaskRegistrar.addTriggerTask(() -> process(),
@ -64,11 +67,7 @@ public class CollectOrderEelCodeCountTask implements SchedulingConfigurer {
}
private void process() {
LambdaQueryWrapper<IoCollectCodeBackup> lambdaQueryWrapper =new LambdaQueryWrapper();
lambdaQueryWrapper.gt(IoCollectCodeBackup::getRelCodeCount,-2);
List<IoCollectCodeBackup> list = ioCollectCodeBackService.list(
lambdaQueryWrapper
);
List<IoCollectCodeBackup> list = ioCollectCodeBackMapper.filterlargePackage();
if(list!=null ){
for (IoCollectCodeBackup ioCollectCodeBackup : list) {
int count = relCodeDetailMapper.selectCount(
@ -78,14 +77,14 @@ public class CollectOrderEelCodeCountTask implements SchedulingConfigurer {
IoCollectCodeBackup ioCollectCodeBackupNew = new IoCollectCodeBackup();
if(count > 0){
ioCollectCodeBackupNew.setRelCodeCount(count);
}else {
ioCollectCodeBackupNew.setRelCodeCount(ioCollectCodeBackup.getRelCodeCount()-1);
ioCollectCodeBackService.update(
ioCollectCodeBackupNew,new LambdaQueryWrapper<IoCollectCodeBackup>()
.eq(IoCollectCodeBackup::getId,ioCollectCodeBackup.getId())
);
}
ioCollectCodeBackService.update(
ioCollectCodeBackupNew,new LambdaQueryWrapper<IoCollectCodeBackup>()
.eq(IoCollectCodeBackup::getId,ioCollectCodeBackup.getId())
);
// else {
// ioCollectCodeBackupNew.setRelCodeCount(ioCollectCodeBackup.getRelCodeCount()-1);
// }
}
}
}

14
src/main/resources/mybatis/mapper/collect/IoCollectCodeBackMapper.xml
Unescape Escape View File

@ -55,4 +55,18 @@
</if>
</select>
<select id="filterNotRelCodeGroup" resultType="com.glxp.api.entity.collect.IoCollectCodeBackup">
select * from io_collect_code_backup a where EXISTS(
select * from basic_products b where LEFT(a.code, 7) = b.nameCode and packLevel >1
) and not EXISTS (select 1 from rel_code_detail c where c.parentCode = a.code)
<if test="fromCorp != null and fromCorp != ''">
AND iccb.fromCorp LIKE concat('%', #{fromCorp}, '%')
</if>
group by billNo
</select>
<select id="filterlargePackage" resultType="com.glxp.api.entity.collect.IoCollectCodeBackup">
select * from io_collect_code_backup a where EXISTS(
select * from basic_products b where LEFT(a.code, 7) = b.nameCode and packLevel >1
)
</select>
</mapper>

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

@ -5261,3 +5261,6 @@ CREATE TABLE IF NOT EXISTS `sys_workplace_region`
ALTER TABLE rel_code_batch
MODIFY COLUMN `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '批次号';
INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) VALUES (400, 'aliRelCodeDetailTask', '0 0 0/2 * * ?', NULL, '阿里关联关系轮询定时');
INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (90001, 0, '是否调用阿里关联关系模式', 'aliRelCodeDetail', '1', 1, 1, '值为0 是关闭 1是开启',now());

Write Preview
Loading…
Cancel
Save