看板修改添加

master
maxw@mesnac.com 1 month ago
parent bed8a3577b
commit a1ad065e6f

@ -46,6 +46,13 @@ public class FifthWmsBorderController {
public AjaxResult scheduleTask(){
return AjaxResult.success(fifthWmsBorderService.scheduleTask());
}
/**
* agv
*/
@GetMapping("/agvStatus")
public AjaxResult agvStatus(){
return AjaxResult.success(fifthWmsBorderService.agvStatus());
}
}

@ -0,0 +1,221 @@
package com.hw.wms.board.domain;
import java.io.Serializable;
import java.util.Date;
/**
* (WcsAgvStatus)
*
* @author makejava
* @since 2024-12-07 13:16:17
*/
public class WcsAgvStatus implements Serializable {
private static final long serialVersionUID = -31312485645520582L;
/**
*
*/
private String battery;
/**
* 1- 0-
*/
private String excltype;
/**
*
*/
private String mapcode;
/**
* 线
*/
private String online;
/**
* 线
*/
private String path;
/**
*
*/
private String podcode;
/**
*
*/
private String poddir;
/**
* X
*/
private String posx;
/**
* Y
*/
private String posy;
/**
*
*/
private String robotcode;
/**
* ( -180~360)
*/
private String robotdir;
/**
* Ip
*/
private String robotip;
/**
*
*/
private String speed;
/**
*
*/
private String status;
/**
* 0- 1-
*/
private String stop;
/**
*
*/
private Date timestamp;
/**
*
*/
private String agvname;
public String getBattery() {
return battery;
}
public void setBattery(String battery) {
this.battery = battery;
}
public String getExcltype() {
return excltype;
}
public void setExcltype(String excltype) {
this.excltype = excltype;
}
public String getMapcode() {
return mapcode;
}
public void setMapcode(String mapcode) {
this.mapcode = mapcode;
}
public String getOnline() {
return online;
}
public void setOnline(String online) {
this.online = online;
}
public String getPath() {
return path;
}
public void setPath(String path) {
this.path = path;
}
public String getPodcode() {
return podcode;
}
public void setPodcode(String podcode) {
this.podcode = podcode;
}
public String getPoddir() {
return poddir;
}
public void setPoddir(String poddir) {
this.poddir = poddir;
}
public String getPosx() {
return posx;
}
public void setPosx(String posx) {
this.posx = posx;
}
public String getPosy() {
return posy;
}
public void setPosy(String posy) {
this.posy = posy;
}
public String getRobotcode() {
return robotcode;
}
public void setRobotcode(String robotcode) {
this.robotcode = robotcode;
}
public String getRobotdir() {
return robotdir;
}
public void setRobotdir(String robotdir) {
this.robotdir = robotdir;
}
public String getRobotip() {
return robotip;
}
public void setRobotip(String robotip) {
this.robotip = robotip;
}
public String getSpeed() {
return speed;
}
public void setSpeed(String speed) {
this.speed = speed;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getStop() {
return stop;
}
public void setStop(String stop) {
this.stop = stop;
}
public Date getTimestamp() {
return timestamp;
}
public void setTimestamp(Date timestamp) {
this.timestamp = timestamp;
}
public String getAgvname() {
return agvname;
}
public void setAgvname(String agvname) {
this.agvname = agvname;
}
}

@ -1,6 +1,7 @@
package com.hw.wms.board.service;
import com.hw.wms.board.domain.WcsAgvStatus;
import com.hw.wms.domain.WmsProductInstock;
import com.hw.wms.domain.WmsProductOutstockDetail;
import com.hw.wms.domain.WmsProductStock;
@ -19,4 +20,6 @@ public interface FifthWmsBorderService {
BigDecimal locationPercentage();
List<WmsProductOutstockDetail> scheduleTask();
List<WcsAgvStatus> agvStatus();
}

@ -1,5 +1,6 @@
package com.hw.wms.board.service.impl;
import com.hw.wms.board.domain.WcsAgvStatus;
import com.hw.wms.board.service.FifthWmsBorderService;
import com.hw.wms.board.service.SecondWmsBorderService;
import com.hw.wms.domain.*;
@ -31,6 +32,11 @@ public class FifthWmsBoardServiceImpl implements FifthWmsBorderService {
private WmsBaseLocationMapper wmsBaseLocationMapper;
@Override
public List<WcsAgvStatus> agvStatus() {
return wmsRawStockMapper.agvStatus();
}
@Override
public List<WmsProductOutstockDetail> scheduleTask() {
return wmsProductOutstockMapper.scheduleTask();

@ -3,6 +3,7 @@ package com.hw.wms.mapper;
import java.math.BigDecimal;
import java.util.List;
import com.hw.wms.board.domain.WcsAgvStatus;
import com.hw.wms.domain.WmsRawStock;
import org.apache.ibatis.annotations.Param;
@ -128,4 +129,6 @@ public interface WmsRawStockMapper {
public List<WmsRawStock> selectAutoOutstockRawStockList(@Param("materialId") Long materialId, @Param("poNo") String poNo);
List<WmsRawStock> selectRawLocationPercentage();
List<WcsAgvStatus> agvStatus();
}

@ -383,6 +383,14 @@
group by
b.material_name
</select>
<select id="agvStatus" resultType="com.hw.wms.board.domain.WcsAgvStatus">
select
x.*
from
`hwjy-cloud`.wcs_agv_status x
where
x.agvName like concat('%','5楼','%')
</select>
</mapper>

Loading…
Cancel
Save