123

zhang

3 天以前 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85

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

@@ -241,6 +241,31 @@
        }
        return R.ok(exportSupport(result, fields));
    }
    @RequestMapping(value = "/locDetl/export/auth/v2")
    @ManagerAuth(memo = "库位明细导出")
    public synchronized R exportV2(@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"));
        String row = "";
        if (map.get("row") != null) {
            String chooseRow = (String) map.get("row");
            if (chooseRow.length() == 1) {
                row = "0" + chooseRow;
                map.remove("row");
            } else {
                row = chooseRow;
                map.remove("row");
            }
        }
        convert(map, wrapper);
        if (!row.equals("")) {
            wrapper.and()
                    .where("loc_no like '" + row + "%'");
        }
        List<LocDetl> list = locDetlService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/locDetlQuery/auth")
    @ManagerAuth
@@ -419,14 +444,15 @@


            if (!Cools.isEmpty(mat.getStoreMaxDate())) {
                if (Cools.isEmpty(locDetl.getBatch())) {
                    continue;
                } else if (locDetl.getBatch().length() != 8) {
                    continue;
                }
//                if (Cools.isEmpty(locDetl.getBatch())) {
//                    continue;
//                } else if (locDetl.getBatch().length() != 8) {
//                    continue;
//                }
                try {
                    SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
                    Date maxDate = simple.parse(locDetl.getBatch());
//                    SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
//                    Date maxDate = simple.parse(locDetl.getBatch());
                    Date maxDate = locDetl.getModiTime();
                    Calendar calendar = new GregorianCalendar();
                    calendar.setTime(maxDate);
                    // 把日期往后增加一天,整数  往后推,负数往前移动
@@ -443,7 +469,7 @@
                    abnormalLocDetlParam.setSpecs(mat.getSpecs());
                    abnormalLocDetlParam.setBatch(locDetl.getBatch());
                    if (now.compareTo(maxDate) > 0) {
                        long difference = (now.getTime() - maxDate.getTime()) / (24 * 60 * 60 * 1000);
                        long difference = (now.getTime() - locDetl.getModiTime().getTime()) / (24 * 60 * 60 * 1000);
                        abnormalLocDetlParam.setNowTime(Integer.parseInt(String.valueOf(difference)));
                        result.add(abnormalLocDetlParam);
                    }