| | |
| | | wrapper.eq("brand",param.get("brand")); |
| | | param.remove("brand"); |
| | | } |
| | | // 没有选择的时候默认不显示已出库的物料 |
| | | if (Cools.isEmpty(param.get("status"))) { |
| | | wrapper.ne("status", "全部出库"); |
| | | } |
| | | |
| | | |
| | | convert(param, wrapper); |
| | | wrapper.orderBy("modify_time",false); |
| | | wrapper.orderBy("batch",true).orderBy("package_no" ,true); |
| | | allLike(Pla.class, param.keySet(), wrapper, condition); |
| | | return R.ok(plaService.selectPage(new Page<>(curr, limit), wrapper)); |
| | | } |
| | |
| | | BeanUtils.copyProperties(plaSave,plaLog); |
| | | plaLog.setId(null); |
| | | plaLog.setCreateTime(new Date()); |
| | | plaLog.setModifyUser(getUser().getUsername()); |
| | | plaLogService.insert(plaLog); |
| | | |
| | | }); |
| | |
| | | BeanUtils.copyProperties(plaSave,plaLog); |
| | | plaLog.setId(null); |
| | | plaLog.setCreateTime(new Date()); |
| | | plaLog.setModifyUser(getUser().getUsername()); |
| | | plaLogService.insert(plaLog); |
| | | |
| | | }); |