自动化立体仓库 - WMS系统
1
zhangchao
2024-11-01 8cdd187911b0d660274e352dcbb41c296dcf0693
1
4个文件已修改
25 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/config/ThreadPoolConfig.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -214,6 +214,24 @@
        // 获取单据
        Order order = orderService.selectByNo(orderNo);
        if (order == null) {
            int i = 30;
            while (i >= 0) {
                try {
                    Thread.sleep(1000);
                } catch (InterruptedException e) {
                    throw new RuntimeException(e);
                }
                order = orderService.selectByNo(orderNo);
                if (order != null) {
                    break;
                }
                i--;
            }
        }
        if (order == null) {
            return R.parse("单据不存在:" + orderNo);
        }
        // 获取单据明细
        List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
@@ -288,6 +306,8 @@
        return R.ok("出库成功");
    }
    @Override
    @Transactional
    public void pakinOrderCreate(OpenOrderPakinParam param) {
src/main/java/com/zy/common/config/ThreadPoolConfig.java
@@ -33,4 +33,5 @@
        return executor;
    }
}
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -7,6 +7,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +37,7 @@
    @Transactional(rollbackFor = Throwable.class)
    @Scheduled(cron = "${erp.refreshtime}")
    @Async("orderThreadPool")
    public void OutHedTBScheduler() {
        //log.info("OutHedTBScheduler开始了");
        if (!erpEnabled) return;
src/main/resources/application.yml
@@ -106,7 +106,7 @@
  enabled: true
  #enabled: false
  #查看ERP中间表间隔
  refreshtime: 0 0/1 * * * ?
  refreshtime: 0/5 * * * * ?
  db:
    driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.1.147:1800;databasename=XDLinkLK