变更返回字段格式

whycxzp

2025-04-25 1059492cab966417e1cadd41f5d091cee5af1a8b

变更返回字段格式

 src/main/java/com/whyc/controller/InterfaceWmsController.java

@@ -76,6 +76,11 @@
        return service.getLocationList();
    }

    /**
     * @param MaterialType 0=获取所有、1=载具、2=电池
     * @param PalletStatus 0=库位、1=获取所有、4=待出库
     * @return
     */
    @GetMapping("getPalletList")
    public Response getPalletList(@RequestParam int MaterialType,@RequestParam int PalletStatus){


 src/main/java/com/whyc/service/WmsService.java

@@ -5,6 +5,7 @@
import com.google.gson.reflect.TypeToken;
import com.whyc.dto.*;
import com.whyc.pojo.db_abe_ram.AbeInf;
import com.whyc.pojo.db_wms.BattWarehouse;
import com.whyc.pojo.db_wms.Task;
import com.whyc.util.HttpUtil;
import com.whyc.util.JsonUtil;
@@ -25,6 +26,9 @@

    @Autowired
    private AbeInfService abeInfService;

    @Autowired
    private BattWarehouseService battWarehouseService;

    public Response getMaterialList() {
        String httpUrl = "http://192.168.10.133:8051"+"/api/Wms_material/get_all";
@@ -105,7 +109,7 @@
                String startLocationCode = taskDto.getStartlocation_code();
                //1=搬运空托,2=搬运电池. 转化到字段Des中,1001=搬运空托,1002=搬运电池
                Integer type = taskDto.getType();
                String taskNo = responseInside.getTask_no();
                String taskNo = (String) responseInside.getTask_no().get(0);

                Task task = new Task();
                task.setTaskNo(taskNo);
@@ -234,6 +238,11 @@
                task.setActivationChamberStartTime(statusTime);
            }break;
            case 14:
                //开始取活化结束的电池,如果任务编号在更新电池仓库中存在,则更新活化时间为当前时间
                BattWarehouse battWarehouse =battWarehouseService.getByTaskNo(taskNo);
                if(battWarehouse != null){
                    battWarehouseService.finishActivationById(battWarehouse.getId());
                }
                task.setActivationChamberPickUpTime(statusTime);break;
            case 24:
                //测压任务,开始取测压结束的电池. 读取abe_inf表中的内阻,插入到任务里