| | |
|---|
| | | @Autowired |
|---|
| | | private TestMastService testMastService; |
|---|
| | | @Autowired |
|---|
| | | private WorkLogHandler workLogHandler; |
|---|
| | | private WorkService workService; |
|---|
| | | |
|---|
| | | @Value("${mes.url}") |
|---|
| | | private String mesUrl; |
|---|
| | |
|---|
| | | |
|---|
| | | @Value("${mes.startUpTestPACK}") |
|---|
| | | private String suspendTestPACK; |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | |
|---|
| | | public void startUpTestPACK(TestMast testMast) { |
|---|
| | | |
|---|
| | | //启动测试请求 |
|---|
| | | ReturnT<String> result=startUpTestPACK1(testMast); |
|---|
| | | if (!result.isSuccess()) { |
|---|
| | | log.error("测试申请失败", testMast.getBarcode()); |
|---|
| | | // ReturnT<String> result=startUpTestPACK1(testMast); |
|---|
| | | // if (!result.isSuccess()) { |
|---|
| | | // log.error("测试申请失败", testMast.getBarcode()); |
|---|
| | | // throw new CoolException("测试申请失败"); |
|---|
| | | } |
|---|
| | | // } |
|---|
| | | LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo())); |
|---|
| | | if (Cools.isEmpty(locMast)) { |
|---|
| | | throw new CoolException(BaseRes.PARAM); |
|---|
| | |
|---|
| | | if (!testMastService.insert(testMast)){ |
|---|
| | | throw new CoolException("添加testMast失败"); |
|---|
| | | } |
|---|
| | | locMast.setPackStatus(2); |
|---|
| | | locMast.setPackStatus(1); |
|---|
| | | locMast.setModiTime(now); |
|---|
| | | if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){ |
|---|
| | | throw new CoolException("申请测试失败"); |
|---|
| | |
|---|
| | | public void suspendTestPACK() { |
|---|
| | | ReturnT<String> result=suspendTestPACK1(); |
|---|
| | | if (!result.isSuccess()) { |
|---|
| | | log.error("测试申请失败"); |
|---|
| | | log.error("暂停测试失败"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | @Transactional |
|---|
| | |
|---|
| | | } |
|---|
| | | return SUCCESS; |
|---|
| | | } |
|---|
| | | @Transactional |
|---|
| | | public void transplant(Review review){ |
|---|
| | | //移库开始，查询目标库位 |
|---|
| | | LocMast targetLocNo = locMastService.selectOne(new EntityWrapper<LocMast>() |
|---|
| | | .eq("row1",2) |
|---|
| | | .eq("loc_sts","O") |
|---|
| | | .eq("fire_status", 0) |
|---|
| | | .eq("pack_status",0)); |
|---|
| | | if (targetLocNo != null){ |
|---|
| | | workService.locMove(review.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(review.getUserId())); |
|---|
| | | }else { |
|---|
| | | throw new CoolException("没有空库位"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | /*...........................赣州新增..............以上.............赣州新增...........................*/ |
|---|
| | | } |
|---|
