| | |
| | | EntityWrapper<ManPakOut> manPakOutEntityWrapper = new EntityWrapper<>(); |
| | | manPakOutEntityWrapper.eq("loc_no",jsonLocNo); |
| | | manPakOutEntityWrapper.eq("matnr",jsonOrderDetl.getMatnr()); |
| | | manPakOutEntityWrapper.eq("doc_num",order.getOrderNo()); |
| | | ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper); //获取拣货单中的对应的订单 |
| | | if(Cools.isEmpty(manPakOut)){ |
| | | return R.error("没有找到对应的出库单"+jsonLocNo+"-------"+jsonOrderDetl.getMatnr()); |
| | | } |
| | | if(manPakOut.getCount() == null){ |
| | | manPakOut.setCount(0.0); |
| | | } |
| | |
| | | EntityWrapper<ManLocDetl> manLocDetlEntityWrapper = new EntityWrapper<>(); |
| | | manLocDetlEntityWrapper.eq("loc_no",manPakOut.getLocNo()); |
| | | manLocDetlEntityWrapper.eq("matnr",manPakOut.getMatnr()); |
| | | if (checkManLocDetl.getAnfme().intValue() == manPakOut.getCount()){ |
| | | |
| | | if (checkManLocDetl.getAnfme() == 0 ){ |
| | | if(!manLocDetlService.delete(manLocDetlEntityWrapper)){ |
| | | return R.error("删除平库库存失败"); |
| | | } |
| | |
| | | String jsonLocNo = (String) json.get("locNo"); //获取库位码 |
| | | String jsonBarNo = (String) json.get("barcode"); //获取托盘码 |
| | | |
| | | WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", jsonBarNo)); //获取对应组托信息 |
| | | if (waitPakin.equals(null)){ |
| | | List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", jsonBarNo)); //获取对应组托信息 |
| | | if (Cools.isEmpty(waitPakins)){ |
| | | return R.error("未查询到组托"); |
| | | } else if (waitPakin.getIoStatus() == "Y") { |
| | | } else if (waitPakins.get(0).getIoStatus() == "Y") { |
| | | return R.error("组托已经生成工作档"); |
| | | } |
| | | //判断订单是否完成 |
| | | boolean log =true; |
| | | |
| | | for (WaitPakin waitPakin: waitPakins) { |
| | | Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", waitPakin.getOrderNo())); //获取对应订单信息 |
| | | if (order.equals(null)){ |
| | | return R.error("未查询到订单信息"); |
| | |
| | | if (!waitPakinLogService.insert(waitPakinLog)){ //插入入库通知历史档数据库 |
| | | return R.error("插入历史入库通知档失败"); |
| | | } |
| | | //订单是否完成 |
| | | List<OrderDetl> or = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", waitPakin.getOrderNo())); |
| | | for (OrderDetl o: or) { |
| | | if(o.getAnfme()-o.getQty()>0){ |
| | | log=false; |
| | | break; |
| | | } |
| | | } |
| | | if(log){ |
| | | order.setSettle(4L); |
| | | if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no", waitPakin.getOrderNo()))){ |
| | | return R.error("订单转完成状态失败!!!"); |
| | | } |
| | | } |
| | | } |
| | | |
| | | if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet",jsonBarNo))){ //删除原入库通知档 |
| | | return R.error("删除入库通知档失败"); |