标准wms2.0

zhang

2 天以前 e62569856fdfb0c7c31ee88cf96628af08eabf85

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

@@ -133,7 +133,7 @@

    @RequestMapping(value = "/locDetl/auth")
    @ManagerAuth
    public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos){
    public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos) {
        if (!locNos.isEmpty()) {
            List<LocDetl> res = new ArrayList<>();
            for (String locNo : new HashSet<>(locNos)) {
@@ -149,10 +149,10 @@

    @RequestMapping(value = "/stock/out/list/auth")
    @ManagerAuth
    public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        if (!Cools.isEmpty(param.get("modi_time"))){
    public R stockOutList(@RequestParam(defaultValue = "1") Integer curr,
                          @RequestParam(defaultValue = "10") Integer limit,
                          @RequestParam Map<String, Object> param) {
        if (!Cools.isEmpty(param.get("modi_time"))) {
            String val = String.valueOf(param.get("modi_time"));
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
@@ -162,7 +162,7 @@
            }
        }
        Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
        if (stockOut.getRecords().size()==0){
        if (stockOut.getRecords().size() == 0) {
            stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
        }
        return R.ok(stockOut);
@@ -170,12 +170,12 @@

    @RequestMapping(value = "/locDetl/list/auth")// /locDetl/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){
    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) {
//        String row = "";
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
//        if (param.get("row") != null) {
@@ -191,7 +191,9 @@
        excludeTrash(param);
        convert(param, wrapper);
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
//        if (!row.equals("")){
//            wrapper.and()
//                    .where("loc_no like '" +row +"%'");
@@ -200,10 +202,10 @@
    }


    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
    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)){
            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]));
@@ -228,10 +230,10 @@
        return R.ok();
    }

   @RequestMapping(value = "/locDetl/update/auth")
   @ManagerAuth(memo = "库位明细修改")
    public R update(LocDetl locDetl){
        if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
    @RequestMapping(value = "/locDetl/update/auth")
    @ManagerAuth(memo = "库位明细修改")
    public R update(LocDetl locDetl) {
        if (Cools.isEmpty(locDetl) || null == locDetl.getMatnr()) {
            return R.error();
        }
        locDetl.setModiUser(getUserId());
@@ -242,12 +244,12 @@

    @RequestMapping(value = "/locDetl/delete/auth")
    @ManagerAuth(memo = "库位明细删除")
    public R delete(@RequestParam String param){
    public R delete(@RequestParam String param) {
        List<LocDetl> list = JSONArray.parseArray(param, LocDetl.class);
        if (Cools.isEmpty(list)){
        if (Cools.isEmpty(list)) {
            return R.error();
        }
        for (LocDetl entity : list){
        for (LocDetl entity : list) {
            locDetlService.delete(new EntityWrapper<>(entity));
        }
        return R.ok();
@@ -255,8 +257,8 @@

    @PostMapping(value = "/locDetl/frozenInventory")
    @ManagerAuth(memo = "库存冻结")
    public R frozen(@RequestBody List<FrozenParam> param){
        if (param.size() == 0)  {
    public R frozen(@RequestBody List<FrozenParam> param) {
        if (param.size() == 0) {
            return R.parse("未收到数据");
        }

@@ -265,8 +267,8 @@

    @PostMapping(value = "/locDetl/unfreezeInventory")
    @ManagerAuth(memo = "库存解冻")
    public R unfreeze(@RequestBody List<FrozenParam> param){
        if (param.size() == 0)  {
    public R unfreeze(@RequestBody List<FrozenParam> param) {
        if (param.size() == 0) {
            return R.parse("未收到数据");
        }

@@ -275,7 +277,7 @@

    @RequestMapping(value = "/locDetl/export/auth")
    @ManagerAuth(memo = "库位明细导出")
    public R export(@RequestBody JSONObject param){
    public R export(@RequestBody JSONObject param) {
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
@@ -306,7 +308,7 @@
            if (Cools.isEmpty(mat)) {
                continue;
            }
            if (!Cools.isEmpty(mat                                                                          .getStoreMax()) || !Cools.isEmpty(mat.getStoreMin())) {
            if (!Cools.isEmpty(mat.getStoreMax()) || !Cools.isEmpty(mat.getStoreMin())) {
                abnormalLocDetlParam.setStoreMax(mat.getStoreMax());
                abnormalLocDetlParam.setStoreMaxDate(mat.getStoreMaxDate());
                abnormalLocDetlParam.setStoreMin(mat.getStoreMin());
@@ -335,15 +337,15 @@

    @RequestMapping(value = "/locDetl/selectOwner/list/auth")
    @ManagerAuth
    public R selectOwnerlist(@RequestParam(defaultValue = "1")Integer curr,
                             @RequestParam(defaultValue = "10")Integer limit,
                             @RequestParam(required = false)String orderByField,
                             @RequestParam(required = false)String orderByType,
                             @RequestParam Map<String, Object> param){
    public R selectOwnerlist(@RequestParam(defaultValue = "1") Integer curr,
                             @RequestParam(defaultValue = "10") Integer limit,
                             @RequestParam(required = false) String orderByField,
                             @RequestParam(required = false) String orderByType,
                             @RequestParam Map<String, Object> param) {
        Integer owner = null;
        if (param.get("owner$") != null && param.get("owner$") != ""){
        if (param.get("owner$") != null && param.get("owner$") != "") {
            LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$")));
            if(locOwner == null){
            if (locOwner == null) {
                return R.error("参数有误！");
            }
            param.remove("owner$");
@@ -369,7 +371,7 @@
        Page<LocDetlAll> page = new Page<>();
        page.setRecords(list);
        page.setTotal(count);
        if (list.size()==0){
        if (list.size() == 0) {
            locDetlDTO.setPageNumber(1);
            list = locDetlService.selectAllOwner(locDetlDTO);
            count = locDetlService.selectAllCount(locDetlDTO);
@@ -387,7 +389,7 @@
        wrapper.like("matnr", condition);
        Page<LocDetl> page = locDetlService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (LocDetl locDetl : page.getRecords()){
        for (LocDetl locDetl : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", locDetl.getMatnr());
            map.put("value", locDetl.getMatnr());
@@ -400,7 +402,7 @@
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != locDetlService.selectOne(wrapper)){
        if (null != locDetlService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(LocDetl.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
@@ -408,8 +410,8 @@

    @RequestMapping(value = "/locDetl/statis/auth")
    @ManagerAuth
    public R statis(@RequestParam(defaultValue = "1")Integer curr,
                    @RequestParam(defaultValue = "10")Integer limit,
    public R statis(@RequestParam(defaultValue = "1") Integer curr,
                    @RequestParam(defaultValue = "10") Integer limit,
                    @RequestParam Map<String, Object> param) {
        Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
        for (LocDetl locDetl : stockStatis.getRecords()) {
@@ -446,10 +448,11 @@

    /**
     * 获取库存总数
     *
     * @return
     */
    @RequestMapping("/locDetl/count")
    public R getAllCount(){
    public R getAllCount() {
        Integer sum = locDetlService.sum();
        return R.ok(sum);
    }