增加设备单元查询

gavel/src/main/java/com/gavel/qzsa/agv/dao/impl/AgvtaskqueueDaoImpl.java

@@ -22,7 +22,7 @@ public class AgvtaskqueueDaoImpl extends BaseDaoImpl implements AgvtaskqueueDao
         sqlMap.setPageNo(condition.getPageNo());
         sqlMap.setRowCount(condition.getPageSize());
         sqlMap.append("select AGVTASKQUEUE_ID, AGVTASKQUEUE_MSGTYPE, AGVTASKQUEUE_GUID, AGVTASKQUEUE_TASKTYPE, AGVTASKQUEUE_DESTTASK, ");
-        sqlMap.append("   AGVTASKQUEUE_NEXTTIME, AGVTASKQUEUE_ZT, AGVTASKQUEUE_WHSJ, AGVTASKQUEUE_CJSJ, AGVTASKQUEUE_SYSVERSION ");
+        sqlMap.append("   AGVTASKQUEUE_NEXTTIME, AGVTASKQUEUE_ZT, AGVTASKQUEUE_WHSJ, AGVTASKQUEUE_CJSJ, AGVTASKQUEUE_SYSVERSION,AGVTASKQUEUE_EQUIPID ");
         sqlMap.append("from AGVTASKQUEUE ");
         sqlMap.append("where 1 = 1 ");
         if (StringUtils.isNotEmpty(condition.getId())){
@@ -38,7 +38,7 @@ public class AgvtaskqueueDaoImpl extends BaseDaoImpl implements AgvtaskqueueDao
 	public Agvtaskqueue selectPop(String msgType) {
 		SqlMap sqlMap = new SqlMap();
         sqlMap.append("select top 1 AGVTASKQUEUE_ID, AGVTASKQUEUE_MSGTYPE, AGVTASKQUEUE_GUID, AGVTASKQUEUE_TASKTYPE, AGVTASKQUEUE_DESTTASK, ");
-        sqlMap.append("   AGVTASKQUEUE_NEXTTIME, AGVTASKQUEUE_ZT,  AGVTASKQUEUE_WHSJ, AGVTASKQUEUE_CJSJ, AGVTASKQUEUE_SYSVERSION,  ");
+        sqlMap.append("   AGVTASKQUEUE_NEXTTIME, AGVTASKQUEUE_ZT,  AGVTASKQUEUE_WHSJ, AGVTASKQUEUE_CJSJ, AGVTASKQUEUE_SYSVERSION, AGVTASKQUEUE_EQUIPID, ");
         sqlMap.append("  AGVTASKQUEUE_BODY");
         sqlMap.append("from AGVTASKQUEUE ");
         sqlMap.append("where AGVTASKQUEUE_ZT ='I' and AGVTASKQUEUE_NEXTTIME <= :AGVTASKQUEUE_NEXTTIME");
@@ -63,7 +63,7 @@ public class AgvtaskqueueDaoImpl extends BaseDaoImpl implements AgvtaskqueueDao
 	public Agvtaskqueue queryAgvtask(String GUID,String msgType) {
         SqlMap sqlMap = new SqlMap();
         sqlMap.append("select top 1 AGVTASKQUEUE_ID, AGVTASKQUEUE_MSGTYPE, AGVTASKQUEUE_GUID, AGVTASKQUEUE_TASKTYPE, AGVTASKQUEUE_DESTTASK, ");
-        sqlMap.append("   AGVTASKQUEUE_NEXTTIME, AGVTASKQUEUE_ZT,  AGVTASKQUEUE_WHSJ, AGVTASKQUEUE_CJSJ, AGVTASKQUEUE_SYSVERSION  ");
+        sqlMap.append("   AGVTASKQUEUE_NEXTTIME, AGVTASKQUEUE_ZT,  AGVTASKQUEUE_WHSJ, AGVTASKQUEUE_CJSJ, AGVTASKQUEUE_SYSVERSION ,AGVTASKQUEUE_EQUIPID ");
         sqlMap.append("from AGVTASKQUEUE ");
         sqlMap.append("where AGVTASKQUEUE_NEXTTIME <= :AGVTASKQUEUE_NEXTTIME");
         sqlMap.setParamValue("AGVTASKQUEUE_NEXTTIME", DateUtils.getDateTime());

gavel/src/main/java/com/gavel/qzsa/agv/persistent/Agvtaskqueue.java

@@ -23,6 +23,9 @@ public class Agvtaskqueue extends BaseEntity {
 	private String tasktype;
 	@FieldMeta(fieldName = "AGVTASKQUEUE_DESTTASK", caption = "目标任务")
 	private String desttask;
+	@FieldMeta(fieldName = "AGVTASKQUEUE_EQUIPID", caption = "设备单元")
+	private String EquipID;
+
 	@FieldMeta(fieldName = "AGVTASKQUEUE_ZT", caption = "状态")
 	private String zt;
 	@FieldMeta(fieldName = "AGVTASKQUEUE_NEXTTIME", caption = "下次执行时间")
@@ -123,6 +126,14 @@ public class Agvtaskqueue extends BaseEntity {
 	public void setBody(String body) {
 		this.body = body;
 	}
+
+	public String getEquipID() {
+		return EquipID;
+	}
+
+	public void setEquipID(String equipID) {
+		EquipID = equipID;
+	}
 }
 
 

gavel/src/main/java/com/gavel/qzsa/jcsj/service/impl/TemplateServiceImpl.java

@@ -255,7 +255,7 @@ public class TemplateServiceImpl extends BaseEditServiceImpl implements Template
                 //设备单元工位位置点
                 Gw gw = gwDao.findByDevice(equipID, templatedetail.getGwlx());
                 if (gw == null) {
-                    throwReturnMessage("无法获取设备%s的%s！", equipID, GwlxEnum.findNameById(templatedetail.getGwlx()));
+                    throwReturnMessage("无法获取设备单元%s的%s！", equipID, GwlxEnum.findNameById(templatedetail.getGwlx()));
                 }
                 position.setPositionCode(gw.getMapdatacode());
                 list.add(position);

gavel/src/main/resources/templates/views/agv/agvtaskqueue/index.html

@@ -35,6 +35,7 @@ $(function () {
 				{title: "GUID", field: "guid", fieldType: "ftString",width:140},
 				{title: "任务类型", field: "tasktype", fieldType: "ftString",width:120},
 				{title: "目标任务", field: "desttask", fieldType: "ftString",width:400},
+				{title: "设备单元号", field: "EquipID", fieldType: "ftString",width:400},
 				{title: "下次执行时间", field: "nexttime", fieldType:"datetime"},
 				{title: "创建时间", field: "cjsj", fieldType: "ftDateTime"},
 			]],