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

Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

Browse Source
dev_fifo_z
chenhc 6 months ago
parent 3a6576c3d8 bdba960493
commit 4110250dcd
2 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File

27
src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
Unescape Escape View File

@ -850,22 +850,21 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
ioCollectOrderBackupService.save(ioCollectOrderBackup); ioCollectOrderBackupService.save(ioCollectOrderBackup);
//todo 备份码表 //todo 备份码表
IoCollectOrder finalCollectOrder = collectOrder; IoCollectOrder finalCollectOrder = collectOrder;
ThreadUtil.execAsync(() -> { //插入到码表
//插入到码表 collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo()); //删除原来单据
//删除原来单据 removeOrderByBillNo(finalCollectOrder);
removeOrderByBillNo(finalCollectOrder); //更新数据至第三方系统
//更新数据至第三方系统 //单据更新
//单据更新
// ioCollectOrderBackupService.generateOrder(finalCollectOrder.getBillNo(), authAdmin); // ioCollectOrderBackupService.generateOrder(finalCollectOrder.getBillNo(), authAdmin);
IoCollectSet ioCollectSet = collectSetService.getSet();
Boolean autoUploadOrder = ioCollectSet.getAutoUploadOrder();
if (autoUploadOrder) { //不立马上传，等待定时器自动上传
ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), authAdmin); // IoCollectSet ioCollectSet = collectSetService.getSet();
} // Boolean autoUploadOrder = ioCollectSet.getAutoUploadOrder();
} // if (autoUploadOrder) {
); // ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), authAdmin);
// }
} }
public void busGenOrder(CollectOrderRequest collectOrderRequest) { public void busGenOrder(CollectOrderRequest collectOrderRequest) {

80
src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java
Unescape Escape View File

@ -55,18 +55,18 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
// 使用设置的轮询时间为准 这边进行转换 // 使用设置的轮询时间为准 这边进行转换
IoCollectSet ioCollectSet = collectSetService.getSet(); IoCollectSet ioCollectSet = collectSetService.getSet();
String cron = null; String cron = null;
if(ioCollectSet!= null if (ioCollectSet != null
&& ioCollectSet.getStartUploadHour() !=null && ioCollectSet.getStartUploadHour() != null
&& ioCollectSet.getStartUploadHour() >0 && ioCollectSet.getStartUploadHour() > 0
){ ) {
if(ioCollectSet.getStartUploadHour() <= 24){ if (ioCollectSet.getStartUploadHour() <= 24) {
cron = "0 0 */"+ioCollectSet.getStartUploadHour()+" * * ? "; cron = "0 0 */" + ioCollectSet.getStartUploadHour() + " * * ? ";
} }
}else { } else {
cron = "0 0 0 */1 * ?"; cron = "0 0 0 */1 * ?";
} }
logger.info("已完成单据自动上传轮询设置cron表达式==="+cron); logger.info("已完成单据自动上传轮询设置cron表达式===" + cron);
if (cron.isEmpty()) { if (cron.isEmpty()) {
logger.error("cron is null"); logger.error("cron is null");
@ -76,41 +76,39 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
} }
private void process() { private void process() {
ThreadUtil.execAsync(() -> {
//获取下载的起始时间
//获取下载的起始时间 IoCollectSet ioCollectSet = collectSetService.getSet();
IoCollectSet ioCollectSet = collectSetService.getSet(); Date startUploadTime = ioCollectSet.getStartUploadTime();
Date startUploadTime = ioCollectSet.getStartUploadTime(); String startUploadTimes = MsDateUtil.formatDateTime(startUploadTime);
String startUploadTimes = MsDateUtil.formatDateTime(startUploadTime); Boolean autoUploadOrder = ioCollectSet.getAutoUploadOrder();
Boolean autoUploadOrder = ioCollectSet.getAutoUploadOrder();
if (StrUtil.isNotBlank(startUploadTimes) && autoUploadOrder) {
if (StrUtil.isNotBlank(startUploadTimes) && autoUploadOrder){ //获取当前时间
//获取当前时间 String paramValue = startUploadTimes;
String paramValue = startUploadTimes; String nowTime = MsDateUtil.getDateTime();
String nowTime = MsDateUtil.getDateTime(); CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
collectOrderRequest.setStartTime(paramValue);
collectOrderRequest.setStartTime(paramValue); collectOrderRequest.setEndTime(nowTime);
collectOrderRequest.setEndTime(nowTime); List<Integer> list = new ArrayList<>();
List<Integer> list = new ArrayList<>(); list.add(1);
list.add(1); list.add(3);
list.add(3); collectOrderRequest.setUploadStatusList(list);
collectOrderRequest.setUploadStatusList(list);
//调用上传单据
//调用上传单据 List<IoCollectOrderResponse> orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest);
List<IoCollectOrderResponse> orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest); if (CollUtil.isNotEmpty(orderResponses)) {
if (CollUtil.isNotEmpty(orderResponses)){ orderResponses.forEach(item -> {
orderResponses.forEach( item -> { AuthAdmin authAdmin = new AuthAdmin();
AuthAdmin authAdmin = new AuthAdmin(); ioCollectOrderBackupService.orderUpload(item.getBillNo(), authAdmin);
ioCollectOrderBackupService.orderUpload(item.getBillNo(),authAdmin); });
}); }
} // 无限循环去上传单据不做限制了
// 无限循环去上传单据不做限制了
// ioCollectSet.setStartUploadTime(MsDateUtil.parseDate(nowTime)); // ioCollectSet.setStartUploadTime(MsDateUtil.parseDate(nowTime));
// collectSetService.updateById(ioCollectSet); // collectSetService.updateById(ioCollectSet);
} }
});
} }
} }

Write Preview
Loading…
Cancel
Save