1.捡货单打印里面显示备注和发货时间 2.拣货单界面,仓库管理员角色拣货单发货时间超过当天16:00则当天不显示

pang.jiabao

昨天 0ff66508469ce993b771fe63085f7039a430999c

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

@@ -102,7 +102,9 @@

        String custName = Cools.isEmpty(param.get("cust_name")) ? "" : param.get("cust_name").toString();

        List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,userId,custName);
        // 仓库管理员 发货时间超过当天16.00则当天不显示
        // getUser().getRoleId() = 24
        List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,userId,custName,getUser().getRoleId());
        for (PakOutDTO pakOutDTO:pakOutDTOS){
            List<ManPakOut> manPakOuts = manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num", pakOutDTO.getDoc_num()));
            for (ManPakOut manPakOut:manPakOuts){
@@ -117,7 +119,7 @@

        }

        int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,userId,custName);
        int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,userId,custName,getUser().getRoleId());
        Page<PakOutDTO> page = new Page<>();
        // 最后按状态未出库->已出库排序
//        page.setRecords(pakOutDTOS.stream().sorted(Comparator.comparingInt(PakOutDTO::getStatus)).collect(Collectors.toList()));
@@ -496,4 +498,5 @@
        response.getOutputStream().close();
        return R.ok();
    }

}