Youchain
/
ZhongWei_Old2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
暴炳林 2025-01-06 17:52:07 +08:00
parent 47b2c5ec23
commit 92322eeef7
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/dev/swms/server/model/base/LocationStorage.java
View File

@ -49,6 +49,7 @@ public class LocationStorage extends Entity{
private String workload;//已完成任务 private String workload;//已完成任务
private String gzzCode;//工作站编号 private String gzzCode;//工作站编号
private boolean beAuto;//是否自动下发
private String outLocation;//放料库位 private String outLocation;//放料库位
private String inLocation;//上料库位 private String inLocation;//上料库位
private int inLocationFlag=0;//AGV上料库位状态交互 private int inLocationFlag=0;//AGV上料库位状态交互
@ -80,6 +81,14 @@ public class LocationStorage extends Entity{
public boolean getBeAuto() {
return beAuto;
}
public void setBeAuto(boolean beAuto) {
this.beAuto = beAuto;
}
public String getAgvZone() { public String getAgvZone() {
return agvZone; return agvZone;
} }

1
src/main/java/com/dev/swms/server/model/base/locationStorage.hbm.xml
View File

@ -62,5 +62,6 @@
<property name="dimension" column="DIMENSION" type="double" /> <property name="dimension" column="DIMENSION" type="double" />
<property name="connectionPort" column="connection_Port" type="string" length="50" /> <property name="connectionPort" column="connection_Port" type="string" length="50" />
<property name="agvZone" column="agv_Zone" type="string" length="50" /> <property name="agvZone" column="agv_Zone" type="string" length="50" />
<property name="beAuto" column="be_auto" type="boolean" length="50" />
</class> </class>
</hibernate-mapping> </hibernate-mapping>

4
src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStoragePage.xml
View File

@ -80,6 +80,7 @@
ls.gzzCode, ls.gzzCode,
ls.connectionPort, ls.connectionPort,
ls.agvZone, ls.agvZone,
ls.beAuto,
ls.disabled ls.disabled
from LocationStorage as ls from LocationStorage as ls
left join ls.warehouseArea as warehouseArea left join ls.warehouseArea as warehouseArea
@ -135,6 +136,9 @@
<column id="ls.gzzCode" title="工作站编号" visible="true" horizonAlign="center" /> <column id="ls.gzzCode" title="工作站编号" visible="true" horizonAlign="center" />
<column id="ls.connectionPort" title="到站编号" visible="true" horizonAlign="center" /> <column id="ls.connectionPort" title="到站编号" visible="true" horizonAlign="center" />
<column id="ls.agvZone" title="AGV库区" visible="true" horizonAlign="center" /> <column id="ls.agvZone" title="AGV库区" visible="true" horizonAlign="center" />
<column id="ls.beAuto" title="自动下发" visible="true"
horizonAlign="center" verticalAlign="middle" format="booleanFormat"
formatParam="beAuto" />
<column id="ls.disabled" title="是否失效" visible="true" <column id="ls.disabled" title="是否失效" visible="true"
horizonAlign="center" verticalAlign="middle" format="booleanFormat" horizonAlign="center" verticalAlign="middle" format="booleanFormat"
formatParam="disabled" /> formatParam="disabled" />