自动化立体仓库 - WMS系统
#
lsh
2024-01-10 52709bc7b5fc230184f82bf7ee00ccc2a8b8fff7
#
4个文件已修改
38 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/task/BareBoardScheduler.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.handler.BareBoardHandler;
import com.zy.asrs.task.handler.WorkMastHandler;
@@ -26,12 +28,17 @@
    private BareBoardHandler bareBoardHandler;
    @Autowired
    private ConfigService configService;
    @Autowired
    private BasDevpService basDevpService;
    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){//自动调空板出库
        Config config = configService.selectById(10468);
        if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
            bareBoardHandler.start();
            BasDevp basDevp = basDevpService.selectById(213);
            if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
                bareBoardHandler.start();
            }
        }
    }
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -46,6 +46,9 @@
            BasDevp basDevp = basDevpService.selectById(staNo);
            if (basDevp.getWrkNo()!=0){
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                if(Cools.isEmpty(wrkMast)){
                    continue;
                }
                if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
                    continue;
                }
src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -37,32 +37,32 @@
                case 13://出  3:取放
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setType(fullKM(wrkMast)? 0:1);      //类型 0:非空  1:空板
                        wrkMastSta1.setWrkType(3);                      //工作类型  1:取(叠盘)  2:放 3:取放 4:拆盘
                        wrkMastSta1.setType(fullKM(wrkMast)? 1:2);      //类型 1:非空  2:空板
                        wrkMastSta1.setWrkType(3);                      //工作类型  1:取(叠盘)  2:拆盘  3:取放 5:满取  6:满放
                        wrkMastStaService.insert(wrkMastSta1);
                    }
                    break;
                case 21://1:取(叠盘)
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
                        wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
                        wrkMastSta1.setWrkType(1);
                        wrkMastStaService.insert(wrkMastSta1);
                    }
                case 22://2:放
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
                        wrkMastSta1.setWrkType(2);
                        wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
                        wrkMastSta1.setWrkType(5);
                        wrkMastStaService.insert(wrkMastSta1);
                    }
                case 23://3:取放
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setType(fullKM(wrkMast)? 0:1);
                        wrkMastSta1.setWrkType(3);
                        wrkMastStaService.insert(wrkMastSta1);
                    }
//                case 23://3:取放
//                    if (Cools.isEmpty(wrkMastSta)){
//                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
//                        wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
//                        wrkMastSta1.setWrkType(3);
//                        wrkMastStaService.insert(wrkMastSta1);
//                    }
                default:
                    return FAIL;
            }
src/main/resources/application.yml
@@ -10,7 +10,7 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=srjtasrs
    username: sa
    password: sa@123
  mvc: