#

1

2025-05-12 fcc24525fba4cbc27b0965bf18440efc38ad9150

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

@@ -23,6 +23,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.util.*;

@RestController
@@ -263,10 +264,12 @@
        try{
            HashMap<String, Object> headParam = new HashMap<>();
            headParam.put("taskNo",taskWrk.getTaskNo());
            headParam.put("status",taskWrk.getStatus());
            headParam.put("taskStatus",taskWrk.getStatus());
            headParam.put("ioType",taskWrk.getIoTypeWms());
            headParam.put("barcode",taskWrk.getBarcode());
//            headParam.put("reportTime",new Date());
            headParam.put("barCode",taskWrk.getBarcode());
            headParam.put("reportTime", LocalDateTime.now());
            headParam.put("weight",taskWrk.getScWeight().doubleValue());

            log.info("wcs手动完成任务上报wms={}", taskWrk);
            response = new HttpHandler.Builder()
                    // .setHeaders(headParam)
@@ -322,10 +325,12 @@
        try{
            HashMap<String, Object> headParam = new HashMap<>();
            headParam.put("taskNo",taskWrk.getTaskNo());
            headParam.put("status",taskWrk.getStatus());
            headParam.put("taskStatus",taskWrk.getStatus());
            headParam.put("ioType",taskWrk.getIoTypeWms());
            headParam.put("barcode",taskWrk.getBarcode());
//            headParam.put("reportTime",new Date());
            headParam.put("barCode",taskWrk.getBarcode());
            headParam.put("reportTime", LocalDateTime.now());
            headParam.put("weight",taskWrk.getScWeight().doubleValue());


            log.info("wcs手动取消任务上报wm={}", taskWrk);
            response = new HttpHandler.Builder()
@@ -377,6 +382,7 @@
            return R.ok();
        } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
            taskWrk.setWrkSts(2);
            taskWrk.setStatus(TaskStatusType.RECEIVE.id);//派发状态
            taskWrkService.updateById(taskWrk);
            if(!taskWrkService.updateById(taskWrk)){
                return R.error("更新任务状态失败");