#

lsh

2024-07-25 a7c9e410db03f9ffd6eb8ccda9b295844302fe32

#

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

@@ -45,14 +45,20 @@
            JarMastTableVo jarMastTableVo = new JarMastTableVo();
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()));
            List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", jarMast.getWrkNo()));
            if (wrkDetls.isEmpty()){
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetls.add(wrkDetl);
            }
            if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
                return R.error("未查询到任务数据");
            }
            jarMastTableVo.setJarId(jarMast.getJarId());
            jarMastTableVo.setJarWrkNo(jarMast.getWrkNo().toString());
            jarMastTableVo.setStatus(jarMast.getStatus());
            jarMastTableVo.setStatus$(jarMast.getStatus$());
            jarMastTableVo.setMatnr(wrkDetls.get(0).getMatnr());
            jarMastTableVo.setMaktx(wrkDetls.get(0).getMaktx());
            jarMastTableVo.setWeight(wrkDetls.get(0).getWeight());
            jarMastTableVos.add(jarMastTableVo);
        }
        return R.ok(jarMastTableVos);

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

@@ -6,18 +6,13 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasJarMast;
import com.zy.asrs.entity.BasJarMastLog;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.vo.JarMastTableVo;
import com.zy.asrs.service.BasJarMastLogService;
import com.zy.asrs.service.*;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.service.WrkDetlService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -33,6 +28,10 @@
    private WrkMastService wrkMastService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;

    @RequestMapping(value = "/basJarMastLog/historicalTasks/auth")
    @ManagerAuth
@@ -44,8 +43,29 @@
        ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
        for (BasJarMastLog jarMast : jarMasts) {
            JarMastTableVo jarMastTableVo = new JarMastTableVo();
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()));
            List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", jarMast.getWrkNo()));
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()).eq("io_time",jarMast.getIoTime()));
            if (Cools.isEmpty(wrkMast)){
                wrkMast = new WrkMast();
                WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", jarMast.getWrkNo()).eq("io_time",jarMast.getIoTime()));
                wrkMast.sync(wrkMastLog);
            }
            if (Cools.isEmpty(wrkMast)){
                return R.error("未查询到任务数据");
            }
            List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", jarMast.getWrkNo()).eq("io_time",jarMast.getIoTime()));
            if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
                List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>().eq("wrk_no", jarMast.getWrkNo()).eq("io_time",jarMast.getIoTime()));
                wrkDetls = new ArrayList<>();
                for (WrkDetlLog wrkDetlLog : wrkDetlLogs){
                    WrkDetl wrkDetl = new WrkDetl();
                    wrkDetl.sync(wrkDetlLog);
                    wrkDetls.add(wrkDetl);
                }
                if (wrkDetls.isEmpty()){
                    WrkDetl wrkDetl = new WrkDetl();
                    wrkDetls.add(wrkDetl);
                }
            }
            if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
                return R.error("未查询到任务数据");
            }

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

@@ -1,5 +1,6 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
@@ -179,9 +180,9 @@

    public String getStatus$(){
        BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
        BasJarMastStatus basJarMastStatus = service.selectById(this.status);
        BasJarMastStatus basJarMastStatus = service.selectOne(new EntityWrapper<BasJarMastStatus>().eq("box_type",this.status.toString()));
        if (!Cools.isEmpty(basJarMastStatus)){
            return String.valueOf(basJarMastStatus.getId());
            return String.valueOf(basJarMastStatus.getBoxSpecs());
        }
        return null;
    }

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.*;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -526,6 +527,10 @@
        }
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }



}

 src/main/java/com/zy/asrs/entity/vo/JarMastTableVo.java

@@ -7,6 +7,8 @@
    private Integer jarId;
    private String jarWrkNo;
    private Integer status;
    private String status$;
    private String matnr;
    private String maktx;
    private Double weight;
}

 src/main/webapp/views/deviceOperate/jarOperate.html

@@ -49,12 +49,14 @@
                            </el-table-column>
                            <el-table-column property="jarWrkNo" label="工作号">
                            </el-table-column>
                            <el-table-column property="status" label="状态">
                            <el-table-column property="status$" label="状态">
                            </el-table-column>
                            <el-table-column property="matnr" label="物料码">
                            </el-table-column>
                            <el-table-column property="maktx" label="物料名称">
                            </el-table-column>
                            <el-table-column property="weight" label="重量">
                            </el-table-column>
                        </el-table>
                    </div>