#

cp

2024-08-19 d9458503d8bf707fcaa824b6343646cc9ad0e5fd

#

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MapController.java

@@ -42,7 +42,9 @@
    public String getMapData(@PathVariable("lev") Integer lev) {
        BasMap basMap = basMapService.getOne(new LambdaQueryWrapper<BasMap>().eq(BasMap::getLev, lev).eq(BasMap::getHostId, getHostId()));
        //解析json地图数据
        List<ArrayList> arrayLists = JSON.parseArray(basMap.getData(), ArrayList.class);
        List<ArrayList> arrayLists = new ArrayList<>();
        try{
            arrayLists = JSON.parseArray(basMap.getData(), ArrayList.class);
        ArrayList<HashMap<String, Integer>> lineRows = new ArrayList<>();
        int dataRow = 0;
        int dataRowCount = 0;
@@ -109,6 +111,9 @@
            rowData.set(bay, jsonObject);
            arrayLists.set(row, rowData);
        }
        } catch (Exception e){
            System.out.println("異常：異常原因："+e.getMessage());
        }

        return JSONObject.toJSONString(arrayLists);
    }

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/WorkLogScheduler.java

@@ -2,6 +2,7 @@

import com.zy.asrs.common.wms.entity.WrkMast;
import com.zy.asrs.common.wms.service.WrkMastService;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wms.task.core.ReturnT;
import com.zy.asrs.wms.task.handler.WorkLogHandler;
import lombok.extern.slf4j.Slf4j;
@@ -30,6 +31,16 @@
            return;
        }
        for (WrkMast wrkMast : wrkMasts) {
            if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) {
                if (Cools.isEmpty(wrkMast.getExitMk())) {
                    continue;
                }

                if (!wrkMast.getExitMk().equals("Y")) {
                    continue;
                }
            }

            ReturnT<String> result = workLogHandler.start(wrkMast);
            if (!result.isSuccess()) {
                log.error("工作档[workNo={}]历史档处理失败", wrkMast.getWrkNo());