*

lsh

2025-11-19 f0d105ece8d635fce933266af8c9943542975bcd

*

 pom.xml

@@ -115,7 +115,7 @@
    </dependencies>

    <build>
        <finalName>jshdasrs</finalName>
        <finalName>zzgtasrs</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 src/main/java/com/zy/asrs/task/ArmRulesScheduler.java

@@ -29,7 +29,7 @@
    @Autowired
    private ArmRulesHandler armRulesHandler;

    @Scheduled(cron = "0 0 * * * ? ")
//    @Scheduled(cron = "0 0 * * * ? ")
    private void execute(){
        List<BasArmRules> basArmRules = basArmRulesService.AllStatusSatisfyBasArmRules(0);
        if (basArmRules.isEmpty()) {

 src/main/java/com/zy/asrs/task/BareBoardScheduler.java

@@ -28,7 +28,7 @@
    /*
    * 自动调空板出库
    * */
    @Scheduled(cron = "0/10 * * * * ? ")
//    @Scheduled(cron = "0/10 * * * * ? ")
    private void execute(){
        if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
            Config config = configService.selectConfigByCode("AutomaticFillingBoard");

 src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java

@@ -32,7 +32,7 @@
    @Autowired
    private BasArmMastSignService basArmMastSignService;

    @Scheduled(cron = "0/3 * * * * ? ")
//    @Scheduled(cron = "0/3 * * * * ? ")
    private void orderToSortLine() {
        //获取未下发单据
        List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(0);

 src/main/java/com/zy/asrs/task/WorkLogScheduler.java

@@ -37,14 +37,14 @@
            return;
        }
        for (WrkMast wrkMast : wrkMasts) {
            if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000 && wrkMast.getWrkNo() != 9997 && wrkMast.getWrkNo() != 9996){
                if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
                    continue;
                }
            }
            if (!Cools.isEmpty(wrkMast.getTakeNone()) && wrkMast.getTakeNone().equals("1")){
                continue;
            }
//            if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000 && wrkMast.getWrkNo() != 9997 && wrkMast.getWrkNo() != 9996){
//                if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
//                    continue;
//                }
//            }
//            if (!Cools.isEmpty(wrkMast.getTakeNone()) && wrkMast.getTakeNone().equals("1")){
//                continue;
//            }
            ReturnT<String> result = workLogHandler.start(wrkMast);
            if (!result.isSuccess()) {
                log.error("工作档[workNo={}]历史档处理失败", wrkMast.getWrkNo());
@@ -52,7 +52,7 @@
        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
//    @Scheduled(cron = "0/5 * * * * ? ")
    private void executeArm(){
        List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
        if (basArmMastList.isEmpty()) {
@@ -66,7 +66,7 @@
        }
    }

    @Scheduled(cron = "0/10 * * * * ? ")
//    @Scheduled(cron = "0/10 * * * * ? ")
    private void executeAgv(){
        List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
        if (basArmMastList.isEmpty()) {

 src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java

@@ -21,7 +21,7 @@
    @Autowired
    private BasAgvMastService basAgvMastService;

    @Scheduled(cron = "0/3 * * * * ? ")
//    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
        List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 2));
        if (basAgvMastList.isEmpty()) {

 src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java

@@ -84,7 +84,7 @@
//    }};


    @Scheduled(cron = "0/3 * * * * ? ")
//    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
        for(Integer staNo : STA_WORK_IN){
            BasDevp basDevp = basDevpService.selectById(staNo);

 src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java

@@ -20,7 +20,7 @@
    @Autowired
    private WrkMastStaService wrkMastStaService;

    @Scheduled(cron = "0/3 * * * * ? ")
//    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
        List<WrkMastSta> wrkMastStas = wrkMastStaService.selectToBeHistoryData();
        if (wrkMastStas.isEmpty()) {

 src/main/resources/application.yml

@@ -11,8 +11,8 @@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
    url: jdbc:sqlserver://10.10.10.235;databasename=jshdasrs
#    url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
#    url: jdbc:sqlserver://10.10.10.235;databasename=zzgtasrs
    url: jdbc:sqlserver://192.168.4.191:50948;databasename=zzgtasrs
    username: sa
    password: sa@123
  mvc:
@@ -41,7 +41,7 @@

#License相关配置
license:
  subject: jshdasrs
  subject: zzgtasrs
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/jshdasrs";
var baseUrl = "/zzgtasrs";

// 详情窗口-高度
var detailHeight = '80%';