#

1

4 天以前 630f5050eef4c2fd8dc7aa6ff43c3ceeeedd71e9

#

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

@@ -21,105 +21,4 @@
@RestController
public class BasAgvWrkDetlController extends BaseController {

    @Autowired
    private BasAgvWrkDetlService basAgvWrkDetlService;

    @RequestMapping(value = "/basAgvWrkDetl/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(basAgvWrkDetlService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/basAgvWrkDetl/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<BasAgvWrkDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasAgvWrkDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(basAgvWrkDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/basAgvWrkDetl/add/auth")
    @ManagerAuth
    public R add(BasAgvWrkDetl basAgvWrkDetl) {
        basAgvWrkDetlService.insert(basAgvWrkDetl);
        return R.ok();
    }

    @RequestMapping(value = "/basAgvWrkDetl/update/auth")
    @ManagerAuth
    public R update(BasAgvWrkDetl basAgvWrkDetl){
        if (Cools.isEmpty(basAgvWrkDetl) || null==basAgvWrkDetl.getId()){
            return R.error();
        }
        basAgvWrkDetlService.updateById(basAgvWrkDetl);
        return R.ok();
    }

    @RequestMapping(value = "/basAgvWrkDetl/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            basAgvWrkDetlService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/basAgvWrkDetl/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<BasAgvWrkDetl> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("basAgvWrkDetl"));
        convert(map, wrapper);
        List<BasAgvWrkDetl> list = basAgvWrkDetlService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/basAgvWrkDetlQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<BasAgvWrkDetl> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<BasAgvWrkDetl> page = basAgvWrkDetlService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (BasAgvWrkDetl basAgvWrkDetl : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", basAgvWrkDetl.getId());
            map.put("value", basAgvWrkDetl.getId());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/basAgvWrkDetl/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<BasAgvWrkDetl> wrapper = new EntityWrapper<BasAgvWrkDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != basAgvWrkDetlService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(BasAgvWrkDetl.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

}

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

@@ -1184,7 +1184,7 @@
            //mark - 3 - ....
            this.locToLoc(crn, crnProtocol,mark);
            //预调度
//            this.crnRebackHp(crn, crnProtocol, crnThread);
            this.crnRebackHp(crn, crnProtocol, crnThread);

        }
//        News.infoNoLog(""+mark+" - 0"+" - 堆垛机入出库作业下发执行完成");
@@ -1202,6 +1202,9 @@
                    new EntityWrapper<BasCrnp>().eq("crn_no", crnProtocol.getCrnNo())
            );
            boolean result = true;
            if(crnProtocol.getCrnNo() == 3){
                return;
            }

            for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
@@ -4118,6 +4121,9 @@
                log.error("{}号RGV尚未在数据库进行维护！4", slave.getId());
                continue;
            }
            if(staProtocol == null){
                continue;
            }
            if(staProtocol.getWorkNo() == 0){
                continue;
            }

 src/main/java/com/zy/system/entity/User.java

@@ -41,7 +41,10 @@
     * 手机号
     */
    private String mobile;

    /**
     * 名称
     */
    private String nickname;
    /**
     * 密码
     */
@@ -140,7 +143,9 @@
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public String getNickname() {
        return nickname;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }