#

lsh

2024-03-21 b909f4e136ca3182befba9510fd0ccc13f6a784f

#

 src/main/java/com/zy/asrs/controller/TaskWrkController.java

@@ -218,7 +218,7 @@
            headParam.put("status",taskWrk.getStatus());
            headParam.put("ioType",taskWrk.getIoType());
            headParam.put("barcode",taskWrk.getBarcode());
            headParam.put("reportTime",new Date());
//            headParam.put("reportTime",new Date());
            String response;
            response = new HttpHandler.Builder()
                    // .setHeaders(headParam)
@@ -227,9 +227,9 @@
                    .setJson(JSON.toJSONString(headParam))
                    .build()
                    .doPost();

            log.info("wcs手动完成任务上报wms", taskWrk);
            JSONObject jsonObject = JSON.parseObject(response);
            apiLogService.save("wcs派发入库任务上报wms"
            apiLogService.save("wcs手动完成任务上报wms"
                    ,wmsUrl+taskStatusFeedbackPath
                    ,null
                    ,"127.0.0.1"
@@ -238,7 +238,7 @@
                    ,true
            );
        }catch (Exception e){
            log.error("wcs手动取消任务上报wms失败", taskWrk);
            log.error("wcs手动完成任务上报wms失败", taskWrk);
            throw new CoolException("wcs派发入库任务上报wms失败");
        }
        locMastService.updateById(locMast);
@@ -272,7 +272,7 @@
            headParam.put("status",taskWrk.getStatus());
            headParam.put("ioType",taskWrk.getIoType());
            headParam.put("barcode",taskWrk.getBarcode());
            headParam.put("reportTime",new Date());
//            headParam.put("reportTime",new Date());
            String response;
            response = new HttpHandler.Builder()
                    // .setHeaders(headParam)
@@ -281,9 +281,9 @@
                    .setJson(JSON.toJSONString(headParam))
                    .build()
                    .doPost();

            log.info("wcs手动取消任务上报wms", taskWrk);
            JSONObject jsonObject = JSON.parseObject(response);
            apiLogService.save("wcs派发入库任务上报wms"
            apiLogService.save("wcs手动取消任务上报wms"
                    ,wmsUrl+taskStatusFeedbackPath
                    ,null
                    ,"127.0.0.1"
@@ -292,7 +292,7 @@
                    ,true
            );
        }catch (Exception e){
            log.error("wcs手动完结任务上报wms失败", taskWrk);
            log.error("wcs手动取消任务上报wms失败", taskWrk);
            throw new CoolException("wcs派发入库任务上报wms失败");
        }
        taskWrk.setCompleteTime(now);//完结时间

 src/main/java/com/zy/asrs/entity/TaskWrk.java

@@ -50,7 +50,7 @@
    /**
     * 任务状态 1: 接收  2: 派发  3: 完结  4: 取消
     */
    @ApiModelProperty(value= "任务状态 1: 接收  2: 派发  3: 完结  4: 取消  ")
    @ApiModelProperty(value= "任务状态 1: 接收  2: 派发  5: 完结  4: 取消  ")
    private Integer status;

    /**

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -997,6 +997,8 @@
                        headParam.put("ioType",taskWrk.getIoType());
                        headParam.put("barcode",taskWrk.getBarcode());
                        String response;
                        log.error("wcs完结任务上报wms==》", headParam);

                        response = new HttpHandler.Builder()
                                // .setHeaders(headParam)
                                .setUri(wmsUrl)
@@ -1004,7 +1006,11 @@
                                .setJson(JSON.toJSONString(headParam))
                                .build()
                                .doPost();
                        JSONObject jsonObject = JSON.parseObject(response);
                        log.error("wcs完结任务上报wms==》", response);

//                        JSONObject jsonObject = JSON.parseObject(response);
//                        log.error("wcs完结任务上报wms==》", jsonObject);

                        apiLogService.save("wcs派发入库任务上报wms"
                                ,wmsUrl+taskStatusFeedbackPath
                                ,null
@@ -1015,7 +1021,8 @@
                        );
                    }catch (Exception e){
                        log.error("wcs完结任务上报wms失败", taskWrk);
                        throw new CoolException("wcs派发入库任务上报wms失败");
                        log.error("wcs完结任务上报wms失败,报错信息：", e);
//                        throw new CoolException("wcs派发入库任务上报wms失败");
                    }
                }


 src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java

@@ -144,7 +144,7 @@
                headParam.put("status",taskWrk.getStatus());
                headParam.put("ioType",taskWrk.getIoType());
                headParam.put("barcode",taskWrk.getBarcode());
                headParam.put("reportTime",new Date());
//                headParam.put("reportTime",new Date());
                String response;
                response = new HttpHandler.Builder()
                        // .setHeaders(headParam)