*

lsh

2025-04-29 3ada3c2a6f5295b343ef0180097bb120fb1a5cf6

*

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

@@ -264,7 +264,7 @@
            HashMap<String, Object> headParam = new HashMap<>();
            headParam.put("taskNo",taskWrk.getTaskNo());
            headParam.put("status",taskWrk.getStatus());
            headParam.put("ioType",taskWrk.getIoType());
            headParam.put("ioType",taskWrk.getIoTypeWms());
            headParam.put("barcode",taskWrk.getBarcode());
//            headParam.put("reportTime",new Date());
            log.info("wcs手动完成任务上报wms={}", taskWrk);
@@ -323,7 +323,7 @@
            HashMap<String, Object> headParam = new HashMap<>();
            headParam.put("taskNo",taskWrk.getTaskNo());
            headParam.put("status",taskWrk.getStatus());
            headParam.put("ioType",taskWrk.getIoType());
            headParam.put("ioType",taskWrk.getIoTypeWms());
            headParam.put("barcode",taskWrk.getBarcode());
//            headParam.put("reportTime",new Date());


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

@@ -363,4 +363,17 @@
        }
    }

    public Integer getIoTypeWms(){
        switch (ioType){
            case 2:
                return 1;
            case 3:
                return 2;
            case 1:
                return 3;
            default:
                return 0;
        }
    }

}

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

@@ -517,7 +517,7 @@
                                }
                            }
                        } else {
                            TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>());
                            TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("IO_TYPE",1).eq("WRK_STS",1).eq("START_POINT",staProtocol.getSiteId().toString()));

                            if (!Cools.isEmpty(taskWrk1)) {
                                if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
@@ -797,7 +797,7 @@
                        HashMap<String, Object> headParam = new HashMap<>();
                        headParam.put("taskNo", taskWrk.getTaskNo());
                        headParam.put("status", taskWrk.getStatus());
                        headParam.put("ioType", taskWrk.getIoType());
                        headParam.put("ioType", taskWrk.getIoTypeWms());
                        headParam.put("barcode", taskWrk.getBarcode());
                        String response;
                        response = new HttpHandler.Builder()
@@ -917,7 +917,7 @@
                                HashMap<String, Object> headParam = new HashMap<>();
                                headParam.put("taskNo", taskWrk.getTaskNo());
                                headParam.put("status", taskWrk.getStatus());
                                headParam.put("ioType", taskWrk.getIoType());
                                headParam.put("ioType", taskWrk.getIoTypeWms());
                                headParam.put("barcode", taskWrk.getBarcode());
                                String response;
                                response = new HttpHandler.Builder()
@@ -1021,7 +1021,7 @@
                        HashMap<String, Object> headParam = new HashMap<>();
                        headParam.put("taskNo", taskWrk.getTaskNo());
                        headParam.put("status", taskWrk.getStatus());
                        headParam.put("ioType", taskWrk.getIoType());
                        headParam.put("ioType", taskWrk.getIoTypeWms());
                        headParam.put("barcode", taskWrk.getBarcode());
                        String response;
                        response = new HttpHandler.Builder()
@@ -1135,7 +1135,7 @@
                        HashMap<String, Object> headParam = new HashMap<>();
                        headParam.put("taskNo", taskWrk.getTaskNo());
                        headParam.put("status", taskWrk.getStatus());
                        headParam.put("ioType", taskWrk.getIoType());
                        headParam.put("ioType", taskWrk.getIoTypeWms());
                        headParam.put("barcode", taskWrk.getBarcode());
                        String response;
                        log.error("wcs完结任务上报wms==》", headParam);

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

@@ -143,7 +143,7 @@
                HashMap<String, Object> headParam = new HashMap<>();
                headParam.put("taskNo",taskWrk.getTaskNo());
                headParam.put("status",taskWrk.getStatus());
                headParam.put("ioType",taskWrk.getIoType());
                headParam.put("ioType",taskWrk.getIoTypeWms());
                headParam.put("barcode",taskWrk.getBarcode());
//                headParam.put("reportTime",new Date());
                String response;