自动化立体仓库 - WMS系统
zwl
3 天以前 5317a45f64ae948e7351cce8ccf06ed88ffe4eeb
新增AGV拣料回库或者移动
2个文件已修改
24 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/MobileController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/MobileController.java
@@ -348,8 +348,17 @@
     * @return
     */
    @RequestMapping("/AGVSite")
    public R AGVSite(@RequestParam(required = false) String locNo){
    public R AGVSite(@RequestParam(required = false) String locNo,@RequestParam(required = false) String barcode){
        HashMap<Integer,String> map=new HashMap<>();
        if(!Cools.isEmpty(barcode)){
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
            if(!Cools.isEmpty(wrkMast)){
                if (!Cools.isEmpty(wrkMast.getInvWh())&&wrkMast.getWrkNo().equals("Y")&&(wrkMast.getIoType()==103||wrkMast.getIoType()==107)){
                    map.put(100,"100-入库口");
                }else {
                    return R.error("请下架后再操作agv");
                }
            }else {
        map.put(100,"100-入库口");
        map.put(1001,"1000-补空板口");
        map.put(2001,"2001-出库口1");
@@ -358,6 +367,17 @@
        map.put(3002,"3002-作业口2");
        map.put(4001,"4001-不合格");
        map.remove(Integer.parseInt(locNo));
            }
        }else {
            map.put(100,"100-入库口");
            map.put(1001,"1000-补空板口");
            map.put(2001,"2001-出库口1");
            map.put(2002,"2002-出库口2");
            map.put(3001,"3001-作业口1");
            map.put(3002,"3002-作业口2");
            map.put(4001,"4001-不合格");
            map.remove(Integer.parseInt(locNo));
        }
        return R.ok(map);
    }
src/main/resources/application.yml
@@ -10,7 +10,7 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://178.18.1.201:1433;databasename=jxtlfasrs-yclk
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jxtlfasrs-yclk
    username: sa
    password: sa@123
  mvc: