巡检记录

whycxzp

2025-04-03 cf3aa090e21f1743c2c998309a83897b05241c63

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

@@ -13,7 +13,9 @@
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Service
public class WmsService {
@@ -61,26 +63,25 @@
            WmsResponse responseInside = JsonUtil.getGson().fromJson(dataStr, WmsResponse.class);
            response.set(1,responseInside);
            //对下发的任务进行数据库存储
            Task task = new Task();
            task.setTaskNo(responseInside.getTask_no());
            task.setDes(palletDto.getDes());
            //将字符串列表转为1组字符串,每个元素用逗号分割
            List<String> pallets = palletDto.getPallets();
            task.setPallets(String.join(",", pallets));

            List<String> activateParameter = palletDto.getActivateParameter();
            task.setActivateParameter(String.join(",",activateParameter));

            Date date = new Date();
            task.setCreateTime(date);
            List<String> pallets = palletDto.getPallets();
            List<String> taskNos = responseInside.getTask_no();
            for (int i = 0; i < pallets.size(); i++) {
                String pallet = pallets.get(i);
                String taskNo = taskNos.get(i);
                Task task = new Task();
                task.setTaskNo(taskNo);
                task.setPallets(pallet);
                task.setDes(palletDto.getDes());

            taskService.add(task);
                List<String> activateParameter = palletDto.getActivateParameter();
                task.setActivateParameter(String.join(",",activateParameter));
                task.setCreateTime(date);

            //更新电池编号
            PageParam pageParam = new PageParam();
            pageParam.setId(3);
            pageParam.setValue(Integer.valueOf(task.getPallets()));
            paramService.updateById(pageParam);
                taskService.add(task);


            }

        }
        return response;
@@ -102,9 +103,13 @@
        return response;
    }

    public Response getPalletList() {
    public Response getPalletList(int MaterialType, int PalletStatus) {
        String httpUrl = "http://192.168.10.133:8051"+"/api/Wms_pallet/get_all";
        Response response = HttpUtil.doGet(httpUrl, (String) null);

        Map<String,Integer> queryMap = new HashMap<>();
        queryMap.put("MaterialType",MaterialType);
        queryMap.put("PalletStatus",PalletStatus);
        Response response = HttpUtil.doGet(httpUrl, HttpUtil.urlEncode(queryMap));
        //对结果进行处理
        if(response.getCode() == 1){ //请求成功,data有正常数据
            String dataStr = (String) response.getData();
@@ -143,7 +148,19 @@
        switch (status){
            case 1:
            case 11:
            case 21: task.setPickUpStartTime(statusTime);break;
            case 21: {
                String pallet = task.getPallets();
                if(pallet == null){
                    pallet = taskService.getByTaskNo(taskNo).getPallets();
                }
                //更新电池单体编号
                PageParam pageParam = new PageParam();
                pageParam.setId(3);
                pageParam.setValue(Integer.valueOf(pallet));
                paramService.updateById(pageParam);
                //更新任务时间
                task.setPickUpStartTime(statusTime);
            }break;
            case 2:
            case 12:
            case 22: task.setPickUpTime(statusTime);break;