48afd71b25a91320c1855aace0303bb490ded161..5ac7766410dda9460fa25f727eae1bd61cb30a1a
2025-05-23 Junjie
#
5ac776 对比 | 目录
2025-05-23 Junjie
#
ed4a3b 对比 | 目录
2025-05-23 Junjie
#
ce691e 对比 | 目录
3个文件已修改
56 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/TaskLogScheduler.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -695,37 +695,24 @@
                    if (taskWrkMapper.updateById(taskWrk) == 0) {
                        log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中 失败!!,工作号={}", taskWrk.getWrkNo());
                    }
                    String response = "";
                    Boolean bool=false;
                    HashMap<String, Object> headParam = new HashMap<>();
                    headParam.put("TaskNo", taskWrk.getTaskNo());
                    try {
                        response = new HttpHandler.Builder()
                                // .setHeaders(headParam)
                                .setUri(wmsUrl)
                                .setPath(taskExecCallback)
                                .setJson(JSON.toJSONString(headParam))
                                .build()
                                .doPost();
                        JSONObject jsonObject = JSON.parseObject(response);
                        if(jsonObject.get("ReturnStatus").equals(0)){
                            bool = true;
                            taskWrk.setStatus(2);
                            taskWrkMapper.updateById(taskWrk);
                        }
                    } catch (Exception e) {
                        log.error("wcs派发移库库任务上报wms失败", taskWrk);
//                        throw new CoolException("wcs派发移库库任务上报wms失败");
                    }finally {
                        apiLogService.save("wcs派发移库任务上报wms"
                                , wmsUrl + taskExecCallback
                                , null
                                , "127.0.0.1"
                                , JSON.toJSONString(headParam)
                                , response
                                , bool
                        );
                    //上报-移库任务开始时,WCS回调WMS
                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
                    HashMap<String, Object> hashMap = new HashMap<>();
                    hashMap.put("taskNo", taskWrk.getTaskNo());
                    hashMap.put("status", TaskStatusType.DISTRIBUTE.id);
                    hashMap.put("ioType", 3);
                    hashMap.put("barcode", taskWrk.getBarcode());
                    hashMap.put("reportTime", format.format(new Date()));
                    NotifyCustomDataDto customDataDto = new NotifyCustomDataDto();
                    customDataDto.setUri(wmsUrl);
                    customDataDto.setPath(taskExecCallback);
                    customDataDto.setData(JSON.toJSONString(hashMap));
                    boolean notifyResult = notifyUtils.notify("task", 1, String.valueOf(taskWrk.getWrkNo()), taskWrk.getTaskNo(), NotifyMsgType.TASK_START, JSON.toJSONString(taskWrk), true, customDataDto);
                    if(notifyResult) {
                        taskWrk.setStatus(2);
                        taskWrkService.updateById(taskWrk);
                    }
                }
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -81,6 +81,11 @@
            locMast.setLocSts("R");
            locMast.setModiTime(new Date());
            locMastService.updateById(locMast);
            LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getTargetPoint()));
            locMast2.setLocSts("S");
            locMast2.setModiTime(new Date());
            locMastService.updateById(locMast2);
        }
        if (!Cools.isEmpty(param.getMemo())) {
src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -57,7 +57,7 @@
            NotifyMsgType notifyMsgType = null;
            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus().equals(TaskStatusType.MANUAL_OVER.id)) {//完成
                headParam.put("status", TaskStatusType.OVER.id);
                headParam.put("ioType", 1);
                headParam.put("ioType", taskWrk.getIoType());
                notifyMsgType = NotifyMsgType.TASK_COMPLETE;
                if (taskWrk.getIoType() == 1) {//入库任务完成库位为F
@@ -120,7 +120,7 @@
            } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
                headParam.put("status", TaskStatusType.CANCEL.id);
                headParam.put("ioType", 2);
                headParam.put("ioType", taskWrk.getIoType());
                notifyMsgType = NotifyMsgType.TASK_CANCEL;
                if (taskWrk.getIoType() == 1) {//入库任务