| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @RequestMapping("/orderIn") |
|---|
| | | public synchronized R AGVOrderInReturn() { |
|---|
| | | List<OrderPakin> settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2)); |
|---|
| | | public synchronized R AGVOrderInReturn(@RequestBody JSONObject param) { |
|---|
| | | List<OrderPakin> settle; |
|---|
| | | if(param.getString("type").equals("1")){ |
|---|
| | | settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2).eq("doc_type",1)); |
|---|
| | | }else if(param.getString("type").equals("2")){ |
|---|
| | | settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2).eq("doc_type",2)); |
|---|
| | | } |
|---|
| | | else { |
|---|
| | | settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2)); |
|---|
| | | } |
|---|
| | | List<String> list = new ArrayList<>(); |
|---|
| | | for (OrderPakin orderPakin : settle) { |
|---|
| | | if (orderPakin.getSettle()==2){ |
|---|
