自动化立体仓库 - WMS系统
fd50d456f8d36a0f815b90e986f73af89aa3c6fc..710d56d624455f72219a326c5692f0ca79964fa5
2 天以前 Junjie
#
710d56 对比 | 目录
2 天以前 Junjie
#
81c1b4 对比 | 目录
2 天以前 Junjie
#
657fc4 对比 | 目录
5个文件已修改
89 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/LocMastController.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/web/WcsController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/locMast/locMast.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/locMast/locMast.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -13,12 +14,16 @@
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.mapper.RowLastnoMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -26,10 +31,17 @@
@RestController
public class LocMastController extends BaseController {
    @Value("${wcs.address.URL}")
    private String addrs;
    @Value("${wcs.address.getAllLocInformation}")
    private String getAllLocInformation;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private RowLastnoMapper rowLastnoMapper;
    @RequestMapping(value = "/locMast/init/pwd")
    public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -39,6 +51,57 @@
        return R.ok().add(Parameter.get().getLocMastInitPwd().equals(pwd));
    }
    @RequestMapping(value = "/locMast/init/syncWcs")
    public R syncWcs(@RequestParam(required = false) String pwd) {
        List<LocMast> list = new ArrayList<>();
        for (int i = 1; i <= 1000; i++) {
            try {
                HashMap<String, Object> map = new HashMap<>();
                map.put("row", i);
                String response = new HttpHandler.Builder()
                        .setUri(addrs)
                        .setPath(getAllLocInformation)
                        .setJson(JSON.toJSONString(map))
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.get("code").equals(200)){
                    JSONArray data = jsonObject.getJSONArray("data");
                    if (data.isEmpty()) {
                        break;
                    }
                    for (Object obj : data) {
                        JSONObject locJson = JSON.parseObject(JSON.toJSONString(obj));
                        Integer row = locJson.getInteger("row");
                        Integer bay = locJson.getInteger("bay");
                        Integer lev = locJson.getInteger("lev");
                        String locNo = Utils.getLocNo(row, bay, lev);
                        LocMast locMast = new LocMast();
                        locMast.setLocNo(locNo);
                        locMast.setLocSts("O");
                        locMast.setRow1(row);
                        locMast.setBay1(bay);
                        locMast.setLev1(lev);
                        locMast.setAppeTime(new Date());
                        locMast.setModiTime(new Date());
                        list.add(locMast);
                    }
                }
            }catch (Exception e){
                return R.error();
            }
        }
        locMastService.delete(new EntityWrapper<>());
        locMastService.insertBatch(list);
        return R.ok();
    }
    @PostMapping(value = "/group/empty/stock")
    @ManagerAuth(memo = "获取同组货架的空库位")
    public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
src/main/java/com/zy/common/web/WcsController.java
@@ -509,7 +509,7 @@
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(11L); // 工作状态:11.生成出库ID
        wrkMast.setWrkSts(12L); // 工作状态
        wrkMast.setIoType(11); // 入出库状态: 11.库格移载
        wrkMast.setIoPri(10D);
        wrkMast.setSourceLocNo(sourceLocNo); // 源库位
src/main/resources/application.yml
@@ -24,6 +24,10 @@
    multipart:
      maxFileSize: 100MB
      maxRequestSize: 100MB
  task:
    scheduling:
      pool:
        size: 3
mybatis-plus:
  mapper-locations: classpath:mapper/*.xml 
@@ -82,13 +86,14 @@
wcs:
  #地址
  address:
    URL: http://192.168.4.69:9090/wcs
    URL: http://127.0.0.1:9090/wcs
    #出库移库任务下发
    outboundTaskSend: open/outboundTaskSend
    deviceStatus : open/deviceStatus
    createOutTask: openapi/createOutTask
    createLocMoveTask: openapi/createLocMoveTask
    devicesStatus: openapi/devicesStatus
    getAllLocInformation: openapi/getAllLocInformation
led:
  ip: 192.168.1.198
src/main/webapp/static/js/locMast/locMast.js
@@ -231,6 +231,22 @@
                    })
                });
                break;
            case "sync":
                $.ajax({
                    url: baseUrl + "/locMast/init/syncWcs",
                    headers: {'token': localStorage.getItem('token')},
                    method: 'GET',
                    success: function (res) {
                        if (res.code === 200){
                            layer.msg(res.msg)
                        } else if (res.code === 403){
                            parent.location.href = "/";
                        }else {
                            layer.msg(res.msg)
                        }
                    }
                })
                break;
        }
    });
src/main/webapp/views/locMast/locMast.html
@@ -81,6 +81,7 @@
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">初始化</button>
        <button class="layui-btn layui-btn-primary" id="btn-sync" lay-event="sync">同步WCS库位</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
</script>