| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>(); |
|---|
| | | wrapper.eq(Order::getStatus, 1); |
|---|
| | | wrapper.in(Order::getStatus, 1,2); |
|---|
| | | wrapper.eq(Order::getHostId, getHostId()); |
|---|
| | | wrapper.in(Order::getDocType, typeList); |
|---|
| | | List<Order> orders = orderService.list(wrapper); |
|---|
| | | |
|---|
| | | ArrayList<Long> orderIds = new ArrayList<>(); |
|---|
| | | for (Order order : orders) { |
|---|
| | | orderIds.add(order.getId()); |
|---|
| | | Date currentDate = new Date(); |
|---|
| | | |
|---|
| | | Calendar calendar = Calendar.getInstance(); |
|---|
| | | calendar.setTime(currentDate); |
|---|
| | | calendar.add(Calendar.MONTH, -1); |
|---|
| | | |
|---|
| | | Date previousMonthDate = calendar.getTime(); |
|---|
| | | int result=previousMonthDate.compareTo(order.getCreateTime()); |
|---|
| | | if(result<0){ |
|---|
| | | orderIds.add(order.getId()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
| | | |
|---|
| | | //搜索明细 |
|---|
| | |
|---|
| | | wrapper1.eq(OrderDetl::getHostId, getHostId()); |
|---|
| | | wrapper1.in(OrderDetl::getOrderId, orderIds); |
|---|
| | | wrapper1.orderByDesc(OrderDetl::getCreateTime); |
|---|
| | | // wrapper1.last("LIMIT 1000"); |
|---|
| | | if (!Cools.isEmpty(matnr)) { |
|---|
| | | wrapper1.like(OrderDetl::getMatnr, matnr); |
|---|
| | | } |
|---|
| | |
|---|
| | | |
|---|
| | | PickMatParam matParam = new PickMatParam(); |
|---|
| | | matParam.setMatnr(orderDetl.getMatnr()); |
|---|
| | | matParam.setMaktx(orderDetl.getMaktx()); |
|---|
| | | matParam.setBatch(orderDetl.getBatch()); |
|---|
| | | matParam.setOrderNo(orderDetl.getOrderNo()); |
|---|
| | | matParam.setOrderId(orderDetl.getOrderId()); |
|---|
| | |
|---|
| | | wrkDetl.setHostId(getHostId()); |
|---|
| | | wrkDetl.setWrkMastId(wrkMast.getId()); |
|---|
| | | wrkDetl.setZpallet(wrkMast.getBarcode()); |
|---|
| | | if(Cools.isEmpty(matParam.getBatch())){ |
|---|
| | | wrkDetl.setBatch(""); |
|---|
| | | } |
|---|
| | | if (!wrkDetlService.save(wrkDetl)) { |
|---|
| | | throw new CoolException("保存工作档明细失败"); |
|---|
| | | } |
|---|
| | |
|---|
| | | @RequestMapping("/barcode/list/pick") |
|---|
| | | @ManagerAuth(memo = "拣料入库途中并板") |
|---|
| | | @Transactional |
|---|
| | | public R orderOutListOrderPick(@RequestBody String barcode) { |
|---|
| | | public R orderOutListOrderPick(@RequestBody(required = false) String barcode) { |
|---|
| | | ArrayList<WrkMast> wrkMastArrayList = new ArrayList<>(); |
|---|
| | | if (Cools.isEmpty(barcode) || barcode.isEmpty()) { |
|---|
| | | List<WrkMast> wrkMasts = wrkMastService.list(new LambdaQueryWrapper<WrkMast>() |
|---|
| | |
|---|
| | | } |
|---|
| | | for (OrderDetl o : orderDetls |
|---|
| | | ) { |
|---|
| | | if(o.getAnfme().equals(o.getQty())){ |
|---|
| | | continue; |
|---|
| | | } |
|---|
| | | for (LocDetl l : locDetls |
|---|
| | | ) { |
|---|
| | | if (o.getMatnr().equals(l.getMatnr())) { |
|---|
