| | |
| | | import com.zy.asrs.entity.AgvBasDevp; |
| | | import com.zy.asrs.entity.AgvLocDetl; |
| | | import com.zy.asrs.entity.AgvLocMast; |
| | | import com.zy.asrs.entity.LocMast; |
| | | import com.zy.asrs.entity.param.AgvMobileStartPakin; |
| | | import com.zy.asrs.entity.param.AgvMobileStartParam; |
| | | import com.zy.asrs.entity.param.CombParam; |
| | | import com.zy.asrs.entity.param.PickParam; |
| | | import com.zy.asrs.service.*; |
| | | import com.zy.common.web.BaseController; |
| | | import lombok.Synchronized; |
| | |
| | | agvMobileService.comb(combParam, getUserId()); |
| | | |
| | | return R.ok(); |
| | | } |
| | | |
| | | // 再次拣料 |
| | | @RequestMapping("/pick/again/auth") |
| | | // @ManagerAuth(memo = "组托") |
| | | public R pickAgain(@RequestBody PickParam pickParams){ |
| | | agvMobileService.pickAgain(pickParams, 1l); |
| | | return R.ok("组托成功"); |
| | | } |
| | | |
| | | /* |
| | |
| | | |
| | | wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode); |
| | | |
| | | if (threeCode.substring(0,2).equals(30)) { |
| | | wrapper.isNull("specs").or().eq("specs",""); |
| | | } |
| | | List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper); |
| | | |
| | | for (AgvLocDetl agvLocDetl : agvLocDetls) { |
| | | AgvLocMast locNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo())); |
| | | agvLocDetl.setLocSts(locNo.getLocSts()); |
| | | agvLocDetl.setLocSts$(locNo.getLocSts$()); |
| | | } |
| | | |
| | | return R.ok(agvLocDetls); |
| | | } |
| | |
| | | |
| | | } |
| | | |
| | | @PostMapping("/agv/v1/locMove") |
| | | @Transactional |
| | | public R agvLocMove(@RequestBody HashMap<String,Object> params){ |
| | | String fl = String.valueOf(params.get("floor")); |
| | | short floor =(short)Integer.parseInt(fl.substring(0, 1)); |
| | | List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList"); |
| | | params.get("dbList"); |
| | | Object moveType = params.get("moveType"); |
| | | if (moveType == "unAuto") { |
| | | return R.error("手动功能暂时无法使用"); |
| | | } |
| | | for (HashMap<String, String> map : dbList) { |
| | | String locNo = map.get("locNo"); |
| | | Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq("loc_no", locNo); |
| | | AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper); |
| | | agvLocMast.setLocType("1"); |
| | | agvLocMast.setLocType3(floor); |
| | | agvLocMastService.update(agvLocMast,wrapper); |
| | | //System.out.println(locNo); |
| | | } |
| | | return R.ok(); |
| | | } |
| | | |
| | | public static void main(String[] args) { |
| | | List<AgvLocDetl> agvLocDetls1 = new ArrayList<>(); |
| | | List<AgvLocDetl> agvLocDetls2 = new ArrayList<>(); |