#

luxiaotao1123

2020-06-15 51d976a105e61297e1ae6ec16457292fadecd418

#

 src/main/java/com/zy/asrs/controller/WorkController.java

@@ -46,15 +46,13 @@
    @RequestMapping("/full/store/put/start")
    @ManagerAuth(memo = "全板入库")
    public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
        workService.startupFullPutStore(fullStoreParam,getUserId());
        return R.ok("入库成功");
        return R.ok("入库成功").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
    }

    @RequestMapping("/empty/plate/in/start")
    @ManagerAuth(memo = "空板入库")
    public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
        workService.emptyPlateIn(sourceStaNo, getUserId());
        return R.ok("入库成功");
        return R.ok("入库成功").add(workService.emptyPlateIn(sourceStaNo, getUserId()));
    }

    @RequestMapping("/empty/plate/out/start")

 src/main/java/com/zy/asrs/service/WorkService.java

@@ -7,13 +7,15 @@

    /**
     * 全板入库
     * @return 库位号
     */
    void startupFullPutStore(FullStoreParam param, Long userId);
    String startupFullPutStore(FullStoreParam param, Long userId);

    /**
     * 孔板入库
     * @return 库位号
     */
    void emptyPlateIn(Integer sourceStaNo, Long userId);
    String emptyPlateIn(Integer sourceStaNo, Long userId);

    /**
     * 空板出库

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -40,7 +40,7 @@

    @Override
    @Transactional
    public void startupFullPutStore(FullStoreParam param, Long userId) {
    public String startupFullPutStore(FullStoreParam param, Long userId) {
        // 参数非空判断
        if (Cools.isEmpty(param.getDevpNo(), param.getList())) {
            throw new CoolException(BaseRes.PARAM);
@@ -102,10 +102,11 @@
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
        }
        return dto.getLocNo();
    }

    @Override
    public void emptyPlateIn(Integer devpNo, Long userId) {
    public String emptyPlateIn(Integer devpNo, Long userId) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo);
        // 生成工作号
@@ -157,6 +158,7 @@
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
        }
        return dto.getLocNo();
    }

    @Override

 src/main/webapp/static/js/pakStore/emptyIn.js

@@ -42,7 +42,7 @@
            async: false,
            success: function (res) {
                if (res.code === 200){
                    layer.msg(res.msg);
                    layer.msg("入库启动成功，目标库位：" + res.data);
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {

 src/main/webapp/static/js/pakStore/pakStore.js

@@ -152,7 +152,7 @@
            success: function (res) {
                if (res.code === 200){
                    layer.closeAll();
                    layer.msg(res.msg);
                    layer.msg("入库启动成功，目标库位：" + res.data);
                    matCodeData = [];
                    tableIns.reload({data: matCodeData,done:function (res) { limit();}});
                } else if (res.code === 403){