| src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/controller/OrderPakoutController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/controller/OutController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/controller/WorkController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/controller/WrkMastController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/Mat.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/Order.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -189,9 +189,11 @@ } log.info("任务执行参数回写:{}", JSON.toJSONString(params)); if (params.getMsgType().equals("task_complete") || params.getMsgType().equals("station_out_task_run_complete")) { JSONObject json = JSONObject.parseObject(params.getData()); log.info(params.getSuperTaskNo() + "==============>{}", json); if (mast.getIoType() == 1 || mast.getIoType() == 11 || mast.getIoType() == 10 || mast.getIoType() == 53 || mast.getIoType() == 54 || mast.getIoType() == 57) { if (params.getMsgType().equals("task_complete")) { if (mast.getIoType() == 53) { if (mast.getIoType() == 53 && !Objects.isNull(json) && json.getInteger("ioType") == 1) { List<WrkDetl> wrkDetls103 = wrkDetlService .selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo())); if (wrkDetls103.isEmpty()) { @@ -220,8 +222,12 @@ } } } mast.setWrkSts(4L); } else if ((mast.getIoType() == 54 || mast.getIoType() == 57) ) { mast.setWrkSts(4L); } else if (mast.getIoType() != 53 ) { mast.setWrkSts(4L); } mast.setWrkSts(4L); } } else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) { if (mast.getWrkSts() != 14) { src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -79,11 +79,15 @@ @RequestMapping(value = "/order/AGV/nav/list/auth") @ManagerAuth public R AGVnavList(@RequestParam(required = false) String orderNo){ public R AGVnavList(@RequestParam(required = false) String orderNo, @RequestParam(required = false) String shipCode){ EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>(); if (!Cools.isEmpty(orderNo)) { wrapper.like("order_no", orderNo); } if (!Cools.isEmpty(shipCode)) { wrapper.like("ship_code", shipCode); } wrapper.le("settle", 2).eq("status", 1); wrapper.eq("doc_type", OrderTypeEnum.STOCK.type); wrapper.orderBy("create_time", false); src/main/java/com/zy/asrs/controller/OutController.java
@@ -252,6 +252,9 @@ List<TaskDto> taskDtos = new ArrayList<>(); // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务 for (LocDto locDto : locDtos) { if (Objects.isNull(locDto.getStaNo())) { throw new CoolException("库位：" + locDto.getLocNo() + "，未选中出库站点！！"); } if (locDto.isLack()) { continue; } TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto); if (TaskDto.has(taskDtos, taskDto)) { @@ -334,8 +337,6 @@ if (Cools.isEmpty(locDtos)) { return R.parse(BaseRes.PARAM); } List<LocDto> locDtoArrayList = new ArrayList<>(); for (LocDto locDto : locDtos){ if (locDto.getFrozen()!=1 && locDto.getFrozenLoc()!=1){ src/main/java/com/zy/asrs/controller/WorkController.java
@@ -37,19 +37,19 @@ @RequestMapping("/available/put/site") @ManagerAuth() public R availablePutSite(){ public R availablePutSite() { return R.ok().add(basDevpService.getAvailableInSite()); } @RequestMapping("/available/empty/put/site") @ManagerAuth() public R availableEmptyPutSite(){ public R availableEmptyPutSite() { return R.ok().add(basDevpService.getAvailableEmptyInSite()); } @RequestMapping("/available/take/site") @ManagerAuth() public R availableTakeSite(){ public R availableTakeSite() { List<Map<String, Object>> result = new ArrayList<>(); List<Integer> outSite = basDevpService.getAvailableOutSite(101); for (Integer siteId : outSite) { @@ -77,13 +77,13 @@ @RequestMapping("/available/take/check/site") @ManagerAuth() public R availableTakeCheckSite(){ public R availableTakeCheckSite() { return R.ok().add(basDevpService.getAvailableOutSite(107)); } @RequestMapping("/available/empty/take/site") @ManagerAuth() public R availableEmptyTakeSite(){ public R availableEmptyTakeSite() { return R.ok().add(basDevpService.getAvailableEmptyOutSite()); } @@ -93,8 +93,8 @@ try { String locNo = workService.startupFullPutStore(fullStoreParam, getUserId()); return R.ok("入库启动成功").add(locNo); } catch (Exception e){ return R.error("入库启动失败==>"+e.getMessage()); } catch (Exception e) { return R.error("入库启动失败==>" + e.getMessage()); } } @@ -136,10 +136,10 @@ @RequestMapping("/mat/turn/over/out/start") @ManagerAuth(memo = "品号移交") public R turnMatLocDetl(@RequestBody EmptyPlateOutParam param) { if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(),param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())){ if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(), param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())) { return R.error("参数为空"); } if (param.getLocDetls().size()>1){ if (param.getLocDetls().size() > 1) { return R.error("请单条数据修改，谨慎操作！"); } workService.turnMatLocDetl(param, getUserId()); @@ -156,7 +156,7 @@ @RequestMapping("/hand/control/wrkMast") @ManagerAuth(memo = "手动处理工作档") public R handControlWrkMast(@RequestParam String workNo, @RequestParam Integer type){ @RequestParam Integer type) { if (type == 1) { workService.completeWrkMast(workNo, getUserId()); return R.ok("工作档已完成"); src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -15,7 +15,6 @@ import com.zy.asrs.entity.WrkMast; import com.zy.asrs.service.WrkDetlService; import com.zy.asrs.service.WrkMastService; import com.zy.asrs.service.impl.WrkDetlServiceImpl; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -52,7 +51,6 @@ EntityWrapper<WrkMast> wrapper = new EntityWrapper<>(); convert(param, wrapper); allLike(WrkMast.class, param.keySet(), wrapper, condition); if (!Cools.isEmpty(orderNo)) { List<WrkDetl> detls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)); if (!Cools.isEmpty(detls)) { @@ -169,10 +167,10 @@ return R.error("请至少选择一行数据"); } for (WrkMast entity : list){ entity.setIoPri(entity.getIoPri() + 1); if (!wrkMastService.update(entity, new EntityWrapper<WrkMast>().eq("wrk_no", entity.getWrkNo()))) { throw new CoolException("优先级更新失败!"); } entity.setIoPri(entity.getIoPri() + 1); if (!wrkMastService.update(entity, new EntityWrapper<WrkMast>().eq("wrk_no", entity.getWrkNo()))) { throw new CoolException("优先级更新失败!"); } } // wrkMastService.updateBatchById(list); return R.ok(); @@ -180,14 +178,19 @@ @RequestMapping(value = "/wrkMast/red/pri/auth") @ManagerAuth(memo = "工作档降低优先级") @Transactional(rollbackFor = Exception.class) public R redPri(@RequestBody List<WrkMast> list) { if (list.isEmpty()) { return R.error("请至少选择一行数据"); } for (WrkMast entity : list){ entity.setIoPri(entity.getIoPri() - 1); if (!wrkMastService.update(entity, new EntityWrapper<WrkMast>().eq("wrk_no", entity.getWrkNo()))) { throw new CoolException("优先级更新失败!"); } } wrkMastService.updateBatchById(list); // wrkMastService.updateBatchById(list); return R.ok(); }
@@ -339,9 +339,6 @@ @TableField("store_max_date") private Integer storeMaxDate; /** * 出库优先级 */ @TableField("rank") private String rank;
@@ -209,7 +209,7 @@ /** * 物流名称 */ @ApiModelProperty(value= "单据类型") @ApiModelProperty(value= "物流名称") @TableField("ship_name") private String shipName;
