From 42d37ce9f59c15801cde7d63a439156934978bb4 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 30 八月 2024 11:41:24 +0800
Subject: [PATCH] 8.26-8.29售后维护升级 1.增加逻辑：料架退回二次接力后，当仓储车准备送回库内时先查询此料架是否有其他线需要使用，有则直接从当前上片位送至下一上片位（省去中间退库，再从库内送至下一上片位的动作） 2.增加逻辑：当派尔开工下发任务料架顺序为，2，4，2类型时，上片机吸完2号架后退回二次接力但不能退库，等待4号架吸片完成退回二次接力后，2号架再从二次接力推进上片位然后亮灯（此时料架任务自动切换成下第二个2号架任务） 3.增加页面弹窗：仓储待执行任务 4.增加汇报逻辑：除原先仓储完成后汇报派尔料架已回库外，另外增加检索只要北玻系统完成但派尔未确认的都进行汇报直至派尔确认 5.修改页面查询：已完成任务仅查询一百条 6.定期删除完成数据
---
江苏皓晶项目/Haojing/src/main/java/com/northglass/service/device/DeviceService.java | 282 ++-
江苏皓晶项目/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/loadtask/loadTask.jsp | 190 ++
江苏皓晶项目/Haojing/src/main/java/com/northglass/web/alltasks/tasksController.java | 60
江苏皓晶项目/Haojing/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst | 148 +
江苏皓晶项目/Haojing/src/main/java/com/northglass/entity/OutTasks.java | 20
江苏皓晶项目/Haojing/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties | 6
江苏皓晶项目/Haojing/src/main/webapp/WEB-INF/views/loadtask/loadTask.jsp | 190 ++
江苏皓晶项目/Haojing/src/main/java/com/northglass/web/configuration/ConfigController.java | 96 +
江苏皓晶项目/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/loadtask/loadMachine.jsp | 391 +++++
江苏皓晶项目/Haojing/src/main/java/com/northglass/web/manage/CutManageController.java | 9
江苏皓晶项目/Haojing/src/main/java/com/northglass/web/alltasks/loadTaskController.java | 220 ++
江苏皓晶项目/Haojing/src/main/webapp/WEB-INF/views/configuration/manualOperation.jsp | 325 ++++
江苏皓晶项目/Haojing/src/main/webapp/WEB-INF/views/configuration/taskInfos.jsp | 325 ++++
江苏皓晶项目/Haojing/src/main/webapp/WEB-INF/views/configuration/minche.jsp | 114 +
江苏皓晶项目/Haojing/src/main/java/com/northglass/repository/LoadRackDao.java | 3
江苏皓晶项目/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/taskInfos.jsp | 325 ++++
江苏皓晶项目/Haojing/src/main/java/com/northglass/service/TelecomsService/TelecomsService.java | 1
江苏皓晶项目/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/manualOperation.jsp | 325 ++++
江苏皓晶项目/Haojing/target/maven-archiver/pom.properties | 2
江苏皓晶项目/Haojing/.project | 2
江苏皓晶项目/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/alltasks/tasks2.jsp | 227 +++
江苏皓晶项目/Haojing/src/main/java/com/northglass/service/task/LoadTaskService.java | 153 ++
江苏皓晶项目/Haojing/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst | 4
江苏皓晶项目/Haojing/src/main/java/com/northglass/repository/OutTasksDao.java | 27
江苏皓晶项目/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/layouts/left.jsp | 27
江苏皓晶项目/Haojing/src/main/webapp/WEB-INF/layouts/left.jsp | 27
江苏皓晶项目/Haojing/src/main/java/com/northglass/service/message/MessageProcessor.java | 242 ++
江苏皓晶项目/Haojing/src/main/webapp/WEB-INF/views/loadtask/loadMachine.jsp | 391 +++++
江苏皓晶项目/Haojing/src/main/webapp/WEB-INF/views/alltasks/tasks2.jsp | 227 +++
江苏皓晶项目/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/minche.jsp | 114 +
30 files changed, 4,161 insertions(+), 312 deletions(-)
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/.project" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/.project"
index eda187f..a54c954 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/.project"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/.project"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>Haojing</name>
+ <name>Haojing7-20</name>
<comment></comment>
<projects>
</projects>
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/entity/OutTasks.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/entity/OutTasks.java"
index 9b365aa..9d35007 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/entity/OutTasks.java"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/entity/OutTasks.java"
@@ -7,6 +7,7 @@
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import javax.persistence.Transient;
@Entity
@Table(name="gmms_out_tasks")
@@ -40,6 +41,7 @@
private String infoContent;
private String rackNumber;
private Long taskIds;
+ private int priority;
public OutTasks() {
}
@@ -87,6 +89,12 @@
this.thickness=thickness;
this.pkgNum=pkgNum;
this.stockThickness=stockThickness;
+ }
+ public int getPriority() {
+ return priority;
+ }
+ public void setPriority(int priority) {
+ this.priority = priority;
}
public Long getTaskIds() {
return taskIds;
@@ -270,6 +278,16 @@
public void setStockThickness(double stockThickness) {
this.stockThickness = stockThickness;
}
-
+
+ public void Finsh() {
+ this.infoContent="";
+ this.workStatus="";
+ this.machineStatus="浠诲姟瀹屾垚";
+ }
+
+ /*@Transient
+ public void LoadFinsh() {
+ this.stockThickness = stockThickness;
+ }*/
}
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/repository/LoadRackDao.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/repository/LoadRackDao.java"
index f890109..62bbd5f 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/repository/LoadRackDao.java"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/repository/LoadRackDao.java"
@@ -9,6 +9,9 @@
public interface LoadRackDao extends JpaRepository<LoadRack, Long>{
+ @Query("select t from LoadRack t where t.machineLoad!=null and t.rackName=?1")
+ public List<LoadRack> findRackName(String rackName);
+
//鏌ユ壘 涓婄墖宸ヤ綅
@Query("select t from LoadRack t where t.machineLoad!=null")
public List<LoadRack> findLoads();
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/repository/OutTasksDao.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/repository/OutTasksDao.java"
index dc01199..9777554 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/repository/OutTasksDao.java"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/repository/OutTasksDao.java"
@@ -3,10 +3,21 @@
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import com.northglass.entity.OutTasks;
public interface OutTasksDao extends JpaRepository<OutTasks, Long>{
+
+ //鏌ヨ 鏈�缁堜换鍔＄姸鎬�
+ @Query("select t from OutTasks t order by t.taskIds desc")
+ public List<OutTasks> FindAll100();
+
+ @Query("select t from OutTasks t where t.mesStatus=?1 and t.destination=?2 order by t.taskIds asc")
+ public List<OutTasks> FindTaskLine(String mesStatus,String destination);
+
+ @Query("select t from OutTasks t where t.mesStatus!=?1 and t.destination=?2 order by t.taskIds asc")
+ public List<OutTasks> FindNotTaskLine(String mesStatus,String destination);
//鏌ヨ 鏈�缁堜换鍔＄姸鎬�
@Query("select t from OutTasks t where t.mesStatus=?1 order by t.finshTime desc")
@@ -57,11 +68,15 @@
public List<OutTasks> FindOutTasksTaskIds(String taskid);
//鏌ヨ machineStatus, workStatus , flag 鏈哄櫒锛屽伐浣滅姸鎬侊紝浠诲姟鐘舵��
- @Query("select t from OutTasks t where t.machineStatus=?1 and t.workStatus=?2 and t.flag=?3 order by t.taskIds asc")
+ @Query("select t from OutTasks t where t.machineStatus=?1 and t.workStatus=?2 and t.flag=?3 order by t.priority desc,t.taskIds asc")
public List<OutTasks> FindMachineStatusWorkStatus(String machineStatus,String workStatus,String flag);
+ //鏌ヨ 鏈畬鎴愪换鍔�
+ @Query("select t from OutTasks t where t.machineStatus!='浠诲姟瀹屾垚' and t.flag='姝ｅ父' order by t.priority desc,t.taskIds asc")
+ public List<OutTasks> findWaitTask();
+
//鏌ヨ machineStatus1,machineStatus2 workStatus
- @Query("select t from OutTasks t where (t.machineStatus=?1 or t.machineStatus=?2) and t.workStatus=?3 and t.flag=?4")
+ @Query("select t from OutTasks t where (t.machineStatus=?1 or t.machineStatus=?2) and t.workStatus=?3 and t.flag=?4 order by t.taskIds asc")
public List<OutTasks> FindMachineStatusWorkStatus(String machineStatus1,String machineStatus2,String workStatus,String flag);
@@ -69,4 +84,12 @@
@Query("select t from OutTasks t where t.taskType=?1 and t.machineStatus=?2 and t.workStatus=?3")
public List<OutTasks> FindTaskTypeTasking(String taskType,String machineStatus,String workStatus);
+ //鏌ヨ姝ゆ枡鏋� 鏈紑濮嬬殑浠诲姟
+ @Query("select t from OutTasks t where t.stockName=?1 and t.machineStatus='绛夊緟寮�濮�' and t.workStatus='绛夊緟涓�' order by t.taskIds asc")
+ public List<OutTasks> FindStockName(String stockName);
+
+ //鏌ヨ姝ょ洰鐨勫湴鐨� 鏈畬鎴愮殑浠诲姟
+ @Query("select t from OutTasks t where t.destination=?1 and t.machineStatus='绛夊緟寮�濮�' and t.workStatus='绛夊緟涓�' order by t.taskIds asc")
+ public List<OutTasks> FindDestination(String destination);
+
}
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/TelecomsService/TelecomsService.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/TelecomsService/TelecomsService.java"
index 0efa237..c38fb84 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/TelecomsService/TelecomsService.java"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/TelecomsService/TelecomsService.java"
@@ -53,6 +53,7 @@
private MessageProcessor processor;
private static final Logger LOGGER = LoggerFactory.getLogger(TelecomsService.class);
+ public static JSONObject jsonObj = new JSONObject();
public void connect(Telecoms telecoms) {
try {
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/device/DeviceService.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/device/DeviceService.java"
index 398f23f..463475b 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/device/DeviceService.java"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/device/DeviceService.java"
@@ -14,6 +14,9 @@
import java.net.URL;
import java.net.URLConnection;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -64,24 +67,28 @@
@Autowired
private OutTasksDao outTasksDao;
- public void CeshiMainche() {
+
+// public static Map<String,OutTasks> jsonArrayStatic;
+
+ public void testMainche() {
//List<Machine> Machine=machineDao.SelectMinchineFlag("1");
- Telecoms telecoms=telecomsDao.findOne(10L);
- String str="000000000000000000";
+ Telecoms telecoms=telecomsDao.findOne(1L);
+ String str="000100000000000000";
for(int i=0;i<45;i++){
- if(i==19){
- str+=HexUtil.intBinaryTo16("0000100000000000");
- continue;
- }
- if(i==34){
- str+=HexUtil.intBinaryTo16("0000100000000000");
- continue;
- }/*
- if(i==2||i==12){
- str+="0002";
+// if(i==19){
+// str+=HexUtil.intBinaryTo16("0000100000000000");
+// continue;
+// }
+// if(i==34){
+// str+=HexUtil.intBinaryTo16("0000100000000000");
+// continue;
+// }
+
+ if(i==5||i==9999){
+ str+="0001";
}else{
str+="0000";
- }*/
+ }
}
String strss=MessageProcessor.generateReturnMessage(str,telecoms);
if(strss.length()>26){
@@ -91,19 +98,30 @@
}
}
- public void connect() {
- //CeshiMainche();
+ public void connect() {
+ //testMainche();
+// ApiHttp ApiHttp= new ApiHttp("192.168.10.127",1);
+// ApiHttp.handle();
+
+
+//
+// Telecoms telecoms=telecomsDao.findOne(10L);
+// TaskChange(telecoms);
+// Telecoms telecoms=telecomsDao.findOne(1L);
+// telecomsService.connect(telecoms);
List<Telecoms> telecoms=telecomsDao.findAll();
for(Telecoms Telecom:telecoms){
telecomsService.connect(Telecom);
}
-
-
+// Telecoms telecoms=telecomsDao.findOne(10L);
+// String TasksStr=task(telecoms);
+// System.out.println(TasksStr);
}
//浠诲姟棰嗗彇浠ュ強姹囨姤
public void TaskChange(Telecoms telecoms){
- try {
+ try {
String TasksStr=task(telecoms);
+ //String TasksStr=new String(Files.readAllBytes(Paths.get("D:\\haojingconfig\\json-format.json")),StandardCharsets.UTF_8);;
if(TasksStr==""||TasksStr==null){
if(!"绂荤嚎".equals(telecoms.getConnState())){
telecoms.setConnState("绂荤嚎");
@@ -126,70 +144,90 @@
}
String Chexiao="";
WriteFile("D:","棰嗗彇浠诲姟",df.format(new Date())+"\r浠诲姟鎯呭喌:"+content,false);
+ //System.out.println(content);
+ String cancelText[]=telecoms.getInterprets().split(",");
+ List cancelList=new ArrayList<>();
+ for(String item:cancelText){
+ cancelList.add(item);
+ }
for(int j=0;j<jsonArray.size();j++){//鎵惧埌鏄惁鏈夋鐩殑鍦扮殑琛ョ墖浠诲姟
String Taskid=jsonArray.getJSONObject(j).get("TaskId").toString();
List<OutTasks> OutTaskss=outTasksDao.FindOutTasksTaskIds(Taskid);
+ //DeviceService.jsonArrayStatic.put(OutTasksadd.getTaskId(),OutTasksadd);
if(OutTaskss.isEmpty()){
- //鐩存帴娣诲姞
- OutTasks OutTasks=new OutTasks();
- OutTasks.setTaskId(jsonArray.getJSONObject(j).get("TaskId").toString());
- OutTasks.setTaskType(jsonArray.getJSONObject(j).get("TaskTypeName").toString());
- OutTasks.setMesStatus("null".equals(jsonArray.getJSONObject(j).get("MESStatusName").toString())?"0":jsonArray.getJSONObject(j).get("MESStatusName").toString());
- OutTasks.setMachineStatus("null".equals(jsonArray.getJSONObject(j).get("MachineStatusName").toString())?"0":jsonArray.getJSONObject(j).get("MachineStatusName").toString());
- OutTasks.setWorkStatus("绛夊緟涓�");
- OutTasks.setPkgId(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PkgId").toString())?"0":jsonArray.getJSONObject(j).get("PkgId").toString()));
- OutTasks.setStockName("null".equals(jsonArray.getJSONObject(j).get("StockName").toString())?"0":jsonArray.getJSONObject(j).get("StockName").toString());
- OutTasks.setDestination("null".equals(jsonArray.getJSONObject(j).get("Destination").toString())?"0":jsonArray.getJSONObject(j).get("Destination").toString());
- OutTasks.setPlanLoadNum1(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PlanLoadNum1").toString())?"0":jsonArray.getJSONObject(j).get("PlanLoadNum1").toString()));
- OutTasks.setPlanLoadNum2(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PlanLoadNum2").toString())?"0":jsonArray.getJSONObject(j).get("PlanLoadNum2").toString()));
- OutTasks.setPlanLoadNum3(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PlanLoadNum3").toString())?"0":jsonArray.getJSONObject(j).get("PlanLoadNum3").toString()));
- OutTasks.setStockNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("StockNum").toString())?"0":jsonArray.getJSONObject(j).get("StockNum").toString()));
- OutTasks.setLoadeNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("LoadedNum").toString())?"0":jsonArray.getJSONObject(j).get("LoadedNum").toString()));
- OutTasks.setNewPkgId(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("NewPkgId").toString())?"0":jsonArray.getJSONObject(j).get("NewPkgId").toString()));
- OutTasks.setNewPkgNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("NewPkgNum").toString())?"0":jsonArray.getJSONObject(j).get("NewPkgNum").toString()));
- OutTasks.setBb(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("BB").toString())?"0":jsonArray.getJSONObject(j).get("BB").toString()));
- OutTasks.setHh(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("HH").toString())?"0":jsonArray.getJSONObject(j).get("HH").toString()));
- OutTasks.setColor("null".equals(jsonArray.getJSONObject(j).get("Color").toString())?"0":jsonArray.getJSONObject(j).get("Color").toString());
- OutTasks.setThickness(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("Thickness").toString())?"0":jsonArray.getJSONObject(j).get("Thickness").toString()));
- OutTasks.setPkgNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PkgNum").toString())?"0":jsonArray.getJSONObject(j).get("PkgNum").toString()));
- OutTasks.setStockThickness(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("StockThickness").toString())?"0":jsonArray.getJSONObject(j).get("StockThickness").toString()));
- OutTasks.setTaskIds(Long.valueOf(jsonArray.getJSONObject(j).get("TaskId").toString()));
- OutTasks.setPosunCount(0);
- OutTasks.setRackNumber("");
- OutTasks.setInfoContent("");
- OutTasks.setStartTime(new Date());
- OutTasks.setFinshTime(new Date());
- OutTasks.setFlag("姝ｅ父");
- OutTasks.setLoadTime(new Date());
- outTasksDao.save(OutTasks);
- System.out.println("棰嗗彇浠诲姟锛�"+jsonArray.getJSONObject(j).get("TaskId").toString());
+ //鐩存帴娣诲姞
+ OutTasks OutTasksadd=new OutTasks();
+ OutTasksadd.setTaskId(jsonArray.getJSONObject(j).get("TaskId").toString());
+ OutTasksadd.setTaskType(jsonArray.getJSONObject(j).get("TaskTypeName").toString());
+ OutTasksadd.setMesStatus("null".equals(jsonArray.getJSONObject(j).get("MESStatusName").toString())?"0":jsonArray.getJSONObject(j).get("MESStatusName").toString());
+ OutTasksadd.setMachineStatus("null".equals(jsonArray.getJSONObject(j).get("MachineStatusName").toString())?"0":jsonArray.getJSONObject(j).get("MachineStatusName").toString());
+ OutTasksadd.setWorkStatus("绛夊緟涓�");
+ OutTasksadd.setPkgId(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PkgId").toString())?"0":jsonArray.getJSONObject(j).get("PkgId").toString()));
+ OutTasksadd.setStockName("null".equals(jsonArray.getJSONObject(j).get("StockName").toString())?"0":jsonArray.getJSONObject(j).get("StockName").toString());
+ OutTasksadd.setDestination("null".equals(jsonArray.getJSONObject(j).get("Destination").toString())?"0":jsonArray.getJSONObject(j).get("Destination").toString());
+ OutTasksadd.setPlanLoadNum1(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PlanLoadNum1").toString())?"0":jsonArray.getJSONObject(j).get("PlanLoadNum1").toString()));
+ OutTasksadd.setPlanLoadNum2(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PlanLoadNum2").toString())?"0":jsonArray.getJSONObject(j).get("PlanLoadNum2").toString()));
+ OutTasksadd.setPlanLoadNum3(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PlanLoadNum3").toString())?"0":jsonArray.getJSONObject(j).get("PlanLoadNum3").toString()));
+ OutTasksadd.setStockNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("StockNum").toString())?"0":jsonArray.getJSONObject(j).get("StockNum").toString()));
+ OutTasksadd.setLoadeNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("LoadedNum").toString())?"0":jsonArray.getJSONObject(j).get("LoadedNum").toString()));
+ OutTasksadd.setNewPkgId(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("NewPkgId").toString())?"0":jsonArray.getJSONObject(j).get("NewPkgId").toString()));
+ OutTasksadd.setNewPkgNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("NewPkgNum").toString())?"0":jsonArray.getJSONObject(j).get("NewPkgNum").toString()));
+ OutTasksadd.setBb(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("BB").toString())?"0":jsonArray.getJSONObject(j).get("BB").toString()));
+ OutTasksadd.setHh(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("HH").toString())?"0":jsonArray.getJSONObject(j).get("HH").toString()));
+ OutTasksadd.setColor("null".equals(jsonArray.getJSONObject(j).get("Color").toString())?"0":jsonArray.getJSONObject(j).get("Color").toString());
+ OutTasksadd.setThickness(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("Thickness").toString())?"0":jsonArray.getJSONObject(j).get("Thickness").toString()));
+ OutTasksadd.setPkgNum(Integer.valueOf("null".equals(jsonArray.getJSONObject(j).get("PkgNum").toString())?"0":jsonArray.getJSONObject(j).get("PkgNum").toString()));
+ OutTasksadd.setStockThickness(Double.valueOf("null".equals(jsonArray.getJSONObject(j).get("StockThickness").toString())?"0":jsonArray.getJSONObject(j).get("StockThickness").toString()));
+ OutTasksadd.setTaskIds(Long.valueOf(jsonArray.getJSONObject(j).get("TaskId").toString()));
+ OutTasksadd.setPosunCount(0);
+ OutTasksadd.setRackNumber("");
+ OutTasksadd.setInfoContent("");
+ OutTasksadd.setStartTime(new Date());
+ OutTasksadd.setFinshTime(new Date());
+ OutTasksadd.setFlag("姝ｅ父");
+ OutTasksadd.setLoadTime(new Date());
+ if("鍦ㄧ嚎搴撳埌涓婄墖鍙帮紙琛ョ墖锛�".equals(OutTasksadd.getTaskType())){
+ OutTasksadd.setPriority(1001);
+ }else{
+ OutTasksadd.setPriority(1000);
+ }
+ outTasksDao.save(OutTasksadd);
+ System.out.println("棰嗗彇浠诲姟锛歔 "+jsonArray.getJSONObject(j).get("TaskId").toString()+" ]");
}else if(OutTaskss.size()==1){
String MESStatusName="null".equals(jsonArray.getJSONObject(j).get("MESStatusName").toString())?"0":jsonArray.getJSONObject(j).get("MESStatusName").toString();
OutTasks OutTasks=OutTaskss.get(0);
- if("鎾ら攢浠诲姟".equals(MESStatusName))
+ if("鎾ら攢浠诲姟".equals(MESStatusName)&&!cancelList.contains(OutTasks.getTaskId()))
{ //鎾ら攢浠诲姟
Chexiao+=OutTasks.getTaskId()+",";
+// OutTasks.setMesStatus("鎾ら攢浠诲姟");
+// outTasksDao.save(OutTasks);
+ System.out.println("鎾ら攢浠诲姟锛歔 "+jsonArray.getJSONObject(j).get("TaskId").toString()+" ]");
+ }else if(!"娲惧皵纭浠诲姟瀹屾垚".equals(OutTasks.getMesStatus())&&"浠诲姟瀹屾垚".equals(OutTasks.getMachineStatus())){
+ boolean isFinsh=PaiFinsh(telecoms,OutTasks,"娲惧皵纭浠诲姟瀹屾垚","姹囨姤娲惧皵閫�搴撳畬鎴愬け璐ワ紒","5");
+ System.out.println("浠诲姟id:["+OutTasks.getTaskId()+"]鑷姩绾犳姹囨姤浠诲姟閫�鍥炲湪绾垮簱锛�"+(isFinsh==true?"鎴愬姛!":"澶辫触!"));
}
}
}
telecoms.setInterprets(Chexiao);
telecomsDao.save(telecoms);
+ List list=new ArrayList<>();
+ String s[]=Chexiao.split(",");
+ for(String item:s){
+ list.add(item);
+ }
List<OutTasks> OutTasksAll=outTasksDao.FindNoMesStatus("娲惧皵纭浠诲姟瀹屾垚");
try {
for(OutTasks OutTask:OutTasksAll){
if("涓婄墖浠诲姟宸插紑濮�".equals(OutTask.getMesStatus())&&
"閾佹灦宸插埌涓婄墖浣�".equals(OutTask.getMachineStatus()))
{
- List list=new ArrayList<>();
- String s[]=Chexiao.split(",");
- for(String item:s){
- list.add(item);
- }
+
if(list.contains(OutTask.getTaskId())){
//姝や换鍔″凡鎾ら攢
OutTask.setMesStatus("涓婄墖瀹屾垚鍙��鍥�");
OutTask.setMachineStatus("涓婄墖瀹屾垚璇锋眰閫�鍥�");
outTasksDao.save(OutTask);
+ System.out.println("浠诲姟id:["+OutTask.getTaskId()+"] 鍒拌揪涓婄墖浣� 姝や换鍔″凡鎾ら攢");
}else{
boolean isFinsh=PaiFinsh(telecoms,OutTask,"娲惧皵纭閾佹灦宸插埌浣�","姹囨姤娲惧皵閾佹灦宸插埌浣嶅け璐ワ紒","3");
//涓婄墖浠诲姟鍒颁綅姹囨姤娲惧皵鍒颁綅 閾佹灦宸插埌浣�-3
@@ -205,7 +243,8 @@
break;
}
}
- }
+ }
+
}
}
else if("涓婄墖浠诲姟宸插紑濮�".equals(OutTask.getMesStatus())&&
@@ -236,8 +275,8 @@
}
else if("涓婄墖瀹屾垚鍙��鍥�".equals(OutTask.getMesStatus())&&
"涓婄墖瀹屾垚璇锋眰閫�鍥�".equals(OutTask.getMachineStatus()))
- {
- //涓婄墖娲惧皵纭閫�鍥� //楠岃瘉鏈夋病鏈夎ˉ鐗囦换鍔�
+ {
+ //涓婄墖娲惧皵纭閫�鍥� //楠岃瘉鏈夋病鏈夎ˉ鐗囦换鍔�
if(isPosunTaskLoad(OutTask,TasksStr)){
//鏈夎ˉ鐗囦换鍔�,鏆傚仠鏈哄櫒绛夊緟琛ョ墖
List<Machine> machines=machineDao.FindNumber(OutTask.getDestination());
@@ -252,34 +291,47 @@
outTasksDao.save(OutTask);
break;
}
- }else{
+ }else{
+ // 姝ょ嚎璺笅涓�浠诲姟鏄惁杩樻槸姝ゆ枡鏋� 姝ょ嚎璺湭瀹屾垚鐨勪换鍔★細OutTasksSameStokess
List<OutTasks> OutTasksSameStokess=outTasksDao.FindDestinationNoFinshTaskIdOderbyASC(OutTask.getDestination(),OutTask.getTaskId(),"浠诲姟瀹屾垚");
- for(OutTasks outTask:OutTasksSameStokess){
+ if(!OutTasksSameStokess.isEmpty()){
+ OutTasks outTask=OutTasksSameStokess.get(0);
if(outTask.getStockName().equals(OutTask.getStockName())){
outTask.setMachineStatus("閾佹灦宸插埌涓婄墖浣�");
outTask.setInfoContent("");
- outTasksDao.save(OutTask);
+ outTasksDao.save(outTask);
+ System.out.println("姝や换鍔′笌涓嬩竴浠诲姟鏂欐灦鐩稿悓锛�"+OutTask.getId()+"----1");
+ //鎵惧埌褰撳墠浠诲姟鎵�鍦ㄦ枡鏋�
+ List<LoadRack> loadRacks=loadRackDao.findOutTasksId(OutTask.getId());
+ if(loadRacks.size()==1){
+
+ LoadRack loadRack=loadRacks.get(0);
+ loadRack.getOutTasks().setWorkStatus("");
+ loadRack.getOutTasks().setMesStatus("娲惧皵纭鍙��鍥�");
+ loadRack.getOutTasks().setInfoContent("");
+ loadRack.getOutTasks().setMachineStatus("浠诲姟瀹屾垚");
+ loadRackDao.save(loadRack);
+ loadRack.setOutTasks(outTask);
+ loadRack.getMachineLoad().setWorkState("绛夊緟涓�");
+ loadRackDao.save(loadRack);
+ System.out.println("姝や换鍔′笌涓嬩竴浠诲姟鏂欐灦鐩稿悓锛�"+OutTask.getId()+"----2");
+ }else{
+ System.out.println("鍚屾枡鏋跺瓨鍦ㄥ涓伐浣嶄笂锛�"+OutTask.getId());
+ }
}else{
- break;
- }
- }
- //娌℃湁琛ョ墖浠诲姟,鏌ョ湅鏈夋病鏈夋鏂欐灦闄ゆ浠诲姟 宸插埌浣嶇殑浠诲姟
- List<OutTasks> OutTasksSameStoke=outTasksDao.FindDestinationNoTaskIdstockName(OutTask.getDestination(),OutTask.getTaskId(),"閾佹灦宸插埌涓婄墖浣�",OutTask.getStockName());
- if(!OutTasksSameStoke.isEmpty()){
- List<LoadRack> loadRacks=loadRackDao.findOutTasksId(OutTask.getId());
- if(loadRacks.size()==1){
- LoadRack loadRack=loadRacks.get(0);
- loadRack.getOutTasks().setWorkStatus("");
- loadRack.getOutTasks().setMesStatus("娲惧皵纭鍙��鍥�");
- loadRack.getOutTasks().setInfoContent("");
- loadRack.getOutTasks().setMachineStatus("浠诲姟瀹屾垚");
- loadRackDao.save(loadRack);
- loadRack.setOutTasks(OutTasksSameStoke.get(0));
- loadRack.getMachineLoad().setWorkState("绛夊緟涓�");
- loadRackDao.save(loadRack);
-
- }else{
- System.out.println(OutTask.getId()+":1");
+ List<LoadRack> loadRacks=loadRackDao.findOutTasksId(OutTask.getId());
+ if(loadRacks.size()==1){
+ LoadRack loadRack=loadRacks.get(0);
+ loadRack.getOutTasks().setMesStatus("娲惧皵纭鍙��鍥�");
+ loadRack.getOutTasks().setInfoContent("");
+ loadRack.getOutTasks().setMachineStatus("閾佹灦閫�鍥炰簩娆℃帴鍔�");
+ loadRack.getOutTasks().setWorkStatus("绛夊緟涓�");
+ loadRack.getMachineLoad().setWorkState("绛夊緟涓�");
+ loadRackDao.save(loadRack);
+ System.out.println("姝や换鍔′笌涓嬩竴浠诲姟鏂欐灦涓嶇浉鍚岋細"+OutTask.getId()+"----3");
+ }else{
+ System.out.println("姝ゆ枡鏋朵笉瀛樺湪鏌愬伐浣嶏細"+OutTask.getId());
+ }
}
}else{
List<LoadRack> loadRacks=loadRackDao.findOutTasksId(OutTask.getId());
@@ -291,8 +343,9 @@
loadRack.getOutTasks().setWorkStatus("绛夊緟涓�");
loadRack.getMachineLoad().setWorkState("绛夊緟涓�");
loadRackDao.save(loadRack);
+ System.out.println("姝や换鍔′负褰撳墠绾胯矾鏈�鍚庝竴涓换鍔★細"+OutTask.getId()+"----4");
}else{
- System.out.println(OutTask.getId()+":2");
+ System.out.println("姝ゆ枡鏋朵笉瀛樺湪鏌愬伐浣嶏細"+OutTask.getId());
}
}
@@ -302,41 +355,35 @@
"閾佹灦宸插埌鍚婅浣�".equals(OutTask.getMachineStatus()))
{
- boolean abc=false;
+ boolean isExecute=false;
for(int i=0;i<jsonArray.size();i++){
if(OutTask.getTaskId().equals(jsonArray.getJSONObject(i).get("TaskId").toString())&&
"宸ヤ汉宸插皢鐜荤拑鍚婅鍒板叆鏂欏彛閾佹灦涓�".equals(jsonArray.getJSONObject(i).get("MESStatusName").toString())){
- abc=true;
+ isExecute=true;
System.out.println("浠诲姟id:["+OutTask.getTaskId()+"]娲惧皵鍚婅鍏佽閫�鍥�!");
}else if(OutTask.getTaskId().equals(jsonArray.getJSONObject(i).get("TaskId").toString())&&
"鎾ら攢浠诲姟".equals(jsonArray.getJSONObject(i).get("MESStatusName").toString())){
- abc=true;
+ isExecute=true;
System.out.println("浠诲姟id:["+OutTask.getTaskId()+"]娲惧皵鍚婅鎾ら攢浠诲姟閫�鍥�!");
}
}
- if(abc){
+ if(isExecute){
OutTask.setMesStatus("娲惧皵纭鍙��鍥�");
OutTask.setMachineStatus("绛夊緟閫�鍥炲簱鍖�");
outTasksDao.save(OutTask);
}
}
- else if("娲惧皵纭鍙��鍥�".equals(OutTask.getMesStatus())&&
- "浠诲姟瀹屾垚".equals(OutTask.getMachineStatus()))
+ else if(list.contains(OutTask.getTaskId())&&"浠诲姟瀹屾垚".equals(OutTask.getMachineStatus()))
+ {
+ //姝や换鍔″凡鎾ら攢 "9"
+ boolean isFinsh=PaiFinsh(telecoms,OutTask,"娲惧皵纭浠诲姟瀹屾垚","姹囨姤娲惧皵閫�搴撳畬鎴愬け璐ワ紒","9");
+ System.out.println("鎾ら攢浠诲姟id:["+OutTask.getTaskId()+"]姹囨姤浠诲姟閫�鍥炲湪绾垮簱锛�"+(isFinsh==true?"鎴愬姛!":"澶辫触!"));
+ }
+ else if(!"娲惧皵纭浠诲姟瀹屾垚".equals(OutTask.getMesStatus())&&"浠诲姟瀹屾垚".equals(OutTask.getMachineStatus()))
{
- //浠诲姟瀹屾垚姹囨姤娲惧皵 閫�鍥炲簱鍖�-5
- List list=new ArrayList<>();
- String s[]=Chexiao.split(",");
- for(String item:s){
- list.add(item);
- }
- if(list.contains(OutTask.getTaskId())){
- //姝や换鍔″凡鎾ら攢
- boolean isFinsh=PaiFinsh(telecoms,OutTask,"娲惧皵纭浠诲姟瀹屾垚","姹囨姤娲惧皵閫�搴撳畬鎴愬け璐ワ紒","9");
- System.out.println("浠诲姟id:["+OutTask.getTaskId()+"]姹囨姤浠诲姟閫�鍥炲湪绾垮簱锛�"+(isFinsh==true?"鎴愬姛!":"澶辫触!"));
- }else{
- boolean isFinsh=PaiFinsh(telecoms,OutTask,"娲惧皵纭浠诲姟瀹屾垚","姹囨姤娲惧皵閫�搴撳畬鎴愬け璐ワ紒","5");
- System.out.println("浠诲姟id:["+OutTask.getTaskId()+"]姹囨姤浠诲姟閫�鍥炲湪绾垮簱锛�"+(isFinsh==true?"鎴愬姛!":"澶辫触!"));
- }
+ //浠诲姟瀹屾垚姹囨姤娲惧皵 閫�鍥炲簱鍖�-5
+ boolean isFinsh=PaiFinsh(telecoms,OutTask,"娲惧皵纭浠诲姟瀹屾垚","姹囨姤娲惧皵閫�搴撳畬鎴愬け璐ワ紒","5");
+ System.out.println("浠诲姟id:["+OutTask.getTaskId()+"]姹囨姤浠诲姟閫�鍥炲湪绾垮簱锛�"+(isFinsh==true?"鎴愬姛!":"澶辫触!"));
}
}
} catch (Exception e) {
@@ -444,8 +491,31 @@
System.out.println("姹囨姤寮傚父锛侊紒288");
return false;
}
-
}
+// // 姹囨姤浠诲姟 姹囨姤鎴愬姛杩斿洖true 浠诲姟锛屾眹鎶ユ爣蹇楋紝閿欒淇℃伅锛屼慨鏀圭姸鎬�
+// public boolean PaiFinsh(Telecoms telecoms, OutTasks outTask, String MachineStatus, String InfoContent,
+// String MachineStatusFlag) {
+// try {
+// boolean Results = true;
+// if (Results) {
+// outTask.setMesStatus(MachineStatus);
+// // outTask.setMachineStatus(MachineStatus);
+// outTask.setInfoContent("");
+// outTasksDao.save(outTask);
+// } else {
+// if (!InfoContent.equals(outTask.getInfoContent())) {
+// outTask.setInfoContent(InfoContent);
+// outTasksDao.save(outTask);
+// }
+// }
+// return Results;
+//
+// } catch (Exception e) {
+// // TODO: handle exception
+// System.out.println("姹囨姤寮傚父锛侊紒288");
+// return false;
+// }
+// }
//杩炴帴娲惧皵http鎺ュ彛
public String httpapi(String methodUrl,String json){
try {
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/message/MessageProcessor.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/message/MessageProcessor.java"
index a9c0492..3b7b424 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/message/MessageProcessor.java"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/message/MessageProcessor.java"
@@ -58,9 +58,44 @@
private TelecomsDao telecomsDao;
@Autowired
private MachineDao machineDao;
-
- public String generateReturnMessage(String sendMessageHex, Telecoms telecoms) {//1101-1114
+
+ //鏃ュ織鎵撳嵃
+ public void printLogs(String... str) {
+ try {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//璁剧疆鏃ユ湡鏍煎紡
+ String reuslt="";
+ for(String item:str){
+ reuslt+=" , "+item;
+ }
+ reuslt=df.format(new Date())+": "+reuslt;
+ System.out.println(reuslt);
+ } catch (Exception e) {
+ // TODO: handle exception
+ System.out.println("璁板綍寮傚父"+str);
+ }
+ }
+ //鏃堕棿楠岃瘉
+ public boolean verifyTime(Telecoms telecoms) {
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ if(!telecoms.getInterprets().isEmpty()){
+ Date newdate = sdf.parse(telecoms.getInterprets());
+ Date newdate2 = sdf.parse("2021-12-20");
+ Date nowdate = sdf.parse(sdf.format(new Date()));
+ if(newdate.compareTo(nowdate)==-1||nowdate.compareTo(newdate2)==-1){
+ printLogs("杞欢宸茶繃鏈�!");
+ return false;
+ }
+ }
+ } catch (Exception e) {
+ // TODO: handle exception
+ printLogs("verifyTime");
+ return false;
+ }
+ return true;
+ }
+ public String generateReturnMessage(String sendMessageHex, Telecoms telecoms) {//1101-1114
//杈撳嚭浜や簰鏁版嵁
try {
//LOGGER.debug(Logs);
@@ -79,14 +114,9 @@
}
}else if (sendMessageHex.length() == telecom.getFontSize()*4+18) {
try {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- Date newdate = sdf.parse(telecoms.getInterprets());
- Date newdate2 = sdf.parse("2021-12-20");
- Date nowdate = sdf.parse(sdf.format(new Date()));
- if(newdate.compareTo(nowdate)==-1||nowdate.compareTo(newdate2)==-1){
- System.out.println("杞欢宸茶繃鏈燂紒");
+ if(!verifyTime(telecom)){
return "";
- }
+ }
if(!"0001".equals(sendMessageHex.substring(0, 4))){
//System.out.println("鏃犳晥淇℃伅");
try {
@@ -103,6 +133,7 @@
telecomsDao.save(telecom);
String Texts[]=ResultTexts(sendMessageHex);
String TextsByte[]=ResultTextsByte(sendMessageHex);//璇诲彇鍐呭 浣� 鏍煎紡
+
//鎷垮埌姝LC涓嬬殑鎵�鏈夋満鍣�
List<Machine> Machines=machineDao.FindTelecomsId(telecom.getId());
for(Machine machine:Machines){
@@ -118,16 +149,17 @@
}
} catch (Exception e) {
// TODO: handle exception
- System.out.println("寮傚父鏁版嵁锛佹鏌ワ紒锛侊紒"+telecoms.getId());
+ printLogs("閫氳鏁版嵁寮傚父,妫�鏌�!!!"+telecoms.getId()+sendMessageHex);
+ //System.out.println("寮傚父鏁版嵁锛佹鏌ワ紒锛侊紒"+telecoms.getId());
}
}
return "";
} catch (Exception e) {
- // TODO: handle exception
- System.out.println("寮傚父锛佹鏌ョ綉缁滐紒"+telecoms.getId());
- return"";
+ // TODO: handle exception
+ printLogs("妫�鏌ョ綉缁�,妫�鏌�!!!"+telecoms.getId()+sendMessageHex);
+ //System.out.println("寮傚父锛佹鏌ョ綉缁滐紒"+telecoms.getId());
+ return "";
}
-
}
public String Shelf(Machine machine,String sendMessageHex){
try {
@@ -144,7 +176,7 @@
List<MachineDispose> machineDisposes=machineDisposeDao.findMachineDisposeMachineType(machine.getTypeId().getId(),Dispose,values);
if(machineDisposes.size()==1){
MachineDispose machineDispose=machineDisposes.get(0);
- if("浠诲姟鍙戦��".equals(machineDispose.getExeLogic())){
+ if("浠诲姟鍙戦��".equals(machineDispose.getExeLogic())){
return ShelfSend(machine);
}else if("鍙戦�佹竻闄�".equals(machineDispose.getExeLogic())){
String date = "0000" + "0000" + "0000" + "0000"+"0000";
@@ -160,7 +192,7 @@
}
return "";
}else if(machineDisposes.size()>=1){
- System.out.println("澶氶�昏緫鍖归厤");
+ printLogs("澶氶�昏緫鍖归厤,妫�鏌�!!!"+machine.getId()+sendMessageHex);
return "";
}
}
@@ -204,48 +236,57 @@
outTasksDao.save(OutTask);
continue;
}
- List<LoadRack> LoadRackss= loadRackDao.findLoadRacksTasksRacks(OutTask.getStockName());
+ List<LoadRack> LoadRackss= loadRackDao.findLoadRacksTasksRacks(OutTask.getStockName());//姝ゆ枡鏋舵槸鍚﹀凡缁忓瓨鍦ㄦ煇宸ヤ綅
+ List<LoadRack> loadRacks=loadRackDao.findRackNames(OutTask.getDestination());//鐩殑鍦扮嚎璺槸鍚︽湁绌洪棽宸ヤ綅
//楠岃瘉鏂欐灦鏄惁鍦ㄥ簱鍐�
if(!LoadRackss.isEmpty()){
- SetInfoContent(OutTask,"姝ゆ枡鏋朵笉鍦ㄥ簱鍐�!");
+ SetInfoContent(OutTask,"姝ゆ枡鏋跺叾浠栧伐浣嶆鍦ㄤ娇鐢�!");
+ }else if(!loadRacks.isEmpty()){
+ LoadRack loadRack=loadRacks.get(0);
+ startnumber = HexUtil.intTo2ByteHex(Integer.valueOf(OutTask.getStockName()));
+ endnumber = HexUtil.intTo2ByteHex(Integer.valueOf(loadRack.getNumber()));
+ OutTask.setWorkStatus("姝ｅ湪宸ヤ綔");
+ OutTask.setRackNumber(loadRack.getNumber());
+ OutTask.setInfoContent("");
+ outTasksDao.save(OutTask);
}else{
- if("鍦ㄧ嚎搴撳埌涓婄墖鍙帮紙琛ョ墖锛�".equals(OutTask.getTaskType())){
- List<LoadRack> loadRacks=loadRackDao.findRackNames(OutTask.getDestination());
- if(!loadRacks.isEmpty()){
- LoadRack loadRack=loadRacks.get(0);
- startnumber = HexUtil.intTo2ByteHex(Integer.valueOf(OutTask.getStockName()));
- endnumber = HexUtil.intTo2ByteHex(Integer.valueOf(loadRack.getNumber()));
+ SetInfoContent(OutTask,"姝ょ嚎璺棤绌哄伐浣嶏紒");
+ }
+ }else if("绛夊緟閫�鍥炲簱鍖�".equals(OutTask.getMachineStatus())){
+ //2024-6-25 娣诲姞鑺傜偣 閫�搴撴椂鍙戠幇鍏朵粬绾块渶瑕佸垯鐩存帴杞嚎
+ List<OutTasks> FisrtStockNameTasks =outTasksDao.FindStockName(OutTask.getStockName());//鎵�鏈夋湭瀹屾垚浣嗚窡姝や换鍔＄浉鍚岀殑鏋跺彿
+ //閫�搴�--銆嬭浆绾�
+ if(!FisrtStockNameTasks.isEmpty()&&!OutTask.getDestination().equals(FisrtStockNameTasks.get(0).getDestination())){
+ //鏈夊叾浠栫嚎闇�瑕佹浠诲姟
+ OutTasks FistoutTasks=FisrtStockNameTasks.get(0);
+ List<OutTasks> FisrtDestination =outTasksDao.FindDestination(FistoutTasks.getDestination());
+ if(!FisrtDestination.isEmpty()
+ &&FistoutTasks.getTaskIds()==FisrtDestination.get(0).getTaskIds()){
+ //姝ゆ椂鍙互浠� 姝ゅ伐浣� 鐩存帴閫佸埌鍙︿竴绾胯矾
+ List<LoadRack> loadRackStart=loadRackDao.findOutTasksId(OutTask.getId());//鏂欐灦褰撳墠浣嶇疆
+ List<LoadRack> loadRackEnd=loadRackDao.findRackNames(FistoutTasks.getDestination());//鏂欐灦鐩爣浣嶇疆
+ if(!loadRackStart.isEmpty()&&!loadRackEnd.isEmpty()){
+ LoadRack Start=loadRackStart.get(0);
+ LoadRack End=loadRackEnd.get(0);
+ startnumber = HexUtil.intTo2ByteHex(Integer.valueOf(Start.getNumber()));
+ endnumber = HexUtil.intTo2ByteHex(Integer.valueOf(End.getNumber()));
OutTask.setWorkStatus("姝ｅ湪宸ヤ綔");
- OutTask.setRackNumber(loadRack.getNumber());
+ OutTask.setRackNumber(End.getNumber());
OutTask.setInfoContent("");
- outTasksDao.save(OutTask);
+ //OutTask.Finsh();
+ //FistoutTasks.setWorkStatus("姝ｅ湪宸ヤ綔");
+ //FistoutTasks.setRackNumber(End.getNumber());
+ //FistoutTasks.setInfoContent("");
+ //outTasksDao.save(OutTask);
+ //outTasksDao.save(FistoutTasks);
}else{
SetInfoContent(OutTask,"姝ょ嚎璺棤绌哄伐浣嶏紒");
- }
- }else{
- List<OutTasks> FisrtTasks =outTasksDao.FindNoFinshDestinationAsc(OutTask.getDestination(),"绛夊緟寮�濮�");
- for(OutTasks Fist:FisrtTasks){
- if(Fist.getTaskId().equals(OutTask.getTaskId())){
- List<LoadRack> loadRacks=loadRackDao.findRackNames(OutTask.getDestination());
- if(!loadRacks.isEmpty()){
- LoadRack loadRack=loadRacks.get(0);
- startnumber = HexUtil.intTo2ByteHex(Integer.valueOf(OutTask.getStockName()));
- endnumber = HexUtil.intTo2ByteHex(Integer.valueOf(loadRack.getNumber()));
- OutTask.setWorkStatus("姝ｅ湪宸ヤ綔");
- OutTask.setRackNumber(loadRack.getNumber());
- OutTask.setInfoContent("");
- outTasksDao.save(OutTask);
- }else{
- SetInfoContent(OutTask,"姝ょ嚎璺棤绌哄伐浣嶏紒");
- }
- }
- break;
- }
+ }
}
- }
- }else if("绛夊緟閫�鍥炲簱鍖�".equals(OutTask.getMachineStatus())){
+ }
+ //姝ｅ父閫�搴�
List<LoadRack> loadRacks=loadRackDao.findOutTasksId(OutTask.getId());
- if(loadRacks.size()==1){
+ if(loadRacks.size()==1&&startnumber==""&&endnumber==""){
startnumber = HexUtil.intTo2ByteHex(Integer.valueOf(loadRacks.get(0).getNumber()));
endnumber = HexUtil.intTo2ByteHex(Integer.valueOf(OutTask.getStockName()));
OutTask.setRackNumber(loadRacks.get(0).getNumber());
@@ -309,8 +350,10 @@
return message(machineDispose.getReturnValue(),"0014");
}
if("绛夊緟寮�濮�".equals(OutTask.getMachineStatus())){
+ //鏂欐灦鐩爣浣嶇疆
List<LoadRack> loadRacks=loadRackDao.findNumber(OutTask.getRackNumber());
if(loadRacks.size()==1){
+
String NewMachineStatus=("鍦ㄧ嚎搴撳埌绂荤嚎搴�".equals(OutTask.getTaskType())||
"绂荤嚎搴撳埌鍦ㄧ嚎搴�".equals(OutTask.getTaskType()))?"閾佹灦宸插埌鍚婅浣�":"閾佹灦宸插埌浜屾鎺ュ姏";
LoadRack LoadRack=loadRacks.get(0);
@@ -340,6 +383,34 @@
}else if("绛夊緟閫�鍥炲簱鍖�".equals(OutTask.getMachineStatus())){
List<LoadRack> loadRacks=loadRackDao.findOutTasksId(OutTask.getId());
if(loadRacks.size()==1){
+ List<LoadRack> endRacks=loadRackDao.findNumber(OutTask.getRackNumber());
+ if(endRacks.size()==1){//杞Щ浠诲姟
+ LoadRack endRack=endRacks.get(0);
+ List<OutTasks> lineTask=outTasksDao.FindDestination(endRack.getRackName());//姝ょ嚎鏈紑濮嬩换鍔�
+ if(lineTask.size()>0){
+
+ OutTasks frist=lineTask.get(0);
+ if(frist!=null&&frist.getStockName().equals(OutTask.getStockName())){
+ String NewMachineStatus=("鍦ㄧ嚎搴撳埌绂荤嚎搴�".equals(frist.getTaskType())||
+ "绂荤嚎搴撳埌鍦ㄧ嚎搴�".equals(frist.getTaskType()))?"閾佹灦宸插埌鍚婅浣�":"閾佹灦宸插埌浜屾鎺ュ姏";
+ frist.setMachineStatus(NewMachineStatus);
+ frist.setWorkStatus("绛夊緟涓�");
+ frist.setInfoContent("");
+ endRack.setState("浣跨敤涓�");
+ endRack.setOutTasks(frist);
+ outTasksDao.save(frist);
+ loadRackDao.save(endRack);
+ try {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//璁剧疆鏃ユ湡鏍煎紡
+ String content="浠撳偍宸ヤ綅-宸ヤ綅锛歔閾佹灦鍙凤細"+OutTask.getStockName()+" 璧峰鍦�: "+loadRacks.get(0).getNumber()+" 鐩殑鍦帮細"+endRack.getNumber()+"]";
+ deviceService.WriteFile("D:",machine.getNumber()+"璁板綍",df.format(new Date())+"\r"+content,true);
+ System.out.println(content);
+ } catch (Exception e) {
+ // TODO: handle exception
+ }
+ }
+ }
+ }
LoadRack LoadRack=loadRacks.get(0);
LoadRack.ResetLoadRack();
OutTask.setWorkStatus("");
@@ -350,20 +421,6 @@
try {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//璁剧疆鏃ユ湡鏍煎紡
String content="plc浠撳偍鍐欏叆鍐呭锛歔 MES鏀跺埌浠撳偍瀹屾垚 浠诲姟ID锛�"+OutTask.getTaskId()+"锛岄搧鏋跺彿锛�"+OutTask.getStockName()+" 宸查��鍥炲湪绾垮簱 ]";
- deviceService.WriteFile("D:",machine.getNumber()+"璁板綍",df.format(new Date())+"\r"+content,true);
- System.out.println(content);
- } catch (Exception e) {
- // TODO: handle exception
- }
- return message(machineDispose.getReturnValue(),"0014");
- }else{
- OutTask.setWorkStatus("");
- OutTask.setMachineStatus("浠诲姟瀹屾垚");
- OutTask.setInfoContent("");
- outTasksDao.save(OutTask);
- try {
- SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//璁剧疆鏃ユ湡鏍煎紡
- String content="plc浠撳偍鍐欏叆鍐呭锛歔 MES鏀跺埌浠撳偍瀹屾垚 浠诲姟ID锛�"+OutTask.getTaskId()+"锛岄搧鏋跺彿锛�"+OutTask.getStockName()+" 宸查��鍥炲湪绾垮簱 ]";
deviceService.WriteFile("D:",machine.getNumber()+"璁板綍",df.format(new Date())+"\r"+content,true);
System.out.println(content);
} catch (Exception e) {
@@ -439,7 +496,11 @@
if(!"閾佹灦宸插埌浜屾鎺ュ姏".equals(loadRack.getOutTasks().getMachineStatus())&&
!"绛夊緟閫�鍥炲簱鍖�".equals(loadRack.getOutTasks().getMachineStatus()))
{
- if("绛夊緟涓�".equals(loadRack.getMachineLoad().getWorkState())&&
+ //System.out.println(loadRack.getId()+","+loadRack.getOutTasks().getTaskId()+","+loadRack.getMachineLoad().getWorkState()+","+loadRack.getOutTasks().getMesStatus()+","+loadRack.getOutTasks().getMachineStatus()+","+loadRack.getState()+","+loadRack.getFlag());
+ if("绛夊緟鍚哥墖".equals(loadRack.getState())){
+ loadRack.setState("浜伅");
+ loadRackDao.save(loadRack);
+ }else if("绛夊緟涓�".equals(loadRack.getMachineLoad().getWorkState())&&
"娲惧皵纭閾佹灦宸插埌浣�".equals(loadRack.getOutTasks().getMesStatus())&&
"閾佹灦宸插埌涓婄墖浣�".equals(loadRack.getOutTasks().getMachineStatus())&&
"浣跨敤涓�".equals(loadRack.getState())&&
@@ -472,6 +533,7 @@
String pgknum=HexUtil.intTo2ByteHex(Sum);
String locknum=HexUtil.intTo2ByteHex(StockNum);
String date="000100000000"+bb+hh+pgknum+locknum;
+
try {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//璁剧疆鏃ユ湡鏍煎紡
String content="plc"+machine.getNumber()+"鍐欏叆鍐呭锛歔 寮�濮嬪惛鐗�,瀹斤細"+loadRack.getOutTasks().getBb()+" 楂橈細"+loadRack.getOutTasks().getHh()+" 鎬讳换鍔℃暟锛�"+Sum+" 鏋朵笂鏁伴噺锛�"+StockNum+" 宸蹭笂鏁伴噺锛�"+loadRack.getOutTasks().getLoadeNum()+" 鐮存崯鏁伴噺锛�"+loadRack.getOutTasks().getPosunCount()+"]";
@@ -882,7 +944,7 @@
if("绛夊緟琛ョ墖".equals(loadRack1.getMachineLoad().getWorkState())&&
"鍦ㄧ嚎搴撳埌涓婄墖鍙帮紙琛ョ墖锛�".equals(loadRack1.getOutTasks().getTaskType()))
{
- loadRack1.setState("浣跨敤涓�");
+ loadRack1.setState("绛夊緟鍚哥墖");
loadRack1.getOutTasks().setWorkStatus("绛夊緟涓�");
loadRack1.getOutTasks().setMachineStatus("閾佹灦宸插埌涓婄墖浣�");
loadRack1.getMachineLoad().setWorkState("绛夊緟涓�");
@@ -897,7 +959,7 @@
}
return machineDispose.getReturnValue();
}else{
- loadRack1.setState("浣跨敤涓�");
+ loadRack1.setState("绛夊緟鍚哥墖");
loadRack1.getOutTasks().setWorkStatus("绛夊緟涓�");
loadRack1.getOutTasks().setMachineStatus("閾佹灦宸插埌涓婄墖浣�");
loadRackDao.save(loadRack1);
@@ -918,11 +980,49 @@
loadRack1.getMachineLoad().setWorkState("绛夊緟涓�");
loadRackDao.save(loadRack1);
}*/
- loadRack1.setState("浣跨敤涓�");
- loadRack1.getOutTasks().setWorkStatus("绛夊緟涓�");
- loadRack1.getOutTasks().setMachineStatus("绛夊緟閫�鍥炲簱鍖�");
- SetInfoContent(loadRack1.getOutTasks(),"");
- loadRackDao.save(loadRack1);
+ //閫�鍥為獙璇侊細濡傛灉鍚庣画涓や釜浠诲姟瀛樺湪姝ゆ枡鏋跺垯涓嶉��搴擄紝濡備笉瀛樺湪鍒欓��搴�
+ List<OutTasks> OutTasksSameStokess=outTasksDao.FindDestinationNoFinshTaskIdOderbyASC(loadRack1.getOutTasks().getDestination(),loadRack1.getOutTasks().getTaskId(),"浠诲姟瀹屾垚");
+
+ if(OutTasksSameStokess.isEmpty()){
+ loadRack1.setState("浣跨敤涓�");
+ loadRack1.getOutTasks().setWorkStatus("绛夊緟涓�");
+ loadRack1.getOutTasks().setMachineStatus("绛夊緟閫�鍥炲簱鍖�");
+ SetInfoContent(loadRack1.getOutTasks(),"");
+ loadRackDao.save(loadRack1);
+ }else{
+ boolean tui=false;
+ for(int i=0;i<OutTasksSameStokess.size()&&i<2;i++){
+ OutTasks outTasks=OutTasksSameStokess.get(i);
+ if(outTasks.getStockName().equals(loadRack1.getOutTasks().getStockName())){
+ tui=true;
+ //褰撳墠浠诲姟鍚庝袱涓换鍔′腑瀛樺湪鍚屾枡鏋�
+ //褰撳墠浠诲姟鏍囪瀹屾垚
+ loadRack1.setState("浣跨敤涓�");
+ loadRack1.getOutTasks().setWorkStatus("");
+ loadRack1.getOutTasks().setMachineStatus("浠诲姟瀹屾垚");
+ loadRack1.getOutTasks().setInfoContent("");
+ loadRackDao.save(loadRack1);
+
+ //涓嬩竴浠诲姟鏍囪鍒拌揪涓婄墖浣�
+ outTasks.setWorkStatus("绛夊緟涓�");
+ outTasks.setMachineStatus("閾佹灦宸插埌浜屾鎺ュ姏");
+ outTasks.setInfoContent("");
+ outTasksDao.save(outTasks);
+ loadRack1.setState("浣跨敤涓�");
+ loadRack1.setOutTasks(outTasks);
+ loadRackDao.save(loadRack1);
+ break;
+ }
+ }
+ if(!tui){
+ loadRack1.setState("浣跨敤涓�");
+ loadRack1.getOutTasks().setWorkStatus("绛夊緟涓�");
+ loadRack1.getOutTasks().setMachineStatus("绛夊緟閫�鍥炲簱鍖�");
+ SetInfoContent(loadRack1.getOutTasks(),"");
+ loadRackDao.save(loadRack1);
+ }
+ }
+
try {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//璁剧疆鏃ユ湡鏍煎紡
String content="plc"+machine.getNumber()+"鍐欏叆鍐呭锛歔 鏀跺埌 宸ヤ綅锛�"+loadRack1.getNumber()+" 宸查��鍥炰簩娆℃帴鍔� ]";
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/task/LoadTaskService.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/task/LoadTaskService.java"
new file mode 100644
index 0000000..e80ffc6
--- /dev/null
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/service/task/LoadTaskService.java"
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2014 springside.github.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ *******************************************************************************/
+package com.northglass.service.task;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.Model;
+
+import com.northglass.entity.LoadRack;
+import com.northglass.entity.OutTasks;
+import com.northglass.entity.Task;
+import com.northglass.repository.LoadRackDao;
+import com.northglass.repository.OutTasksDao;
+import com.northglass.repository.TaskDao;
+import org.springside.modules.persistence.DynamicSpecifications;
+import org.springside.modules.persistence.SearchFilter;
+import org.springside.modules.persistence.SearchFilter.Operator;
+
+// Spring Bean鐨勬爣璇�.
+@Component
+// 绫讳腑鎵�鏈塸ublic鍑芥暟閮界撼鍏ヤ簨鍔＄鐞嗙殑鏍囪瘑.
+@Transactional
+public class LoadTaskService {
+
+ @Autowired
+ private OutTasksDao outTasksDao;
+ @Autowired
+ private LoadRackDao loadRackDao;
+ //涓婄墖浠诲姟
+ public List<LoadRack> loadRackLine(String line) {
+ List<LoadRack> loadRacks=loadRackDao.findRackName(line);//涓婄墖宸ヤ綅
+ return loadRacks;
+ }
+
+ public List<OutTasks> notFinshTask(String line) {
+ List<OutTasks> OutTasks=outTasksDao.FindNotTaskLine("娲惧皵纭浠诲姟瀹屾垚",line);
+ for(OutTasks item:OutTasks){
+ System.out.println(item.getId());
+ System.out.println(item.getMachineStatus());
+ }
+ System.out.println("----");
+ return OutTasks;
+ }
+ public List<OutTasks> updateTask(String taskId,String Stusts) {
+ List<OutTasks> ResultOutTasks=new ArrayList<OutTasks>();
+ List<OutTasks> OutTasks=outTasksDao.FindOutTasksTaskIds(taskId);
+ System.out.println("1锛�"+taskId+" "+Stusts);
+ for(OutTasks OutTask:OutTasks){
+
+ ResultOutTasks.add(OutTask);
+ if(Stusts.equals("閾佹灦宸插埌浜屾鎺ュ姏")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("涓婄墖浠诲姟宸插紑濮�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("绛夊緟寮�濮�")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("涓婄墖浠诲姟宸插紑濮�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ System.out.println("---"+Stusts);
+ }else if(Stusts.equals("閾佹灦宸插埌涓婄墖浣�")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("涓婄墖浠诲姟宸插紑濮�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("涓婄墖瀹屾垚璇锋眰閫�鍥�")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("娲惧皵纭閾佹灦宸插埌浣�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("閾佹灦閫�鍥炰簩娆℃帴鍔�")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("娲惧皵纭鍙��鍥�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("閾佹灦宸插埌鍚婅浣�")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("涓婄墖浠诲姟宸插紑濮�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("浠诲姟瀹屾垚")){
+ List<LoadRack> LoadRacks=loadRackDao.findOutTasksId(OutTask.getId());
+ for(LoadRack lloadRack:LoadRacks){
+ lloadRack.setOutTasks(null);
+ lloadRack.setState("绌洪棽");
+ loadRackDao.save(lloadRack);
+ }
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("娲惧皵纭鍙��鍥�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ System.out.println("---"+Stusts);
+ }else if(Stusts.equals("绛夊緟閫�鍥炲簱鍖�")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("娲惧皵纭鍙��鍥�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("娲惧皵纭浠诲姟瀹屾垚")){
+ List<LoadRack> LoadRacks=loadRackDao.findOutTasksId(OutTask.getId());
+ for(LoadRack lloadRack:LoadRacks){
+ lloadRack.setOutTasks(null);
+ lloadRack.setState("绌洪棽");
+ loadRackDao.save(lloadRack);
+ }
+ OutTask.setMesStatus(Stusts);
+ OutTask.setMachineStatus("浠诲姟瀹屾垚");
+ OutTask.setInfoContent("");
+ OutTask.setWorkStatus("");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("娲惧皵纭閾佹灦宸插埌浣�")){
+ if("閾佹灦宸插埌涓婄墖浣�".equals(OutTask.getMachineStatus())||
+ "閾佹灦宸插埌鍚婅浣�".equals(OutTask.getMachineStatus())){
+ OutTask.setMesStatus(Stusts);
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else{
+ if(!"姝や换鍔′笉鍦ㄤ笂鐗囦綅鎴栧悐瑁呬綅鏃犳硶鏍囪锛�".equals(OutTask.getInfoContent())){
+ OutTask.setInfoContent("姝や换鍔′笉鍦ㄤ笂鐗囦綅鎴栧悐瑁呬綅鏃犳硶鏍囪锛�");
+ outTasksDao.save(OutTask);
+ }
+ }
+ }else{
+ OutTask.setMachineStatus(Stusts);
+ outTasksDao.save(OutTask);
+ }
+ }
+ List<OutTasks> OutTasks2=outTasksDao.FindOutTasksTaskIds(taskId);
+
+ for(OutTasks item:OutTasks2){
+ ResultOutTasks.add(item);
+ //System.out.println("1锛�"+item.getId()+" "+item.getMachineStatus());
+ break;
+ }
+
+ return ResultOutTasks;
+ }
+}
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/alltasks/loadTaskController.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/alltasks/loadTaskController.java"
new file mode 100644
index 0000000..47daca3
--- /dev/null
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/alltasks/loadTaskController.java"
@@ -0,0 +1,220 @@
+package com.northglass.web.alltasks;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.northglass.entity.LoadRack;
+import com.northglass.entity.Machine;
+import com.northglass.entity.MachineDispose;
+import com.northglass.entity.OutTasks;
+import com.northglass.entity.Telecoms;
+import com.northglass.repository.LoadRackDao;
+import com.northglass.repository.MachineDao;
+import com.northglass.repository.MachineDisposeDao;
+import com.northglass.repository.OutTasksDao;
+import com.northglass.repository.TelecomsDao;
+import com.northglass.service.device.DeviceService;
+
+import net.sf.json.JSONObject;
+
+@Controller
+@RequestMapping(value="/loadTask")
+public class loadTaskController {
+ @Autowired
+ private OutTasksDao outTasksDao;
+ @Autowired
+ private LoadRackDao loadRackDao;
+ @Autowired
+ private com.northglass.service.task.LoadTaskService loadTaskService;
+
+ //涓婄墖椤甸潰
+ @RequestMapping(method = RequestMethod.GET,value="/loadHtml")
+ public String loadHtml(Model model,HttpServletRequest request,HttpServletResponse response) {
+ return "loadtask/loadMachine";
+ }
+ //浠诲姟椤甸潰
+ @RequestMapping(method = RequestMethod.GET,value="/taskHtml")
+ public String taskHtml(Model model,HttpServletRequest request,HttpServletResponse response) {
+ return "loadtask/loadTask";
+ }
+
+ //涓婄墖宸ヤ綅鏁版嵁 浼犵嚎璺�
+ @RequestMapping(method = RequestMethod.POST,value="/loadRackLine")
+ @ResponseBody
+ public List<LoadRack> loadRackLine(Model model,HttpServletRequest request) {
+ String line="涓婄墖鍙�"+request.getParameter("line");//绾胯矾
+ List<LoadRack> loadRacks=loadRackDao.findRackName(line);//涓婄墖宸ヤ綅
+ for(LoadRack item:loadRacks){
+ System.out.println(item.getOutTasks()==null);
+ }
+ System.out.println();
+ return loadRacks;
+ }
+ //涓婄墖宸ヤ綅鏁版嵁 浼犵嚎璺�
+ @RequestMapping(method = RequestMethod.GET,value="/loadRackLine2")
+ @ResponseBody
+ public List<LoadRack> loadRackLine2(Model model,HttpServletRequest request) {
+ String line="涓婄墖鍙�"+request.getParameter("line");//绾胯矾
+ List<LoadRack> loadRacks=loadRackDao.findRackName(line);//涓婄墖宸ヤ綅
+ return loadRacks;
+ }
+ //鏈畬鎴愪换鍔℃暟鎹� 浼犵嚎璺�
+ @RequestMapping(method = RequestMethod.POST,value="/notFinshTask")
+ @ResponseBody
+ public List<OutTasks> notFinshTask(Model model,HttpServletRequest request) {
+ String line="涓婄墖鍙�"+request.getParameter("line");//绾胯矾
+ List<OutTasks> OutTasks=outTasksDao.FindNotTaskLine("娲惧皵纭浠诲姟瀹屾垚",line);
+
+ return OutTasks;
+ }
+ //宸插畬鎴愪换鍔℃暟鎹� 浼犵嚎璺�
+ @RequestMapping(method = RequestMethod.POST,value="/finshTask")
+ @ResponseBody
+ public List<OutTasks> finshTask(Model model,HttpServletRequest request) {
+ String line="涓婄墖鍙�"+request.getParameter("line");//绾胯矾
+ List<OutTasks> OutTasks=outTasksDao.FindTaskLine("娲惧皵纭浠诲姟瀹屾垚",line);
+ return OutTasks;
+ }
+ //淇敼鏂欐灦浠诲姟 缁戝畾/瑙ｉ櫎 taskId,Status
+ @RequestMapping(method = RequestMethod.POST,value="/updateLoad")
+ @ResponseBody
+ public List<OutTasks> updateLoad(Model model,HttpServletRequest request) {
+ String RackId=request.getParameter("RackId");//鏂欐灦鍙�
+ String TaskIdHtml=request.getParameter("TaskIdHtml");//浠诲姟鍙�
+ try {
+ LoadRack loadRack=loadRackDao.findOne(Long.valueOf(RackId));
+ if(!TaskIdHtml.equals("")){
+ OutTasks OutTask=outTasksDao.FindOutTasksTaskId(TaskIdHtml);
+ loadRack.setOutTasks(OutTask);
+ loadRack.setState("浣跨敤涓�");
+ loadRackDao.save(loadRack);
+ }
+ } catch (Exception e) {
+ System.out.println("鏂欐灦淇敼澶辫触锛�");
+ // TODO: handle exception
+ }
+ return new ArrayList<OutTasks>();
+ }
+ //淇敼浠诲姟 鐘舵�� taskId,Status
+ @RequestMapping(method = RequestMethod.POST,value="/updateTask")
+ @ResponseBody
+ public List<OutTasks> updateTask(Model model,HttpServletRequest request) {
+ List<OutTasks> ResultOutTasks=new ArrayList<OutTasks>();
+ String taskId=request.getParameter("TaskIdHtml");//浠诲姟鍙�
+ String Stusts=request.getParameter("Stusts");//鐘舵��
+ List<OutTasks> OutTasks=outTasksDao.FindOutTasksTaskIds(taskId);
+
+ for(OutTasks OutTask:OutTasks){
+
+ ResultOutTasks.add(OutTask);
+ if(Stusts.equals("閾佹灦宸插埌浜屾鎺ュ姏")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("涓婄墖浠诲姟宸插紑濮�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("绛夊緟寮�濮�")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("涓婄墖浠诲姟宸插紑濮�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("閾佹灦宸插埌涓婄墖浣�")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("涓婄墖浠诲姟宸插紑濮�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("涓婄墖瀹屾垚璇锋眰閫�鍥�")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("娲惧皵纭閾佹灦宸插埌浣�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("閾佹灦閫�鍥炰簩娆℃帴鍔�")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("娲惧皵纭鍙��鍥�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("閾佹灦宸插埌鍚婅浣�")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("涓婄墖浠诲姟宸插紑濮�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("浠诲姟瀹屾垚")){
+ List<LoadRack> LoadRacks=loadRackDao.findOutTasksId(OutTask.getId());
+ for(LoadRack lloadRack:LoadRacks){
+ lloadRack.setOutTasks(null);
+ lloadRack.setState("绌洪棽");
+ loadRackDao.save(lloadRack);
+ }
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("娲惧皵纭鍙��鍥�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("绛夊緟閫�鍥炲簱鍖�")){
+ OutTask.setMachineStatus(Stusts);
+ OutTask.setMesStatus("娲惧皵纭鍙��鍥�");
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("娲惧皵纭浠诲姟瀹屾垚")){
+ List<LoadRack> LoadRacks=loadRackDao.findOutTasksId(OutTask.getId());
+ for(LoadRack lloadRack:LoadRacks){
+ lloadRack.setOutTasks(null);
+ lloadRack.setState("绌洪棽");
+ loadRackDao.save(lloadRack);
+ }
+ OutTask.setMesStatus(Stusts);
+ OutTask.setMachineStatus("浠诲姟瀹屾垚");
+ OutTask.setInfoContent("");
+ OutTask.setWorkStatus("");
+ outTasksDao.save(OutTask);
+ }else if(Stusts.equals("娲惧皵纭閾佹灦宸插埌浣�")){
+ if("閾佹灦宸插埌涓婄墖浣�".equals(OutTask.getMachineStatus())||
+ "閾佹灦宸插埌鍚婅浣�".equals(OutTask.getMachineStatus())){
+ OutTask.setMesStatus(Stusts);
+ OutTask.setWorkStatus("绛夊緟涓�");
+ outTasksDao.save(OutTask);
+ }else{
+ if(!"姝や换鍔′笉鍦ㄤ笂鐗囦綅鎴栧悐瑁呬綅鏃犳硶鏍囪锛�".equals(OutTask.getInfoContent())){
+ OutTask.setInfoContent("姝や换鍔′笉鍦ㄤ笂鐗囦綅鎴栧悐瑁呬綅鏃犳硶鏍囪锛�");
+ outTasksDao.save(OutTask);
+ }
+ }
+ }else{
+ OutTask.setMachineStatus(Stusts);
+ outTasksDao.save(OutTask);
+ }
+ }
+ List<OutTasks> OutTasks2=outTasksDao.FindOutTasksTaskIds(taskId);
+
+ for(OutTasks item:OutTasks2){
+ ResultOutTasks.add(item);
+ //System.out.println("1锛�"+item.getId()+" "+item.getMachineStatus());
+ break;
+ }
+
+ return ResultOutTasks;
+ }
+
+
+}
+
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/alltasks/tasksController.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/alltasks/tasksController.java"
index 60535d0..8621c64 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/alltasks/tasksController.java"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/alltasks/tasksController.java"
@@ -73,13 +73,19 @@
//System.out.println(taskstate);
List<OutTasks> OutTasks=new ArrayList<OutTasks>();
if("2".equals(taskstate)){
- OutTasks=outTasksDao.FindMesStatus("娲惧皵纭浠诲姟瀹屾垚");
+ List<OutTasks> lists=outTasksDao.FindMesStatus("娲惧皵纭浠诲姟瀹屾垚");
+ if(lists.size()>0&&lists.size()<=100){
+ OutTasks=lists.subList(0, lists.size());
+ }
PageHeads="宸插畬鎴愪换鍔�";
}else if("1".equals(taskstate)){
OutTasks=outTasksDao.FindNoMesStatus("娲惧皵纭浠诲姟瀹屾垚");
PageHeads="鏈畬鎴愪换鍔�";
}else if("0".equals(taskstate)){
- OutTasks=outTasksDao.findAll();
+ List<OutTasks> lists=outTasksDao.FindAll100();
+ if(lists.size()>0&&lists.size()<=100){
+ OutTasks=lists.subList(0, lists.size());
+ }
PageHeads="鍏ㄩ儴浠诲姟";
}
int sumcount=OutTasks.size()%ContentCount!=0?OutTasks.size()/ContentCount+1:OutTasks.size()/ContentCount;
@@ -89,8 +95,39 @@
model.addAttribute("ContentCountHtml",ContentCountHtml);
model.addAttribute("OutTaskshtml",OutTaskshtml(OutTasks,count,ContentCount));
model.addAttribute("Buttonshtml",Buttonshtml(OutTasks.size(),count,ContentCount));
- return "alltasks/tasks";
+ return "alltasks/tasks2";
}
+
+ //鍏ㄩ儴浠诲姟鐣岄潰
+ @RequestMapping(method = RequestMethod.GET,value="/loadMachine")
+ public String loadMachine(Model model,HttpServletRequest request,HttpServletResponse response) {
+ return "alltasks/loadMachine";
+ }
+ //姝ょ嚎璺殑 涓婄墖宸ヤ綅
+ @RequestMapping(method = RequestMethod.POST,value="/loadRackLine")
+ @ResponseBody
+ public List<LoadRack> loadRackLine(Model model,HttpServletRequest request) {
+ String line="涓婄墖鍙�"+request.getParameter("line");//绾胯矾
+ List<LoadRack> loadRacks=loadRackDao.findRackName(line);//涓婄墖宸ヤ綅
+ return loadRacks;
+ }
+ @RequestMapping(method = RequestMethod.POST,value="/alltasksdata")
+ @ResponseBody
+ public List<OutTasks> alltasksdata(Model model,HttpServletRequest request) {
+ String state=request.getParameter("state");//浠诲姟鐘舵��
+ List<OutTasks> OutTasks=new ArrayList<OutTasks>();
+ if("2".equals(state)){
+ OutTasks=outTasksDao.FindMesStatus("娲惧皵纭浠诲姟瀹屾垚");
+ }else if("1".equals(state)){
+ OutTasks=outTasksDao.FindNoMesStatus("娲惧皵纭浠诲姟瀹屾垚");
+ }else if("0".equals(state)){
+ OutTasks=outTasksDao.findAll();
+ }
+ return OutTasks;
+ }
+
+
+
//涓�鍏卞灏戞暟鎹紝绗灏戦〉锛屼竴椤靛灏戣 50,2,10
public String Buttonshtml(int Size,int Count,int ContentCount){
String Buttonhtmls="";
@@ -221,7 +258,7 @@
String WorkStatus="";//鏄惁鍦ㄥ伐浣�
String LoadWorkStatus=(loadRack.getMachineLoad()==null?"":loadRack.getMachineLoad().getWorkState());//鏄惁鍦ㄥ伐浣�;
String FlagButton=loadRack.getFlag();//鍚敤鐘舵��
- String StatsButton=loadRack.getFlag();//鏂欐灦鐘舵��
+ String StatsButton="";//鏂欐灦鐘舵��
int Loade=0;//寰呬笂鏁伴噺
int sum1=0;
int sum2=0;
@@ -253,11 +290,15 @@
}else{
FlagButton="<button class=\"Rowbtn\" style=\"background-color: #fd5f56;margin-left:5px;\" onclick=\"EnableDisables('鍚敤','"+loadRack.getId()+"')\">绂佺敤</button>";
}
- if(!loadRack.getState().equals("浣跨敤涓�")){
- StatsButton="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('浣跨敤涓�','"+loadRack.getId()+"')\">绌洪棽</button>";
- }else{
- StatsButton="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('绌洪棽','"+loadRack.getId()+"')\">浣跨敤涓�</button>";
- }
+// if(!loadRack.getState().equals("浣跨敤涓�")){
+// StatsButton="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('浣跨敤涓�','"+loadRack.getId()+"')\">绌洪棽</button>";
+// }else{
+// StatsButton="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('绌洪棽','"+loadRack.getId()+"')\">浣跨敤涓�</button>";
+// }
+ StatsButton+="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('浣跨敤涓�','"+loadRack.getId()+"')\">浣跨敤涓�</button>";
+ StatsButton+="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('绌洪棽','"+loadRack.getId()+"')\">绌洪棽</button>";
+ StatsButton+="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('浜伅','"+loadRack.getId()+"')\">浜伅</button>";
+ StatsButton+="<button class=\"Rowbtn\" style=\"margin-left:5px;\" onclick=\"EnableDisables('宸蹭寒鐏�','"+loadRack.getId()+"')\">宸蹭寒鐏�</button>";
LoadRackshtml+="<tr>";
LoadRackshtml+="<td style=\"text-align: center;\"><input class=\"checkboxs\" type=\"checkbox\" /></td>";
LoadRackshtml+="<td class=\"RackId\">"+Id+"</td>";
@@ -440,6 +481,7 @@
String Types=request.getParameter("Types");
String Stusts=request.getParameter("Stusts");
String TaskIdHtml=request.getParameter("TaskIdHtml");
+ System.out.println(Types+","+Stusts+","+TaskIdHtml);
try {
List<OutTasks> OutTasks=outTasksDao.FindOutTasksTaskIds(TaskIdHtml);
for(OutTasks OutTask:OutTasks){
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/configuration/ConfigController.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/configuration/ConfigController.java"
index af5cd6b..499fa79 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/configuration/ConfigController.java"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/configuration/ConfigController.java"
@@ -62,12 +62,25 @@
@Autowired
private DeviceService deviceService;
//鏈哄櫒鐣岄潰 (鍙坊鍔狅紝淇敼锛屽垹闄�)
+ @RequestMapping(method = RequestMethod.GET,value="/manualOperation")
+ public String manualOperation(Model model) {
+ model.addAttribute("MachineCount",1);
+ return "configuration/manualOperation";
+ }
+
+ //鏈哄櫒鐣岄潰 (鍙坊鍔狅紝淇敼锛屽垹闄�)
+ @RequestMapping(method = RequestMethod.GET,value="/taskInfo")
+ public String taskInfo(Model model) {
+ return "configuration/taskInfos";
+ }
+ //鏈哄櫒鐣岄潰 (鍙坊鍔狅紝淇敼锛屽垹闄�)
@RequestMapping(method = RequestMethod.GET,value="/minche")
public String minche(Model model) {
String MachineOutTaskhtmls="";
List<Machine> Machines=machineDao.findAll();
Telecoms telecoms=telecomsDao.findOne(10L);
Telecoms telecomsShel=telecomsDao.findOne(1L);
+ String outTasksTasks="";
String InfoStats="鎮ㄧ殑杞欢灏嗕簬"+telecomsShel.getInterprets()+" 杩囨湡锛岃涓庝緵搴斿晢鑱旂郴";
if(telecomsShel.getInterprets().equals("")){
InfoStats="";
@@ -117,7 +130,17 @@
}
List<OutTasks> OutTasksTasking=outTasksDao.FindMachineStatusWorkStatus("绛夊緟寮�濮�","绛夊緟閫�鍥炲簱鍖�","姝ｅ湪宸ヤ綔","姝ｅ父");
List<OutTasks> OutTasksAll=outTasksDao.FindMachineStatusWorkStatus("绛夊緟寮�濮�","绛夊緟閫�鍥炲簱鍖�","绛夊緟涓�","姝ｅ父");
+
for(OutTasks OutTasks:OutTasksTasking){
+ outTasksTasks+="<tr style='background-color: #a3f4ab;'>"+
+ "<td>"+OutTasks.getTaskId()+"</td>"+
+ "<td>"+OutTasks.getStockName()+"</td>"+
+ "<td>"+OutTasks.getDestination()+"</td>"+
+ "<td>"+OutTasks.getRackNumber()+"</td>"+
+ "<td>"+(OutTasks.getPlanLoadNum1()+OutTasks.getPlanLoadNum2()+OutTasks.getPlanLoadNum3())+"</td>"+
+ "<td>"+OutTasks.getStockNum()+"</td>"+
+ "<td>"+(OutTasks.getMachineStatus().equals("绛夊緟寮�濮�")?"鍑哄簱":"閫�搴�")+"</td>"+
+ "</tr>";
OutTasksid=OutTasks.getId().toString();
OutTasksWorkStatus=OutTasks.getWorkStatus().toString();
OutTasksStockName=OutTasks.getStockName().toString();
@@ -125,6 +148,17 @@
OutTasksMachineStatus=OutTasks.getMachineStatus().toString();
OutTasksInfoContent=OutTasks.getInfoContent().toString();
break;
+ }
+ for(OutTasks OutTasks:OutTasksAll){
+ outTasksTasks+="<tr>"+
+ "<td>"+OutTasks.getTaskId()+"</td>"+
+ "<td>"+OutTasks.getStockName()+"</td>"+
+ "<td>"+OutTasks.getDestination()+"</td>"+
+ "<td>"+OutTasks.getRackNumber()+"</td>"+
+ "<td>"+(OutTasks.getPlanLoadNum1()+OutTasks.getPlanLoadNum2()+OutTasks.getPlanLoadNum3())+"</td>"+
+ "<td>"+OutTasks.getStockNum()+"</td>"+
+ "<td>"+(OutTasks.getMachineStatus().equals("绛夊緟寮�濮�")?"鍑哄簱":"閫�搴�")+"</td>"+
+ "</tr>";
}
OutTasksCount=(OutTasksAll.isEmpty()?"0":OutTasksAll.size()).toString();
}else if("load".equals(machine.getTypeId().getTypesName())){
@@ -242,6 +276,7 @@
MachineOutTaskhtmls+="</tr>";
}
model.addAttribute("InfoStats",InfoStats);
+ model.addAttribute("outTasksTasks",outTasksTasks);
model.addAttribute("MachineOutTaskhtmls",MachineOutTaskhtmls);
model.addAttribute("MachineCount",Machines.size());
return "configuration/minche";
@@ -302,7 +337,66 @@
}
return "鏃犳晥鎿嶄綔!";
}
-
+ // 鎵嬪姩椤甸潰 鏈畬鎴愮殑浠撳偍浠诲姟
+ @RequestMapping(method = RequestMethod.POST, value = "/selectOutTasks")
+ @ResponseBody
+ public List<OutTasks> selectOutTasks(HttpServletRequest request, Model model) {
+ List<OutTasks> list=outTasksDao.findWaitTask();
+ return list;
+ }
+ // 鎵嬪姩椤甸潰 娣诲姞鎵嬪姩浠诲姟
+ @RequestMapping(method = RequestMethod.POST, value = "/addTask")
+ public String addTask(HttpServletRequest request, Model model) {
+ String start=request.getParameter("start");
+ String end=request.getParameter("end");
+ String stock=request.getParameter("stock");
+ OutTasks OutTasksadd=new OutTasks();
+ OutTasksadd.setId(2L);
+ OutTasksadd.setTaskId("1");
+ OutTasksadd.setTaskType("鎵嬪姩浠诲姟");
+ OutTasksadd.setMesStatus("");
+ OutTasksadd.setMachineStatus("");
+ OutTasksadd.setWorkStatus("绛夊緟涓�");
+ OutTasksadd.setPkgId(1);
+ OutTasksadd.setStockName("1");
+ OutTasksadd.setDestination("涓婄墖鍙�1");
+ OutTasksadd.setPlanLoadNum1(0);
+ OutTasksadd.setPlanLoadNum2(0);
+ OutTasksadd.setPlanLoadNum3(0);
+ OutTasksadd.setStockNum(0);
+ OutTasksadd.setLoadeNum(0);
+ OutTasksadd.setNewPkgId(1);
+ OutTasksadd.setNewPkgNum(0);
+ OutTasksadd.setBb(0);
+ OutTasksadd.setHh(0);
+ OutTasksadd.setColor("");
+ OutTasksadd.setThickness(0);
+ OutTasksadd.setPkgNum(0);
+ OutTasksadd.setStockThickness(0);
+ OutTasksadd.setTaskIds(1L);
+ OutTasksadd.setPosunCount(0);
+ OutTasksadd.setRackNumber("");
+ OutTasksadd.setInfoContent("");
+ OutTasksadd.setStartTime(new Date());
+ OutTasksadd.setFinshTime(new Date());
+ OutTasksadd.setFlag("姝ｅ父");
+ OutTasksadd.setLoadTime(new Date());
+ OutTasksadd.setPriority(900);
+ outTasksDao.save(OutTasksadd);
+ return "redirect:/Config/manualOperation";
+ }
+ // 鎵嬪姩椤甸潰 浠诲姟鎿嶄綔锛氥�愬彇娑�/瀹屾垚銆�
+ @RequestMapping(method = RequestMethod.POST, value = "/updateTask")
+ public String updateTask(HttpServletRequest request, Model model) {
+ String taskid=request.getParameter("taskid");
+ String Controls=request.getParameter("Controls");
+// OutTasks OutTasks=outTasksDao.findOne(Long.valueOf(taskid));
+// OutTasks.setMesStatus("");
+// OutTasks.setMachineStatus("");
+// OutTasks.setWorkStatus("");
+// outTasksDao.save(OutTasks);
+ return "redirect:/Config/manualOperation";
+ }
//澶у睆灞曠ず
@RequestMapping(method = RequestMethod.GET,value="/infomathion")
public String infomathion(Model model) {
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/manage/CutManageController.java" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/manage/CutManageController.java"
index f4cad11..358b947 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/manage/CutManageController.java"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/java/com/northglass/web/manage/CutManageController.java"
@@ -9,6 +9,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.northglass.service.TelecomsService.TelecomsService;
+
import net.sf.json.JSONObject;
@Controller
@@ -24,6 +27,10 @@
jsonObj.putAll(map);
return jsonObj;
}
-
+ @RequestMapping(method=RequestMethod.GET, value="/paiText")
+ @ResponseBody
+ public JSONObject paiText(HttpServletRequest request,HttpServletResponse response){
+ return TelecomsService.jsonObj;
+ }
}
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/layouts/left.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/layouts/left.jsp"
index fe34a8d..9001aa6 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/layouts/left.jsp"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/layouts/left.jsp"
@@ -21,12 +21,30 @@
</span>
</a>
<ul class="treeview-menu">
- <li><a href="${ctx }/tasks/alltasks?taskstate=0&count=1"> 浠诲姟璇︽儏</a></li>
- <li><a href="${ctx }/tasks/alltasks?taskstate=1&count=1"> 鏈畬鎴愪换鍔�</a></li>
- <li><a href="${ctx }/tasks/alltasks?taskstate=2&count=1"> 宸插畬鎴愪换鍔�</a></li><!--
+ <%-- <li><a href="${ctx }/tasks/alltasks?taskstate=0"> 浠诲姟璇︽儏</a></li> --%>
+ <li><a href="${ctx }/tasks/alltasks?taskstate=1"> 鏈畬鎴愪换鍔�</a></li>
+ <li><a href="${ctx }/tasks/alltasks?taskstate=2"> 宸插畬鎴愪换鍔�</a></li><!--
<li><a href="#"> 鏄ㄦ棩缁熻</a></li> -->
</ul>
</li>
+ <%-- <li class="treeview">
+ <a href="#">
+ <img src="${ctx }/static/images/8.png" width="20px;" height="20px;">
+ <span>涓婄墖绠＄悊</span>
+ <span class="pull-right-container">
+ <i class="fa fa-angle-left pull-right"></i>
+ </span>
+ </a>
+ <ul class="treeview-menu">
+ <li><a href="${ctx }/loadTask/loadHtml?line=1"> 涓婄墖鍙�1</a></li>
+ <li><a href="${ctx }/loadTask/loadHtml?line=2"> 涓婄墖鍙�2</a></li>
+ <li><a href="${ctx }/loadTask/loadHtml?line=3"> 涓婄墖鍙�3</a></li>
+ <li><a href="${ctx }/loadTask/loadHtml?line=4"> 涓婄墖鍙�4</a></li>
+ <li><a href="${ctx }/loadTask/loadHtml?line=5"> 涓婄墖鍙�5</a></li>
+ <li><a href="${ctx }/loadTask/loadHtml?line=6"> 涓婄墖鍙�6</a></li>
+ <li><a href="${ctx }/loadTask/loadHtml?line=7"> 涓婄墖鍙�7</a></li>
+ </ul>
+ </li> --%>
<li class="treeview">
<a href="#">
<img src="${ctx }/static/images/8.png" width="20px;" height="20px;">
@@ -39,7 +57,8 @@
<li><a href="${ctx }/Config/infomathion"> 浜や簰淇℃伅</a></li> --%>
<li><a href="${ctx }/tasks/loadrackinfo"> 涓婄墖宸ヤ綅</a></li>
<li><a href="${ctx }/tasks/loadrackinfo2"> 鍚婅宸ヤ綅</a></li>
- <li><a href="${ctx }/Config/minche"> 璁惧鐘舵��</a></li>
+ <li><a href="${ctx }/Config/minche"> 璁惧鐘舵��</a></li>
+ <%-- <li><a href="${ctx }/Config/manualOperation"> 鎵嬪姩椤甸潰</a></li> --%>
</ul>
</li>
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/alltasks/tasks2.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/alltasks/tasks2.jsp"
new file mode 100644
index 0000000..17aa66b
--- /dev/null
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/alltasks/tasks2.jsp"
@@ -0,0 +1,227 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}" />
+<html>
+<head>
+<script type="text/javascript" src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+ <script>
+ /* setInterval(function(){
+ window.location.reload();
+ },3000); */
+ <%String state = request.getParameter("taskstate");
+ String lines = request.getParameter("line");
+ if (state == null)
+ state = "null";
+ out.print("var state='" + state + "';\r\n");
+ out.print("var line='" + lines + "';\r\n");
+ %>
+ function newPage(Count) {
+ var PageHeads=document.getElementById("PageHeads").innerHTML;
+ if(PageHeads=="宸插畬鎴愪换鍔�"){
+ window.location.href="${ctx }/tasks/alltasks?taskstate=2&count="+Count+"";
+ }else if(PageHeads=="鏈畬鎴愪换鍔�"){
+ window.location.href="${ctx }/tasks/alltasks?taskstate=1&count="+Count+"";
+ }else if(PageHeads=="鍏ㄩ儴浠诲姟"){
+ window.location.href="${ctx }/tasks/alltasks?taskstate=0&count="+Count+"";
+ }
+ }
+ function checkAll() {
+ var checkedAll=document.getElementById("checkall");
+ var ischeked=false;
+ if(checkedAll.checked){
+ ischeked=true;
+ }
+ var checkboxs=document.getElementsByClassName("checkboxs");
+ for(var i=0;i<checkboxs.length;i++){
+ checkboxs[i].checked=ischeked;
+ }
+ }
+ /* 鏍囪 绫诲瀷 锛� 鐘舵�� */
+ function TaskStusts(Types,Stusts,taskstate){
+ var checkboxs=document.getElementsByClassName("checkboxs");
+ for(var i=0;i<checkboxs.length;i++){
+ var checkbox=checkboxs[i];
+ if(checkbox.checked){
+ var RowHtml=checkbox.parentNode.parentNode;
+ var TaskIdHtml=RowHtml.getElementsByClassName("OutTaskId")[0].innerHTML;
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/tasks/TaskStusts",
+ data:{
+ "Types":Types,
+ "Stusts":Stusts,
+ "TaskIdHtml":TaskIdHtml,
+ },success:function(data){
+ location.reload();
+ }
+ });
+ }
+ }
+ }
+ Initialize();
+ function Initialize(){
+ if(state=="0"||state=="1"||state=="2"){
+ loadData(state);
+ }else{
+ loadData("1");
+ }
+
+ }
+
+ function loadData(state){
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/tasks/alltasksdata",
+ data:{
+ "state":state,
+ "line":line
+ },
+ success:function(data){
+ var OutTaskshtml="";
+ var dataheml=$('#taskdata');
+ $('#taskdata').remove();
+ $('#Table_Minche').append("<tbody id='taskdata'></tbody>");
+
+ for(var i=0;i<data.length;i++){
+ var row=data[i];
+ var dataheml=$('taskdata').append();
+ if(("绛夊緟寮�濮�"==row.machineStatus||"绛夊緟閫�鍥炲簱鍖�"==row.machineStatus)&&"姝ｅ湪宸ヤ綔"==row.machineStatus){
+ OutTaskshtml+="<tr style=\"background-color:#0dc316\">";
+ }else{
+ OutTaskshtml+="<tr>";
+ }
+ OutTaskshtml+="<td style=\"text-align: center;\"><input class=\"checkboxs\" type=\"checkbox\" /></td>";
+ OutTaskshtml+="<td>"+row.id+"</td>";
+ OutTaskshtml+="<td class=\"OutTaskId\">"+row.taskId+"</td>";
+ OutTaskshtml+="<td>"+row.taskType+"</td>";
+ OutTaskshtml+="<td>"+row.mesStatus+"</td>";
+ OutTaskshtml+="<td>"+row.machineStatus+"</td>";
+ OutTaskshtml+="<td>"+row.workStatus+"</td>";
+ OutTaskshtml+="<td>"+row.infoContent+"</td>";
+ OutTaskshtml+="<td>"+row.pkgId+"</td>";
+ OutTaskshtml+="<td>"+row.stockName+"</td>";
+ OutTaskshtml+="<td>"+row.destination+"</td>";
+ OutTaskshtml+="<td>"+row.planLoadNum1+"</td>";
+ OutTaskshtml+="<td>"+row.planLoadNum2+"</td>";
+ OutTaskshtml+="<td>"+row.planLoadNum3+"</td>";
+ OutTaskshtml+="<td>"+row.stockNum+"</td>";
+ OutTaskshtml+="<td>"+row.loadeNum+"</td>";
+ OutTaskshtml+="<td>"+row.posunCount+"</td>";
+ OutTaskshtml+="<td>"+row.bb+"</td>";
+ OutTaskshtml+="<td>"+row.hh+"</td>";
+ OutTaskshtml+="<td>"+row.color+"</td>";
+ OutTaskshtml+="<td>"+row.thickness+"</td>";
+ OutTaskshtml+="<td>"+row.stockNum+"</td></tr>";
+ }
+ $('#taskdata').append(OutTaskshtml);
+ }
+ });
+ }
+ </script>
+<title>浠诲姟绠＄悊</title>
+<style type="text/css">
+*{
+ padding:0px;
+ margin:0px;
+ font-family: "microsoft yahei","Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+#Top {
+ display: block;
+ padding: 5px;
+ padding-left: 6px;
+ padding-right: 15px;
+ line-height: 22px;
+ /* border-left: 5px solid #15c142; */
+ border-radius: 0 2px 2px 0;
+ background-color: #f2f2f2;
+}
+.btn{
+ height:35px;
+ line-height:35px;
+ background-color: #0dc316;
+ padding:0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+.Rowbtn{
+ height:20px;
+ line-height:20px;
+ background-color: #0dc316;
+ padding:0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+#Table_Minche thead tr{
+ background-color:#00BFFF;
+ font-weight:800;
+}
+#Table_Minche thead td{
+ border:1px solid #00BFFF;
+}
+#Table_Minche td{
+ border:1px solid #f2f2f2;
+ height:20px;
+ line-height:20px;
+ padding:3px 6px 3px 6px;
+}
+</style>
+</head>
+<body>
+ <div class="content-wrapper" style="background-color: white;">
+<!-- <section class="content-header"></section> -->
+ <section class="content container-fluid">
+ <div id="Top"><!--
+ <button class="btn" onclick="TaskStusts('Pai','涓婄墖浠诲姟宸插紑濮�')">涓婄墖浠诲姟宸插紑濮�</button> -->
+ <button class="btn" onclick="TaskStusts('MES','绛夊緟寮�濮�')">绛夊緟寮�濮�</button>
+ <!-- <button class="btn" onclick="taskurl('閾佹灦宸插埌浜屾鎺ュ姏')">閾佹灦宸插埌浜屾鎺ュ姏</button>
+ <button class="btn" onclick="taskurl('閾佹灦宸插埌鍚婅浣�')">閾佹灦宸插埌鍚婅浣�</button>
+ <button class="btn" onclick="taskurl('閾佹灦宸插埌涓婄墖浣�')">閾佹灦宸插埌涓婄墖浣�</button>
+ <button class="btn" onclick="taskurl('涓婄墖瀹屾垚璇锋眰閫�鍥�')">涓婄墖瀹屾垚璇锋眰閫�鍥�</button>
+ <button class="btn" onclick="taskurl('涓婄墖瀹屾垚鍏佽閫�鍥�')">涓婄墖瀹屾垚鍏佽閫�鍥�</button>
+ <button class="btn" onclick="taskurl('鍚婅瀹屾垚璇锋眰閫�鍥�')">鍚婅瀹屾垚鍏佽閫�鍥�</button>-->
+ <button class="btn" onclick="TaskStusts('MES','浠诲姟瀹屾垚')">浠诲姟瀹屾垚</button>
+ <button class="btn" onclick="TaskStusts('Pai','娲惧皵纭浠诲姟瀹屾垚')">娲惧皵纭浠诲姟瀹屾垚</button>
+ </div>
+ <div>
+ <div id="PageHeads" style="text-align: center;background-color:#0dc316;color:white;font-size:25px; line-height: 50px;height: 50px;">${PageHeads}</div>
+ <table id="Table_Minche" style="width: 100%; border-collapse: collapse;min-width:1200px; border-spacing: 0;">
+ <thead>
+ <tr>
+ <td style="text-align: center;"><input id="checkall" onclick="checkAll()" type="checkbox" /></td>
+ <td>ID</td>
+ <td>浠诲姟ID</td>
+ <td>浠诲姟绫诲瀷</td>
+ <td>娲惧皵鐘舵��</td>
+ <td>MES鐘舵��</td>
+ <td>宸ヤ綔鐘舵��</td>
+ <td>鎻愮ず淇℃伅</td>
+ <td>鍘熺墖鍖匢D</td>
+ <td>閾佹灦鍙�</td>
+ <td>鐩殑鍦�</td>
+ <td>璁″垝涓婄墖鏁伴噺1</td>
+ <td>璁″垝涓婄墖鏁伴噺2</td>
+ <td>璁″垝涓婄墖鏁伴噺3</td>
+ <td>鏋朵笂鎬绘暟閲�</td>
+ <td>宸蹭笂鐗囨暟閲�</td>
+ <td>鐮存崯鏁伴噺</td>
+ <td>鍘熺墖瀹�</td>
+ <td>鍘熺墖楂�</td>
+ <td>鍘熺墖棰滆壊</td>
+ <td>鍘熺墖鍘氬害</td>
+ <td>鍘熺墖鏁伴噺</td>
+ </tr>
+ </thead>
+ <tbody id="taskdata"></tbody>
+ </table>
+ </div><!--
+ <div style="text-align: center;margin-top:50px;"></div> -->
+ </section>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/manualOperation.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/manualOperation.jsp"
new file mode 100644
index 0000000..f455c78
--- /dev/null
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/manualOperation.jsp"
@@ -0,0 +1,325 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}" />
+<html>
+<head>
+
+<title>鎵嬪姩椤甸潰</title>
+<style type="text/css">
+* {
+ padding: 0px;
+ margin: 0px;
+ font-family: "microsoft yahei", "Helvetica Neue", Helvetica, Arial,
+ sans-serif;
+}
+#Top {
+ display: block;
+ margin-bottom: 10px;
+ padding: 5px;
+ padding-left: 6px;
+ padding-right: 15px;
+ line-height: 22px;
+ border-radius: 0 2px 2px 0;
+ background-color: #f2f2f2;
+}
+
+.btn {
+ height: 35px;
+ line-height: 35px;
+ background-color: #0dc316;
+ padding: 0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+
+table thead tr {
+ background-color: #f2f2f2;
+}
+
+table {
+ width: 100%;
+ border-collapse: collapse;
+ text-align:center;
+}
+
+table th {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+ text-align:center;
+}
+
+.One td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+}
+
+.two td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+}
+</style>
+<script type="text/javascript" src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+<script>
+
+/*寮圭獥-鎵嬪姩娣诲姞*/
+function modifyraw(){
+ $("#add-fix-info").modal('show');
+ initializeData();
+}
+/*鍒濆鍖栧姞杞借〃鏍�*/
+initialize();
+function initialize(){
+ initializeTable();
+}
+function initializeData(){
+ $('#station').empty();
+ var row="<tr><td>1</td>";
+ var stationOption="";
+ for(var i = 1; i < 10; i++){
+ stationOption+="<option value='"+i+"'>"+i+" 鍙峰簱浣�</option>";
+ }
+ for(var i=1101;i<=1114;i++){
+ stationOption+="<option value='"+i+"'>"+i+" 鍙蜂笂鐗囦綅</option>";
+ }
+ for(var i=990;i<=993;i++){
+ stationOption+="<option value='"+i+"'>"+i+" 鍙峰悐瑁呬綅</option>";
+ }
+
+ row+="<td><select name='start'>"+stationOption+"</select></td>"+
+ "<td><select name='end'>"+stationOption+"</select></td></tr>";
+ $('#station').append(row);
+}
+var Tb={
+ id:"tb1",
+ style:"margin-top: 20px;",
+ className:null,
+ positionId:"contents",
+ columns:[
+ {
+ text:"浠诲姟椤哄簭",
+ calssName:"id",
+ index:0
+ },
+ {
+ text:"ID",
+ calssName:"id",
+ index:1
+ },
+ {
+ text:"璧峰鍦板潃",
+ calssName:"stockName",
+ index:2
+ },
+ {
+ text:"鐩殑鍦板潃",
+ calssName:"destination",
+ index:3
+ },
+ {
+ text:"鏂欐灦鍙�",
+ calssName:"stockName",
+ index:4
+ },
+ {
+ text:"浠诲姟绫诲瀷",
+ calssName:"taskType",
+ index:5
+ },
+ {
+ text:"鎿嶄綔",
+ calssName:"",
+ index:6
+ }
+ ]
+}
+function createTable(model,data){
+ var columns=model.columns;
+ var positionid=model.positionId;
+ var position=document.getElementById(positionid);
+ var tablehtml=document.createElement("table");
+ console.log(data[0]);
+ console.log(data[0][columns[0].calssName]);
+ tablehtml.style=model.style;
+ //澶撮儴
+ var theadhtml=document.createElement("thead");
+ var thRowhtml=document.createElement("tr");
+ for(var thj = 0; thj < columns.length; thj++){
+ var thColhtml=document.createElement("th");
+ var thtext=document.createTextNode(columns[thj].text);
+ thColhtml.appendChild(thtext);
+ thRowhtml.appendChild(thColhtml);
+ }
+ theadhtml.appendChild(thRowhtml);
+ //鍐呭
+ var tbodyhtml=document.createElement("tbody");
+ for(var i = 0; i < data.length; i++){
+ var row=data[i];
+ var rowhtml=document.createElement("tr");
+ for(var j = 0; j < columns.length; j++){
+ var colhtml=document.createElement("td");
+ var text=document.createTextNode("");
+ if(!(columns[j].calssName==null||columns[j].calssName=="")){
+ text=document.createTextNode(row[columns[j].calssName]);
+ }
+ colhtml.appendChild(text);
+ rowhtml.appendChild(colhtml);
+ }
+ tbodyhtml.appendChild(rowhtml);
+ }
+ console.log(tablehtml);
+ tablehtml.appendChild(theadhtml);
+ tablehtml.appendChild(tbodyhtml);
+ position.appendChild(tablehtml);
+}
+function initializeTable(){
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/Config/selectOutTasks",
+ success:function(data){
+ console.log(data);
+ console.log(data[0][0]);
+ /* for(var i = 0; i < data.length; i++){
+ data[i][0]
+ }
+ createTable(Tb,data); */
+
+ }
+ });
+}
+function initializeTable2(){
+ //$('#OneContent').empty();
+ /* var tablehteml="<table class='One'><thead><tr><th>浠诲姟椤哄簭</th><th>ID</th><th>璧峰鍦板潃</th><th>鐩殑鍦板潃</th><th>鏂欐灦鍙�</th><th>浠诲姟绫诲瀷</th><th>鎿嶄綔</th></tr></thead>";
+ tablehteml+="<tbody id='station'></tbody>";
+ $('#Content').append(tablehteml); */
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/Config/selectOutTasks",
+ success:function(data){
+ console.log(data);
+ var html="";
+ for(var i = 0; i < data.length; i++){
+ var row=data[i];
+ html+="<tr>";
+ html+="<td>"+(i+1)+"</td>";
+ html+="<td class='taskid'>"+row.id+"</td>";
+ html+="<td>"+row.stockName+"</td>";
+ html+="<td>"+row.destination+row.rackNumber+"</td>";
+ html+="<td>"+row.stockName+"</td>";
+ html+="<td>"+row.taskType+"</td>";
+ html+="<td>";
+ html+="<button class='btn btn-default btn-lg' style='margin-right:10px;' onclick='taskCancel(this)'>澶辫触</button>";
+ html+="<button class='btn btn-default btn-lg' style='margin-right:10px;' onclick='taskCancel(this)'>瀹屾垚</button>";
+ html+="<button class='btn btn-default btn-lg' style='margin-right:10px;' onclick='taskCancel(this)'>鍙栨秷</button>";
+ html+="</td>";
+ html+="</tr>";
+ }
+ $('#OneContent').append(html);
+ }
+ });
+}
+/*鎿嶄綔銆愬彇娑�/閲嶆柊鍙戦��/瀹屾垚銆�*/
+function taskCancel(oneself){
+ var Controls=oneself.innerHTML;
+ var row=oneself.parentNode.parentNode;
+ var taskid=row.getElementsByClassName("taskid")[0].innerHTML;
+ console.log(Controls);
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/Config/updateTask",
+ data:{
+ "taskid":taskid,
+ "Controls":Controls
+ },success:function(data){
+ // 鍒锋柊褰撳墠椤甸潰
+
+ //window.location.href="${ctx }/Config/updateTask;";
+ }
+ });
+ location.reload();
+}
+</script>
+</head>
+<body>
+ <div class="content-wrapper" style="background-color: white;">
+ <section class="content-header">
+ <div id="Top">
+ <!-- <button class="btn" style="background-color: #fd5f56;" onclick="delAll()">鎵归噺鍒犻櫎</button> -->
+ <button class="btn" onclick="modifyraw()">娣诲姞鎵嬪姩浠诲姟</button>
+ <span style="float: right; line-height: 40px"></span>
+ </div>
+ <div class="modal fade" id="add-fix-info" tabindex="-1" role="dialog"
+ aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-dialog" style="width: 100%; height: 100%;">
+ <div class="modal-content"
+ style="width: 1000px; margin: auto;">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal"
+ aria-hidden="true" data-backdrop="static">×</button>
+ <h3 class="modal-title" id="myModalLabel" style="font-weight: bolder;">娣诲姞鎵嬪姩浠诲姟</h3>
+ </div>
+ <!--鎻愪氦-->
+ <form class="form-horizontal" role="form" id="category_add" action="${ctx}/Config/addTask" method="post">
+ <div style="margin-top: 20px;">
+ <!-- 鏈哄櫒閫昏緫閰嶇疆娣诲姞 -->
+ <table class="two" id="addManualOperation">
+ <thead>
+ <tr>
+ <th>搴忓彿</th>
+ <th>璧峰鍦板潃</th>
+ <th>鐩爣鍦板潃</th>
+ <!-- <th>鎿嶄綔</th> -->
+ </tr>
+ </thead>
+ <tbody id="station">
+
+ </tbody>
+
+ </table>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default btn-lg" data-dismiss="modal">鍏抽棴</button>
+ <button type="submit" class="btn btn-primary btn-lg" id="addbtnsubmit">鎻愪氦</button>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </section>
+
+ <section class="content container-fluid">
+ <div id="contents">
+ <!-- <table class="One">
+ <thead>
+ <tr>
+ <th>浠诲姟椤哄簭</th>
+ <th>ID</th>
+ <th>璧峰鍦板潃</th>
+ <th>鐩殑鍦板潃</th>
+ <th>鏂欐灦鍙�</th>
+ <th>浠诲姟绫诲瀷</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id='OneContent'>
+
+ </tbody> -->
+
+ </table>
+ </div>
+ </section>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/minche.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/minche.jsp"
index e1a9c82..869d5e5 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/minche.jsp"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/minche.jsp"
@@ -36,28 +36,65 @@
#Table_Minche thead tr {
background-color: #00BFFF;
- font-weight:800;
+ font-weight: 800;
}
-#Table_Minche thead td{
- border:1px solid #00BFFF;
+
+#Table_Minche thead td {
+ border: 1px solid #00BFFF;
padding: 5px 10px 5px 10px;
}
+
#Table_Minche td {
border: 1px solid #f2f2f2;
height: 20px;
line-height: 20px;
- text-align:center;
+ text-align: center;
padding: 2px 10px 2px 10px;
}
+
+.two thead tr {
+ background-color: #f2f2f2;
+}
+
+.two {
+ width: 100%;
+ border-collapse: collapse;
+ text-align:center;
+}
+
+.two th {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+ text-align:center;
+}
+
+.two td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+}
</style>
-<script type="text/javascript" src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+<script type="text/javascript"
+ src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
<script>
- setInterval(function(){
- window.location.reload();
- },3000);
+ //鍚姩瀹氭椂鍣�,func鏄弬鏁帮紝鎵�浠ヤ笉鑳戒娇鐢ㄦ嫭鍙�
+ var interval = setInterval(func,3000); //鍚姩,func涓嶈兘浣跨敤鎷彿
+
+
+ function func(){
+ window.location.reload();
+ }
+ function start(){
+ //閲嶆柊鍚姩
+ interval = setInterval(func, 3000);
+ }
function modifyraw(){
- disableAutoRefresh()
- $("#add-fix-info").modal('show');
+ // 鍋滄瀹氭椂鍣�
+ clearInterval(interval);
+ $("#add-fix-info").modal('show');
}
function checkAll() {
var checkedAll=document.getElementById("checkall");
@@ -92,34 +129,75 @@
}
}
</script>
+
</head>
<body>
+
<div class="content-wrapper" style="background-color: white;">
- <!-- 鍐呭 -->
+
<section class="content container-fluid">
<div>
- <table id="Table_Minche" style="width: 100%;min-width:1200px; border-collapse: collapse; border-spacing: 0;">
+ <button class="btn" onclick="modifyraw()">浠撳偍浠诲姟</button>
+ <table id="Table_Minche"
+ style="width: 100%; min-width: 1200px; border-collapse: collapse; border-spacing: 0;">
<thead>
<tr>
<td>ID</td>
<td>鏈哄櫒鍚嶇О</td>
- <td>浠诲姟ID</td>
+ <td>浠诲姟ID</td>
<td>閾佹灦鍙�</td>
<td>娲惧皵鐘舵��</td>
- <td>MES鐘舵��</td>
- <td>宸ヤ綔鐘舵��</td>
+ <td>MES鐘舵��</td>
+ <td>宸ヤ綔鐘舵��</td>
<td>鏈哄櫒鐘舵��</td>
<td>绛夊緟鏁伴噺</td>
<td>鎶ヨ淇℃伅</td>
- <td style="width:200px;">鎿嶄綔</td>
+ <td style="width: 200px;">鎿嶄綔</td>
</tr>
</thead>
- <tbody>
- ${MachineOutTaskhtmls}
+ <tbody>${MachineOutTaskhtmls}
</tbody>
</table>
+ </div>
+
+ <div class="modal fade" id="add-fix-info" tabindex="-1" role="dialog"
+ aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-dialog" style="width: 100%; height: 100%;">
+ <div class="modal-content"
+ style="width: 1000px; margin: auto;">
+ <div class="modal-header">
+ <button type="button" class="close" onclick="start()" data-dismiss="modal"
+ aria-hidden="true" data-backdrop="static">×</button>
+ <h3 class="modal-title" id="myModalLabel" style="font-weight: bolder;">浠撳偍寰呮墽琛屼换鍔�</h3>
+ </div>
+ <!--鎻愪氦-->
+ <form class="form-horizontal" role="form" id="category_add" action="${ctx}/Config/addTask" method="post">
+ <div style="margin-top: 20px;">
+ <!-- 浠诲姟鏄剧ず -->
+ <table class="two" id="addManualOperation">
+ <thead>
+ <tr>
+ <th>浠诲姟ID</th>
+ <th>鏂欐灦鍙�</th>
+ <th>鐩殑绾胯矾</th>
+ <th>鐩爣宸ヤ綅</th>
+ <th>璁″垝涓婄墖鏁伴噺</th>
+ <th>鏂欐灦涓婄幓鐠冩暟閲�</th>
+ <th>绫诲瀷</th>
+ <!-- <th>鎿嶄綔</th> -->
+ </tr>
+ </thead>
+ <tbody>${outTasksTasks}
+ </tbody>
+ </table>
+ </div>
+
+ </form>
+ </div>
+ </div>
</div>
</section>
</div>
</body>
+
</html>
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/taskInfos.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/taskInfos.jsp"
new file mode 100644
index 0000000..75609fc
--- /dev/null
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/configuration/taskInfos.jsp"
@@ -0,0 +1,325 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}" />
+<html>
+<head>
+
+<title></title>
+<style type="text/css">
+* {
+ padding: 0px;
+ margin: 0px;
+ font-family: "microsoft yahei", "Helvetica Neue", Helvetica, Arial,
+ sans-serif;
+}
+#Top {
+ display: block;
+ margin-bottom: 10px;
+ padding: 5px;
+ padding-left: 6px;
+ padding-right: 15px;
+ line-height: 22px;
+ border-radius: 0 2px 2px 0;
+ background-color: #f2f2f2;
+}
+
+.btn {
+ height: 35px;
+ line-height: 35px;
+ background-color: #0dc316;
+ padding: 0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+
+table thead tr {
+ background-color: #f2f2f2;
+}
+
+table {
+ width: 100%;
+ border-collapse: collapse;
+ text-align:center;
+}
+
+table th {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+ text-align:center;
+}
+
+.One td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+}
+
+.two td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+}
+</style>
+<script type="text/javascript" src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+<script>
+
+/*寮圭獥-鎵嬪姩娣诲姞*/
+function modifyraw(){
+ $("#add-fix-info").modal('show');
+ initializeData();
+}
+/*鍒濆鍖栧姞杞借〃鏍�*/
+initialize();
+function initialize(){
+ initializeTable();
+}
+function initializeData(){
+ $('#station').empty();
+ var row="<tr><td>1</td>";
+ var stationOption="";
+ for(var i = 1; i < 10; i++){
+ stationOption+="<option value='"+i+"'>"+i+" 鍙峰簱浣�</option>";
+ }
+ for(var i=1101;i<=1114;i++){
+ stationOption+="<option value='"+i+"'>"+i+" 鍙蜂笂鐗囦綅</option>";
+ }
+ for(var i=990;i<=993;i++){
+ stationOption+="<option value='"+i+"'>"+i+" 鍙峰悐瑁呬綅</option>";
+ }
+
+ row+="<td><select name='start'>"+stationOption+"</select></td>"+
+ "<td><select name='end'>"+stationOption+"</select></td></tr>";
+ $('#station').append(row);
+}
+var Tb={
+ id:"tb1",
+ style:"margin-top: 20px;",
+ className:null,
+ positionId:"contents",
+ columns:[
+ {
+ text:"浠诲姟椤哄簭",
+ calssName:"id",
+ index:0
+ },
+ {
+ text:"ID",
+ calssName:"id",
+ index:1
+ },
+ {
+ text:"璧峰鍦板潃",
+ calssName:"stockName",
+ index:2
+ },
+ {
+ text:"鐩殑鍦板潃",
+ calssName:"destination",
+ index:3
+ },
+ {
+ text:"鏂欐灦鍙�",
+ calssName:"stockName",
+ index:4
+ },
+ {
+ text:"浠诲姟绫诲瀷",
+ calssName:"taskType",
+ index:5
+ },
+ {
+ text:"鎿嶄綔",
+ calssName:"",
+ index:6
+ }
+ ]
+}
+function createTable(model,data){
+ var columns=model.columns;
+ var positionid=model.positionId;
+ var position=document.getElementById(positionid);
+ var tablehtml=document.createElement("table");
+ console.log(data[0]);
+ console.log(data[0][columns[0].calssName]);
+ tablehtml.style=model.style;
+ //澶撮儴
+ var theadhtml=document.createElement("thead");
+ var thRowhtml=document.createElement("tr");
+ for(var thj = 0; thj < columns.length; thj++){
+ var thColhtml=document.createElement("th");
+ var thtext=document.createTextNode(columns[thj].text);
+ thColhtml.appendChild(thtext);
+ thRowhtml.appendChild(thColhtml);
+ }
+ theadhtml.appendChild(thRowhtml);
+ //鍐呭
+ var tbodyhtml=document.createElement("tbody");
+ for(var i = 0; i < data.length; i++){
+ var row=data[i];
+ var rowhtml=document.createElement("tr");
+ for(var j = 0; j < columns.length; j++){
+ var colhtml=document.createElement("td");
+ var text=document.createTextNode("");
+ if(!(columns[j].calssName==null||columns[j].calssName=="")){
+ text=document.createTextNode(row[columns[j].calssName]);
+ }
+ colhtml.appendChild(text);
+ rowhtml.appendChild(colhtml);
+ }
+ tbodyhtml.appendChild(rowhtml);
+ }
+ console.log(tablehtml);
+ tablehtml.appendChild(theadhtml);
+ tablehtml.appendChild(tbodyhtml);
+ position.appendChild(tablehtml);
+}
+function initializeTable(){
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/Config/selectOutTasks",
+ success:function(data){
+ console.log(data);
+ console.log(data[0][0]);
+ /* for(var i = 0; i < data.length; i++){
+ data[i][0]
+ }
+ createTable(Tb,data); */
+
+ }
+ });
+}
+function initializeTable2(){
+ //$('#OneContent').empty();
+ /* var tablehteml="<table class='One'><thead><tr><th>浠诲姟椤哄簭</th><th>ID</th><th>璧峰鍦板潃</th><th>鐩殑鍦板潃</th><th>鏂欐灦鍙�</th><th>浠诲姟绫诲瀷</th><th>鎿嶄綔</th></tr></thead>";
+ tablehteml+="<tbody id='station'></tbody>";
+ $('#Content').append(tablehteml); */
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/Config/selectOutTasks",
+ success:function(data){
+ console.log(data);
+ var html="";
+ for(var i = 0; i < data.length; i++){
+ var row=data[i];
+ html+="<tr>";
+ html+="<td>"+(i+1)+"</td>";
+ html+="<td class='taskid'>"+row.id+"</td>";
+ html+="<td>"+row.stockName+"</td>";
+ html+="<td>"+row.destination+row.rackNumber+"</td>";
+ html+="<td>"+row.stockName+"</td>";
+ html+="<td>"+row.taskType+"</td>";
+ html+="<td>";
+ html+="<button class='btn btn-default btn-lg' style='margin-right:10px;' onclick='taskCancel(this)'>澶辫触</button>";
+ html+="<button class='btn btn-default btn-lg' style='margin-right:10px;' onclick='taskCancel(this)'>瀹屾垚</button>";
+ html+="<button class='btn btn-default btn-lg' style='margin-right:10px;' onclick='taskCancel(this)'>鍙栨秷</button>";
+ html+="</td>";
+ html+="</tr>";
+ }
+ $('#OneContent').append(html);
+ }
+ });
+}
+/*鎿嶄綔銆愬彇娑�/閲嶆柊鍙戦��/瀹屾垚銆�*/
+function taskCancel(oneself){
+ var Controls=oneself.innerHTML;
+ var row=oneself.parentNode.parentNode;
+ var taskid=row.getElementsByClassName("taskid")[0].innerHTML;
+ console.log(Controls);
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/Config/updateTask",
+ data:{
+ "taskid":taskid,
+ "Controls":Controls
+ },success:function(data){
+ // 鍒锋柊褰撳墠椤甸潰
+
+ //window.location.href="${ctx }/Config/updateTask;";
+ }
+ });
+ location.reload();
+}
+</script>
+</head>
+<body>
+ <div class="content-wrapper" style="background-color: white;">
+ <section class="content-header">
+ <div id="Top">
+ <!-- <button class="btn" style="background-color: #fd5f56;" onclick="delAll()">鎵归噺鍒犻櫎</button> -->
+ <button class="btn" onclick="modifyraw()">娣诲姞鎵嬪姩浠诲姟</button>
+ <span style="float: right; line-height: 40px"></span>
+ </div>
+ <div class="modal fade" id="add-fix-info" tabindex="-1" role="dialog"
+ aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-dialog" style="width: 100%; height: 100%;">
+ <div class="modal-content"
+ style="width: 1000px; margin: auto;">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal"
+ aria-hidden="true" data-backdrop="static">×</button>
+ <h3 class="modal-title" id="myModalLabel" style="font-weight: bolder;">娣诲姞鎵嬪姩浠诲姟</h3>
+ </div>
+ <!--鎻愪氦-->
+ <form class="form-horizontal" role="form" id="category_add" action="${ctx}/Config/addTask" method="post">
+ <div style="margin-top: 20px;">
+ <!-- 鏈哄櫒閫昏緫閰嶇疆娣诲姞 -->
+ <table class="two" id="addManualOperation">
+ <thead>
+ <tr>
+ <th>搴忓彿</th>
+ <th>璧峰鍦板潃</th>
+ <th>鐩爣鍦板潃</th>
+ <!-- <th>鎿嶄綔</th> -->
+ </tr>
+ </thead>
+ <tbody id="station">
+
+ </tbody>
+
+ </table>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default btn-lg" data-dismiss="modal">鍏抽棴</button>
+ <button type="submit" class="btn btn-primary btn-lg" id="addbtnsubmit">鎻愪氦</button>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </section>
+
+ <section class="content container-fluid">
+ <div id="contents">
+ <!-- <table class="One">
+ <thead>
+ <tr>
+ <th>浠诲姟椤哄簭</th>
+ <th>ID</th>
+ <th>璧峰鍦板潃</th>
+ <th>鐩殑鍦板潃</th>
+ <th>鏂欐灦鍙�</th>
+ <th>浠诲姟绫诲瀷</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id='OneContent'>
+
+ </tbody> -->
+
+ </table>
+ </div>
+ </section>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/loadtask/loadMachine.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/loadtask/loadMachine.jsp"
new file mode 100644
index 0000000..8c3766d
--- /dev/null
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/loadtask/loadMachine.jsp"
@@ -0,0 +1,391 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}" />
+<html>
+<head>
+
+<script type="text/javascript"
+ src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+<script>
+ /* setInterval(function(){
+ window.location.reload();
+ },3000); */
+<%String state = request.getParameter("taskstate");
+ String lines = request.getParameter("line");
+ if (state == null)
+ state = "null";
+ out.print("var state='" + state + "';\r\n");
+ out.print("var line='" + lines + "';\r\n");%>
+ function checkAll() {
+ var checkedAll = document.getElementsByClassName("checkall")[0];
+ var ischeked = false;
+ if (checkedAll.checked) {
+ ischeked = true;
+ }
+ var checkboxs = document.getElementById(tablename).getElementsByClassName("checkboxs");
+ for (var i = 0; i < checkboxs.length; i++) {
+ checkboxs[i].checked = ischeked;
+ }
+ }
+ function loadcheckAll() {
+ var checkedAll = document.getElementsByClassName("loadcheckall")[0];
+ var ischeked = false;
+ if (checkedAll.checked) {
+ ischeked = true;
+ }
+ var checkboxs = document.getElementById(tablename).getElementsByClassName("loadcheckboxs");
+ for (var i = 0; i < checkboxs.length; i++) {
+ checkboxs[i].checked = ischeked;
+ }
+ }
+ /*淇敼淇濆瓨 */
+
+ function Updates(){
+ var checkboxs=document.getElementsByClassName("loadcheckboxs");
+/* var RowHtml="";
+ var RackIdHtml="";
+ var TaskIdHtml=""; */
+ for(var i=0;i<checkboxs.length;i++){
+ var checkbox=checkboxs[i];
+ if(checkbox.checked){
+ var RowHtml=checkbox.parentNode.parentNode;
+ var RackIdHtml=RowHtml.getElementsByClassName("RackId")[0].innerHTML;
+ var TaskIdHtml=RowHtml.getElementsByClassName("OutTaskId")[0].value;
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/tasks/Updates",
+ data:{
+ "RackId":RackIdHtml,
+ "TaskIdHtml":TaskIdHtml,
+ },success:function(data){
+ window.location.href="${ctx }/loadTask/loadHtml?line="+line;
+ }
+ });
+ break;
+ }
+ }
+ }
+ /* 鏍囪 绫诲瀷 锛� 鐘舵�� */
+ function TaskStusts(Stusts) {
+ var table=document.getElementById("Table_Minche");
+ var checkboxs = table.getElementsByClassName("checkboxs");
+ for (var i = 0; i < checkboxs.length; i++) {
+ var checkbox = checkboxs[i];
+ if (checkbox.checked) {
+ var RowHtml = checkbox.parentNode.parentNode;
+ var TaskIdHtml = RowHtml.getElementsByClassName("OutTaskId")[0].innerHTML;
+ $.ajax({
+ cache : false,
+ type : "POST",
+ dataType : "json",
+ url : "${ctx}/loadTask/updateTask",
+ data : {
+ "Stusts" : Stusts,
+ "TaskIdHtml" : TaskIdHtml,
+ },
+ success : function(data) {
+ window.location.href="${ctx }/loadTask/loadHtml?line="+line;
+ //console.log(data);
+ /* location.reload(); */
+ }
+ });
+ }
+ }
+
+ }
+ /* 鏍囪 绫诲瀷 锛� 鐘舵�� */
+ function loadTaskStusts(Stusts) {
+ var table=document.getElementById("Table_Load");
+ var checkboxs = table.getElementsByClassName("checkboxs");
+ for (var i = 0; i < checkboxs.length; i++) {
+ var checkbox = checkboxs[i];
+ if (checkbox.checked) {
+ var RowHtml = checkbox.parentNode.parentNode;
+ var TaskIdHtml = RowHtml.getElementsByClassName("OutTaskId")[0].value;
+ $.ajax({
+ cache : false,
+ type : "POST",
+ dataType : "json",
+ url : "${ctx}/loadTask/updateTask",
+ data : {
+ "Stusts" : Stusts,
+ "TaskIdHtml" : TaskIdHtml,
+ },
+ success : function(data) {
+ window.location.href="${ctx }/loadTask/loadHtml?line="+line;
+ //console.log(data);
+ /* location.reload(); */
+ }
+ });
+ }
+ }
+
+ }
+ Initialize();
+ function Initialize() {
+
+ loadData();
+ loadDataRack();
+ }
+ function loadDataRack() {
+ $.ajax({
+ cache : false,
+ type : "POST",
+ dataType : "json",
+ url : "${ctx}/loadTask/loadRackLine",
+ data : {
+ "line" : line
+ },
+ success : function(data) {
+ console.log(data);
+ var LoadRackshtml = "";
+ $('#loaddata').remove();
+ $('#Table_Load').append("<tbody id='loaddata'></tbody>");
+ for (var i = 0; i < data.length; i++) {
+ var row = data[i];
+
+ LoadRackshtml+="<tr><td style=\"text-align: center;\"><input class=\"loadcheckboxs\" type=\"checkbox\" /></td>";
+ LoadRackshtml+="<td class=\"RackId\">"+row.id+"</td>";
+ if(row.id%2!=0){
+ LoadRackshtml+="<td rowspan='2'>"+row.rackName+"</td>";
+ LoadRackshtml+="<td rowspan='2'>"+row.machineLoad.workState+"</td>";
+ }
+ LoadRackshtml+="<td>"+row.number+"</td>";
+ LoadRackshtml+="<td>"+row.state+"</td>";
+ if(row.outTasks==undefined||row.outTasks==null){
+ LoadRackshtml+="<td><input style=\"width:70px;\" class=\"OutTaskId\" type=\"text\" value=''/></td>";
+ LoadRackshtml+="<td></td>";
+ LoadRackshtml+="<td></td>";
+ LoadRackshtml+="<td style=\"width:100px;\"></td>";
+ LoadRackshtml+="<td style=\"width:100px;\"></td>";
+ LoadRackshtml+="<td></td>";
+ LoadRackshtml+="<td></td>";
+ }else{
+ LoadRackshtml+="<td><input style=\"width:70px;\" class=\"OutTaskId\" type=\"text\" value='"+row.outTasks.taskId+"'/></td>";
+ LoadRackshtml+="<td>"+row.outTasks.stockName+"</td>";
+ LoadRackshtml+="<td>"+(row.outTasks.planLoadNum1+row.outTasks.planLoadNum2+row.outTasks.planLoadNum3)+"</td>";
+ LoadRackshtml+="<td style=\"width:100px;\">"+row.outTasks.stockNum+"</td>";
+ LoadRackshtml+="<td style=\"width:100px;\">"+row.outTasks.posunCount+"</td>";
+ LoadRackshtml+="<td>"+row.outTasks.machineStatus+"</td>";
+ LoadRackshtml+="<td>"+row.outTasks.workStatus+"</td>";
+ }
+
+ LoadRackshtml+="<td>"+"</td>";
+ LoadRackshtml+="<td>"+"</td>"
+ + "</tr>";
+ }
+ $('#loaddata').append(LoadRackshtml);
+ }
+ });
+}
+ function loadData() {
+ $.ajax({
+ cache : false,
+ type : "POST",
+ dataType : "json",
+ url : "${ctx}/loadTask/notFinshTask",
+ data : {
+ "line" : line
+ },
+ success : function(data) {
+ console.log(data);
+ var OutTaskshtml = "";
+ $('#taskdata').remove();
+ $('#Table_Minche').append(
+ "<tbody id='taskdata'></tbody>");
+
+ for (var i = 0; i < data.length; i++) {
+ var row = data[i];
+ if (("绛夊緟寮�濮�" == row.machineStatus || "绛夊緟閫�鍥炲簱鍖�" == row.machineStatus)
+ && "姝ｅ湪宸ヤ綔" == row.machineStatus) {
+ OutTaskshtml += "<tr style=\"background-color:#0dc316\">";
+ } else {
+ OutTaskshtml += "<tr>";
+ }
+ OutTaskshtml += "<td style=\"text-align: center;\"><input class=\"checkboxs\" type=\"checkbox\" /></td>";
+ OutTaskshtml += "<td>" + row.id + "</td>";
+ OutTaskshtml += "<td class=\"OutTaskId\">"
+ + row.taskId + "</td>";
+ OutTaskshtml += "<td>" + row.taskType + "</td>";
+ OutTaskshtml += "<td>" + row.mesStatus + "</td>";
+ OutTaskshtml += "<td>" + row.machineStatus
+ + "</td>";
+ OutTaskshtml += "<td>" + row.workStatus + "</td>";
+ OutTaskshtml += "<td>" + row.infoContent + "</td>";
+ OutTaskshtml += "<td>" + row.pkgId + "</td>";
+ OutTaskshtml += "<td>" + row.stockName + "</td>";
+ OutTaskshtml += "<td>" + row.destination + "</td>";
+ OutTaskshtml += "<td>" + row.planLoadNum1 + "</td>";
+ OutTaskshtml += "<td>" + row.planLoadNum2 + "</td>";
+ OutTaskshtml += "<td>" + row.planLoadNum3 + "</td>";
+ OutTaskshtml += "<td>" + row.stockNum + "</td>";
+ OutTaskshtml += "<td>" + row.loadeNum + "</td>";
+ OutTaskshtml += "<td>" + row.posunCount + "</td>";
+ OutTaskshtml += "<td>" + row.bb + "</td>";
+ OutTaskshtml += "<td>" + row.hh + "</td>";
+ OutTaskshtml += "<td>" + row.color + "</td>";
+ OutTaskshtml += "<td>" + row.thickness + "</td>";
+ OutTaskshtml += "<td>" + row.stockNum
+ + "</td></tr>";
+ }
+ $('#taskdata').append(OutTaskshtml);
+ }
+ });
+ }
+</script>
+<title>涓婄墖浠诲姟绠＄悊</title>
+<style type="text/css">
+* {
+ padding: 0px;
+ margin: 0px;
+ font-family: "microsoft yahei", "Helvetica Neue", Helvetica, Arial,
+ sans-serif;
+}
+
+#Top {
+ display: block;
+ padding: 5px;
+ padding-left: 6px;
+ padding-right: 15px;
+ line-height: 22px;
+ /* border-left: 5px solid #15c142; */
+ border-radius: 0 2px 2px 0;
+ background-color: #f2f2f2;
+}
+
+.btn {
+ height: 35px;
+ line-height: 35px;
+ background-color: #0dc316;
+ padding: 0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+
+.Rowbtn {
+ height: 20px;
+ line-height: 20px;
+ background-color: #0dc316;
+ padding: 0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+
+#Table_Minche thead tr {
+ background-color: #00BFFF;
+ font-weight: 800;
+}
+
+#Table_Minche thead td {
+ border: 1px solid #00BFFF;
+}
+
+#Table_Minche td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 3px 6px 3px 6px;
+}
+
+.dtable thead tr {
+ background-color: #00BFFF;
+ font-weight: 800;
+}
+
+.dtable thead td {
+ border: 1px solid #00BFFF;
+}
+
+.dtable td {
+ border:1px solid #f2f2f2;
+ text-align:center;
+ padding:5px 5px 5px 5px;
+}
+</style>
+</head>
+<body>
+ <div class="content-wrapper" style="background-color: white;">
+ <!-- <section class="content-header"></section> -->
+ <section class="content container-fluid">
+ <div id="Top">
+ <button class="btn" onclick="Updates()">缁戝畾浠诲姟</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('閾佹灦宸插埌浜屾鎺ュ姏')">閾佹灦宸插埌浜屾鎺ュ姏</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('閾佹灦宸插埌涓婄墖浣�')">閾佹灦宸插埌涓婄墖浣�</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('涓婄墖瀹屾垚璇锋眰閫�鍥�')">涓婄墖瀹屾垚璇锋眰閫�鍥�</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('閾佹灦閫�鍥炰簩娆℃帴鍔�')">閾佹灦閫�鍥炰簩娆℃帴鍔�</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('绛夊緟閫�鍥炲簱鍖�')">绛夊緟閫�鍥炲簱鍖�</button>
+ </div>
+ <div>
+ <div id="PageHeads" style="text-align: center; background-color: #0dc316; color: white; font-size: 25px; line-height: 50px; height: 50px;"></div>
+ <div style="margin-top: 10px;margin-bottom: 30px;">
+ <table id="Table_Load" class="dtable"
+ style="width: 100%; min-width: 1200px; border-collapse: collapse; border-spacing: 0;">
+ <thead>
+ <tr>
+ <td style="text-align: center;"><input type="checkbox"
+ class="loadcheckall" onclick="loadcheckAll()" /></td>
+ <td>ID</td>
+ <td>鏈哄櫒</td>
+ <td>涓婄墖鏈虹姸鎬�</td>
+ <td>宸ヤ綅缂栧彿</td>
+ <td>鐘舵��</td>
+ <td>浠诲姟ID</td>
+ <td>鏋跺彿</td>
+ <td>寰呬笂鏁伴噺</td>
+ <td>宸蹭笂鐗囨暟閲�</td>
+ <td>鐮存崯鏁伴噺</td>
+ <td>MES鐘舵��</td>
+ <td>浠诲姟鐘舵��</td>
+ <td>鍚敤鐘舵��</td>
+ <td>鎿嶄綔</td>
+ </tr>
+ </thead>
+ <tbody id="loaddata">
+ </tbody>
+ </table>
+ </div>
+ <div id="Top">
+ <button class="btn" onclick="TaskStusts('绛夊緟寮�濮�')">绛夊緟寮�濮�</button>
+ <button class="btn" onclick="TaskStusts('浠诲姟瀹屾垚')">浠诲姟瀹屾垚</button>
+ <button class="btn" onclick="TaskStusts('娲惧皵纭浠诲姟瀹屾垚')">娲惧皵纭浠诲姟瀹屾垚</button>
+ </div>
+ <table id="Table_Minche"
+ style="width: 100%; border-collapse: collapse; min-width: 1200px; border-spacing: 0;">
+ <thead>
+ <tr>
+ <td style="text-align: center;"><input class="checkall"
+ onclick="checkAll('Table_Minche')" type="checkbox" /></td>
+ <td>ID</td>
+ <td>浠诲姟ID</td>
+ <td>浠诲姟绫诲瀷</td>
+ <td>娲惧皵鐘舵��</td>
+ <td>MES鐘舵��</td>
+ <td>宸ヤ綔鐘舵��</td>
+ <td>鎻愮ず淇℃伅</td>
+ <td>鍘熺墖鍖匢D</td>
+ <td>閾佹灦鍙�</td>
+ <td>鐩殑鍦�</td>
+ <td>璁″垝涓婄墖鏁伴噺1</td>
+ <td>璁″垝涓婄墖鏁伴噺2</td>
+ <td>璁″垝涓婄墖鏁伴噺3</td>
+ <td>鏋朵笂鎬绘暟閲�</td>
+ <td>宸蹭笂鐗囨暟閲�</td>
+ <td>鐮存崯鏁伴噺</td>
+ <td>鍘熺墖瀹�</td>
+ <td>鍘熺墖楂�</td>
+ <td>鍘熺墖棰滆壊</td>
+ <td>鍘熺墖鍘氬害</td>
+ <td>鍘熺墖鏁伴噺</td>
+ </tr>
+ </thead>
+ <tbody id="taskdata"></tbody>
+ </table>
+ </div>
+ </section>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/loadtask/loadTask.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/loadtask/loadTask.jsp"
new file mode 100644
index 0000000..501724f
--- /dev/null
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/src/main/webapp/WEB-INF/views/loadtask/loadTask.jsp"
@@ -0,0 +1,190 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}" />
+<html>
+<head>
+
+<script type="text/javascript"
+ src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+<script>
+ setInterval(function(){
+ Initialize();
+ },1000);
+<%String lines = request.getParameter("line");
+out.print("var line='" + lines + "';\r\n");%>
+
+ Initialize();
+ function Initialize() {
+
+ loadDataRack();
+ }
+ function loadDataRack() {
+ $.ajax({
+ cache : false,
+ type : "POST",
+ dataType : "json",
+ url : "${ctx}/loadTask/loadRackLine",
+ data : {
+ "line" : line
+ },
+ success : function(data) {
+ console.log(data);
+ var LoadRackshtml = "";
+ $('#loaddata').remove();
+ $('#Table_Load').append("<tbody id='loaddata'></tbody>");
+ for (var i = 0; i < data.length; i++) {
+ var row = data[i];
+
+ LoadRackshtml+="<tr><td style=\"text-align: center;\"><input class=\"loadcheckboxs\" type=\"checkbox\" /></td>";
+ LoadRackshtml+="<td class=\"RackId\">"+row.id+"</td>";
+ if(row.id%2!=0){
+ LoadRackshtml+="<td rowspan='2'>"+row.rackName+"</td>";
+ LoadRackshtml+="<td rowspan='2'>"+row.machineLoad.workState+"</td>";
+ }
+ LoadRackshtml+="<td>"+row.number+"</td>";
+ LoadRackshtml+="<td>"+row.state+"</td>";
+ if(row.outTasks==undefined||row.outTasks==null){
+ LoadRackshtml+="<td><input style=\"width:70px;\" class=\"OutTaskId\" type=\"text\" value=''/></td>";
+ LoadRackshtml+="<td></td>";
+ LoadRackshtml+="<td></td>";
+ LoadRackshtml+="<td style=\"width:100px;\"></td>";
+ LoadRackshtml+="<td style=\"width:100px;\"></td>";
+ LoadRackshtml+="<td></td>";
+ LoadRackshtml+="<td></td>";
+ }else{
+ LoadRackshtml+="<td><input style=\"width:70px;\" class=\"OutTaskId\" type=\"text\" value='"+row.outTasks.taskId+"'/></td>";
+ LoadRackshtml+="<td>"+row.outTasks.stockName+"</td>";
+ LoadRackshtml+="<td>"+(row.outTasks.planLoadNum1+row.outTasks.planLoadNum2+row.outTasks.planLoadNum3)+"</td>";
+ LoadRackshtml+="<td style=\"width:100px;\">"+row.outTasks.stockNum+"</td>";
+ LoadRackshtml+="<td style=\"width:100px;\">"+row.outTasks.posunCount+"</td>";
+ LoadRackshtml+="<td>"+row.outTasks.machineStatus+"</td>";
+ LoadRackshtml+="<td>"+row.outTasks.workStatus+"</td>";
+ }
+
+ LoadRackshtml+="<td>"+"</td>";
+ LoadRackshtml+="<td>"+"</td>"
+ + "</tr>";
+ }
+ $('#loaddata').append(LoadRackshtml);
+ }
+ });
+}
+</script>
+<title>涓婄墖浠诲姟绠＄悊</title>
+<style type="text/css">
+* {
+ padding: 0px;
+ margin: 0px;
+ font-family: "microsoft yahei", "Helvetica Neue", Helvetica, Arial,
+ sans-serif;
+}
+
+#Top {
+ display: block;
+ padding: 5px;
+ padding-left: 6px;
+ padding-right: 15px;
+ line-height: 22px;
+ /* border-left: 5px solid #15c142; */
+ border-radius: 0 2px 2px 0;
+ background-color: #f2f2f2;
+}
+
+.btn {
+ height: 35px;
+ line-height: 35px;
+ background-color: #0dc316;
+ padding: 0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+
+.Rowbtn {
+ height: 20px;
+ line-height: 20px;
+ background-color: #0dc316;
+ padding: 0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+
+#Table_Minche thead tr {
+ background-color: #00BFFF;
+ font-weight: 800;
+}
+
+#Table_Minche thead td {
+ border: 1px solid #00BFFF;
+}
+
+#Table_Minche td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 3px 6px 3px 6px;
+}
+
+.dtable thead tr {
+ background-color: #00BFFF;
+ font-weight: 800;
+}
+
+.dtable thead td {
+ border: 1px solid #00BFFF;
+}
+
+.dtable td {
+ border:1px solid #f2f2f2;
+ text-align:center;
+ padding:5px 5px 5px 5px;
+}
+</style>
+</head>
+<body>
+ <div class="content-wrapper" style="background-color: white;">
+ <!-- <section class="content-header"></section> -->
+ <section class="content container-fluid">
+ <div id="Top">
+ <button class="btn" onclick="Updates()">缁戝畾浠诲姟</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('閾佹灦宸插埌浜屾鎺ュ姏')">閾佹灦宸插埌浜屾鎺ュ姏</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('閾佹灦宸插埌涓婄墖浣�')">閾佹灦宸插埌涓婄墖浣�</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('涓婄墖瀹屾垚璇锋眰閫�鍥�')">涓婄墖瀹屾垚璇锋眰閫�鍥�</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('閾佹灦閫�鍥炰簩娆℃帴鍔�')">閾佹灦閫�鍥炰簩娆℃帴鍔�</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('绛夊緟閫�鍥炲簱鍖�')">绛夊緟閫�鍥炲簱鍖�</button>
+ </div>
+ <div>
+
+ <div style="margin-top: 10px;margin-bottom: 30px;">
+ <table id="Table_Load" class="dtable"
+ style="width: 100%; min-width: 1200px; border-collapse: collapse; border-spacing: 0;">
+ <thead>
+ <tr>
+ <td style="text-align: center;">閫夋嫨</td>
+ <td>ID</td>
+ <td>鏈哄櫒</td>
+ <td>涓婄墖鏈虹姸鎬�</td>
+ <td>宸ヤ綅缂栧彿</td>
+ <td>鐘舵��</td>
+ <td>浠诲姟ID</td>
+ <td>鏋跺彿</td>
+ <td>寰呬笂鏁伴噺</td>
+ <td>宸蹭笂鐗囨暟閲�</td>
+ <td>鐮存崯鏁伴噺</td>
+ <td>MES鐘舵��</td>
+ <td>浠诲姟鐘舵��</td>
+ <td>鍚敤鐘舵��</td>
+ <td>鎿嶄綔</td>
+ </tr>
+ </thead>
+ <tbody id="loaddata">
+ </tbody>
+ </table>
+ </div>
+
+ </div>
+ </section>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/layouts/left.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/layouts/left.jsp"
index fe34a8d..9001aa6 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/layouts/left.jsp"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/layouts/left.jsp"
@@ -21,12 +21,30 @@
</span>
</a>
<ul class="treeview-menu">
- <li><a href="${ctx }/tasks/alltasks?taskstate=0&count=1"> 浠诲姟璇︽儏</a></li>
- <li><a href="${ctx }/tasks/alltasks?taskstate=1&count=1"> 鏈畬鎴愪换鍔�</a></li>
- <li><a href="${ctx }/tasks/alltasks?taskstate=2&count=1"> 宸插畬鎴愪换鍔�</a></li><!--
+ <%-- <li><a href="${ctx }/tasks/alltasks?taskstate=0"> 浠诲姟璇︽儏</a></li> --%>
+ <li><a href="${ctx }/tasks/alltasks?taskstate=1"> 鏈畬鎴愪换鍔�</a></li>
+ <li><a href="${ctx }/tasks/alltasks?taskstate=2"> 宸插畬鎴愪换鍔�</a></li><!--
<li><a href="#"> 鏄ㄦ棩缁熻</a></li> -->
</ul>
</li>
+ <%-- <li class="treeview">
+ <a href="#">
+ <img src="${ctx }/static/images/8.png" width="20px;" height="20px;">
+ <span>涓婄墖绠＄悊</span>
+ <span class="pull-right-container">
+ <i class="fa fa-angle-left pull-right"></i>
+ </span>
+ </a>
+ <ul class="treeview-menu">
+ <li><a href="${ctx }/loadTask/loadHtml?line=1"> 涓婄墖鍙�1</a></li>
+ <li><a href="${ctx }/loadTask/loadHtml?line=2"> 涓婄墖鍙�2</a></li>
+ <li><a href="${ctx }/loadTask/loadHtml?line=3"> 涓婄墖鍙�3</a></li>
+ <li><a href="${ctx }/loadTask/loadHtml?line=4"> 涓婄墖鍙�4</a></li>
+ <li><a href="${ctx }/loadTask/loadHtml?line=5"> 涓婄墖鍙�5</a></li>
+ <li><a href="${ctx }/loadTask/loadHtml?line=6"> 涓婄墖鍙�6</a></li>
+ <li><a href="${ctx }/loadTask/loadHtml?line=7"> 涓婄墖鍙�7</a></li>
+ </ul>
+ </li> --%>
<li class="treeview">
<a href="#">
<img src="${ctx }/static/images/8.png" width="20px;" height="20px;">
@@ -39,7 +57,8 @@
<li><a href="${ctx }/Config/infomathion"> 浜や簰淇℃伅</a></li> --%>
<li><a href="${ctx }/tasks/loadrackinfo"> 涓婄墖宸ヤ綅</a></li>
<li><a href="${ctx }/tasks/loadrackinfo2"> 鍚婅宸ヤ綅</a></li>
- <li><a href="${ctx }/Config/minche"> 璁惧鐘舵��</a></li>
+ <li><a href="${ctx }/Config/minche"> 璁惧鐘舵��</a></li>
+ <%-- <li><a href="${ctx }/Config/manualOperation"> 鎵嬪姩椤甸潰</a></li> --%>
</ul>
</li>
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/alltasks/tasks2.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/alltasks/tasks2.jsp"
new file mode 100644
index 0000000..17aa66b
--- /dev/null
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/alltasks/tasks2.jsp"
@@ -0,0 +1,227 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}" />
+<html>
+<head>
+<script type="text/javascript" src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+ <script>
+ /* setInterval(function(){
+ window.location.reload();
+ },3000); */
+ <%String state = request.getParameter("taskstate");
+ String lines = request.getParameter("line");
+ if (state == null)
+ state = "null";
+ out.print("var state='" + state + "';\r\n");
+ out.print("var line='" + lines + "';\r\n");
+ %>
+ function newPage(Count) {
+ var PageHeads=document.getElementById("PageHeads").innerHTML;
+ if(PageHeads=="宸插畬鎴愪换鍔�"){
+ window.location.href="${ctx }/tasks/alltasks?taskstate=2&count="+Count+"";
+ }else if(PageHeads=="鏈畬鎴愪换鍔�"){
+ window.location.href="${ctx }/tasks/alltasks?taskstate=1&count="+Count+"";
+ }else if(PageHeads=="鍏ㄩ儴浠诲姟"){
+ window.location.href="${ctx }/tasks/alltasks?taskstate=0&count="+Count+"";
+ }
+ }
+ function checkAll() {
+ var checkedAll=document.getElementById("checkall");
+ var ischeked=false;
+ if(checkedAll.checked){
+ ischeked=true;
+ }
+ var checkboxs=document.getElementsByClassName("checkboxs");
+ for(var i=0;i<checkboxs.length;i++){
+ checkboxs[i].checked=ischeked;
+ }
+ }
+ /* 鏍囪 绫诲瀷 锛� 鐘舵�� */
+ function TaskStusts(Types,Stusts,taskstate){
+ var checkboxs=document.getElementsByClassName("checkboxs");
+ for(var i=0;i<checkboxs.length;i++){
+ var checkbox=checkboxs[i];
+ if(checkbox.checked){
+ var RowHtml=checkbox.parentNode.parentNode;
+ var TaskIdHtml=RowHtml.getElementsByClassName("OutTaskId")[0].innerHTML;
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/tasks/TaskStusts",
+ data:{
+ "Types":Types,
+ "Stusts":Stusts,
+ "TaskIdHtml":TaskIdHtml,
+ },success:function(data){
+ location.reload();
+ }
+ });
+ }
+ }
+ }
+ Initialize();
+ function Initialize(){
+ if(state=="0"||state=="1"||state=="2"){
+ loadData(state);
+ }else{
+ loadData("1");
+ }
+
+ }
+
+ function loadData(state){
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/tasks/alltasksdata",
+ data:{
+ "state":state,
+ "line":line
+ },
+ success:function(data){
+ var OutTaskshtml="";
+ var dataheml=$('#taskdata');
+ $('#taskdata').remove();
+ $('#Table_Minche').append("<tbody id='taskdata'></tbody>");
+
+ for(var i=0;i<data.length;i++){
+ var row=data[i];
+ var dataheml=$('taskdata').append();
+ if(("绛夊緟寮�濮�"==row.machineStatus||"绛夊緟閫�鍥炲簱鍖�"==row.machineStatus)&&"姝ｅ湪宸ヤ綔"==row.machineStatus){
+ OutTaskshtml+="<tr style=\"background-color:#0dc316\">";
+ }else{
+ OutTaskshtml+="<tr>";
+ }
+ OutTaskshtml+="<td style=\"text-align: center;\"><input class=\"checkboxs\" type=\"checkbox\" /></td>";
+ OutTaskshtml+="<td>"+row.id+"</td>";
+ OutTaskshtml+="<td class=\"OutTaskId\">"+row.taskId+"</td>";
+ OutTaskshtml+="<td>"+row.taskType+"</td>";
+ OutTaskshtml+="<td>"+row.mesStatus+"</td>";
+ OutTaskshtml+="<td>"+row.machineStatus+"</td>";
+ OutTaskshtml+="<td>"+row.workStatus+"</td>";
+ OutTaskshtml+="<td>"+row.infoContent+"</td>";
+ OutTaskshtml+="<td>"+row.pkgId+"</td>";
+ OutTaskshtml+="<td>"+row.stockName+"</td>";
+ OutTaskshtml+="<td>"+row.destination+"</td>";
+ OutTaskshtml+="<td>"+row.planLoadNum1+"</td>";
+ OutTaskshtml+="<td>"+row.planLoadNum2+"</td>";
+ OutTaskshtml+="<td>"+row.planLoadNum3+"</td>";
+ OutTaskshtml+="<td>"+row.stockNum+"</td>";
+ OutTaskshtml+="<td>"+row.loadeNum+"</td>";
+ OutTaskshtml+="<td>"+row.posunCount+"</td>";
+ OutTaskshtml+="<td>"+row.bb+"</td>";
+ OutTaskshtml+="<td>"+row.hh+"</td>";
+ OutTaskshtml+="<td>"+row.color+"</td>";
+ OutTaskshtml+="<td>"+row.thickness+"</td>";
+ OutTaskshtml+="<td>"+row.stockNum+"</td></tr>";
+ }
+ $('#taskdata').append(OutTaskshtml);
+ }
+ });
+ }
+ </script>
+<title>浠诲姟绠＄悊</title>
+<style type="text/css">
+*{
+ padding:0px;
+ margin:0px;
+ font-family: "microsoft yahei","Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+#Top {
+ display: block;
+ padding: 5px;
+ padding-left: 6px;
+ padding-right: 15px;
+ line-height: 22px;
+ /* border-left: 5px solid #15c142; */
+ border-radius: 0 2px 2px 0;
+ background-color: #f2f2f2;
+}
+.btn{
+ height:35px;
+ line-height:35px;
+ background-color: #0dc316;
+ padding:0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+.Rowbtn{
+ height:20px;
+ line-height:20px;
+ background-color: #0dc316;
+ padding:0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+#Table_Minche thead tr{
+ background-color:#00BFFF;
+ font-weight:800;
+}
+#Table_Minche thead td{
+ border:1px solid #00BFFF;
+}
+#Table_Minche td{
+ border:1px solid #f2f2f2;
+ height:20px;
+ line-height:20px;
+ padding:3px 6px 3px 6px;
+}
+</style>
+</head>
+<body>
+ <div class="content-wrapper" style="background-color: white;">
+<!-- <section class="content-header"></section> -->
+ <section class="content container-fluid">
+ <div id="Top"><!--
+ <button class="btn" onclick="TaskStusts('Pai','涓婄墖浠诲姟宸插紑濮�')">涓婄墖浠诲姟宸插紑濮�</button> -->
+ <button class="btn" onclick="TaskStusts('MES','绛夊緟寮�濮�')">绛夊緟寮�濮�</button>
+ <!-- <button class="btn" onclick="taskurl('閾佹灦宸插埌浜屾鎺ュ姏')">閾佹灦宸插埌浜屾鎺ュ姏</button>
+ <button class="btn" onclick="taskurl('閾佹灦宸插埌鍚婅浣�')">閾佹灦宸插埌鍚婅浣�</button>
+ <button class="btn" onclick="taskurl('閾佹灦宸插埌涓婄墖浣�')">閾佹灦宸插埌涓婄墖浣�</button>
+ <button class="btn" onclick="taskurl('涓婄墖瀹屾垚璇锋眰閫�鍥�')">涓婄墖瀹屾垚璇锋眰閫�鍥�</button>
+ <button class="btn" onclick="taskurl('涓婄墖瀹屾垚鍏佽閫�鍥�')">涓婄墖瀹屾垚鍏佽閫�鍥�</button>
+ <button class="btn" onclick="taskurl('鍚婅瀹屾垚璇锋眰閫�鍥�')">鍚婅瀹屾垚鍏佽閫�鍥�</button>-->
+ <button class="btn" onclick="TaskStusts('MES','浠诲姟瀹屾垚')">浠诲姟瀹屾垚</button>
+ <button class="btn" onclick="TaskStusts('Pai','娲惧皵纭浠诲姟瀹屾垚')">娲惧皵纭浠诲姟瀹屾垚</button>
+ </div>
+ <div>
+ <div id="PageHeads" style="text-align: center;background-color:#0dc316;color:white;font-size:25px; line-height: 50px;height: 50px;">${PageHeads}</div>
+ <table id="Table_Minche" style="width: 100%; border-collapse: collapse;min-width:1200px; border-spacing: 0;">
+ <thead>
+ <tr>
+ <td style="text-align: center;"><input id="checkall" onclick="checkAll()" type="checkbox" /></td>
+ <td>ID</td>
+ <td>浠诲姟ID</td>
+ <td>浠诲姟绫诲瀷</td>
+ <td>娲惧皵鐘舵��</td>
+ <td>MES鐘舵��</td>
+ <td>宸ヤ綔鐘舵��</td>
+ <td>鎻愮ず淇℃伅</td>
+ <td>鍘熺墖鍖匢D</td>
+ <td>閾佹灦鍙�</td>
+ <td>鐩殑鍦�</td>
+ <td>璁″垝涓婄墖鏁伴噺1</td>
+ <td>璁″垝涓婄墖鏁伴噺2</td>
+ <td>璁″垝涓婄墖鏁伴噺3</td>
+ <td>鏋朵笂鎬绘暟閲�</td>
+ <td>宸蹭笂鐗囨暟閲�</td>
+ <td>鐮存崯鏁伴噺</td>
+ <td>鍘熺墖瀹�</td>
+ <td>鍘熺墖楂�</td>
+ <td>鍘熺墖棰滆壊</td>
+ <td>鍘熺墖鍘氬害</td>
+ <td>鍘熺墖鏁伴噺</td>
+ </tr>
+ </thead>
+ <tbody id="taskdata"></tbody>
+ </table>
+ </div><!--
+ <div style="text-align: center;margin-top:50px;"></div> -->
+ </section>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/manualOperation.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/manualOperation.jsp"
new file mode 100644
index 0000000..f455c78
--- /dev/null
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/manualOperation.jsp"
@@ -0,0 +1,325 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}" />
+<html>
+<head>
+
+<title>鎵嬪姩椤甸潰</title>
+<style type="text/css">
+* {
+ padding: 0px;
+ margin: 0px;
+ font-family: "microsoft yahei", "Helvetica Neue", Helvetica, Arial,
+ sans-serif;
+}
+#Top {
+ display: block;
+ margin-bottom: 10px;
+ padding: 5px;
+ padding-left: 6px;
+ padding-right: 15px;
+ line-height: 22px;
+ border-radius: 0 2px 2px 0;
+ background-color: #f2f2f2;
+}
+
+.btn {
+ height: 35px;
+ line-height: 35px;
+ background-color: #0dc316;
+ padding: 0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+
+table thead tr {
+ background-color: #f2f2f2;
+}
+
+table {
+ width: 100%;
+ border-collapse: collapse;
+ text-align:center;
+}
+
+table th {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+ text-align:center;
+}
+
+.One td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+}
+
+.two td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+}
+</style>
+<script type="text/javascript" src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+<script>
+
+/*寮圭獥-鎵嬪姩娣诲姞*/
+function modifyraw(){
+ $("#add-fix-info").modal('show');
+ initializeData();
+}
+/*鍒濆鍖栧姞杞借〃鏍�*/
+initialize();
+function initialize(){
+ initializeTable();
+}
+function initializeData(){
+ $('#station').empty();
+ var row="<tr><td>1</td>";
+ var stationOption="";
+ for(var i = 1; i < 10; i++){
+ stationOption+="<option value='"+i+"'>"+i+" 鍙峰簱浣�</option>";
+ }
+ for(var i=1101;i<=1114;i++){
+ stationOption+="<option value='"+i+"'>"+i+" 鍙蜂笂鐗囦綅</option>";
+ }
+ for(var i=990;i<=993;i++){
+ stationOption+="<option value='"+i+"'>"+i+" 鍙峰悐瑁呬綅</option>";
+ }
+
+ row+="<td><select name='start'>"+stationOption+"</select></td>"+
+ "<td><select name='end'>"+stationOption+"</select></td></tr>";
+ $('#station').append(row);
+}
+var Tb={
+ id:"tb1",
+ style:"margin-top: 20px;",
+ className:null,
+ positionId:"contents",
+ columns:[
+ {
+ text:"浠诲姟椤哄簭",
+ calssName:"id",
+ index:0
+ },
+ {
+ text:"ID",
+ calssName:"id",
+ index:1
+ },
+ {
+ text:"璧峰鍦板潃",
+ calssName:"stockName",
+ index:2
+ },
+ {
+ text:"鐩殑鍦板潃",
+ calssName:"destination",
+ index:3
+ },
+ {
+ text:"鏂欐灦鍙�",
+ calssName:"stockName",
+ index:4
+ },
+ {
+ text:"浠诲姟绫诲瀷",
+ calssName:"taskType",
+ index:5
+ },
+ {
+ text:"鎿嶄綔",
+ calssName:"",
+ index:6
+ }
+ ]
+}
+function createTable(model,data){
+ var columns=model.columns;
+ var positionid=model.positionId;
+ var position=document.getElementById(positionid);
+ var tablehtml=document.createElement("table");
+ console.log(data[0]);
+ console.log(data[0][columns[0].calssName]);
+ tablehtml.style=model.style;
+ //澶撮儴
+ var theadhtml=document.createElement("thead");
+ var thRowhtml=document.createElement("tr");
+ for(var thj = 0; thj < columns.length; thj++){
+ var thColhtml=document.createElement("th");
+ var thtext=document.createTextNode(columns[thj].text);
+ thColhtml.appendChild(thtext);
+ thRowhtml.appendChild(thColhtml);
+ }
+ theadhtml.appendChild(thRowhtml);
+ //鍐呭
+ var tbodyhtml=document.createElement("tbody");
+ for(var i = 0; i < data.length; i++){
+ var row=data[i];
+ var rowhtml=document.createElement("tr");
+ for(var j = 0; j < columns.length; j++){
+ var colhtml=document.createElement("td");
+ var text=document.createTextNode("");
+ if(!(columns[j].calssName==null||columns[j].calssName=="")){
+ text=document.createTextNode(row[columns[j].calssName]);
+ }
+ colhtml.appendChild(text);
+ rowhtml.appendChild(colhtml);
+ }
+ tbodyhtml.appendChild(rowhtml);
+ }
+ console.log(tablehtml);
+ tablehtml.appendChild(theadhtml);
+ tablehtml.appendChild(tbodyhtml);
+ position.appendChild(tablehtml);
+}
+function initializeTable(){
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/Config/selectOutTasks",
+ success:function(data){
+ console.log(data);
+ console.log(data[0][0]);
+ /* for(var i = 0; i < data.length; i++){
+ data[i][0]
+ }
+ createTable(Tb,data); */
+
+ }
+ });
+}
+function initializeTable2(){
+ //$('#OneContent').empty();
+ /* var tablehteml="<table class='One'><thead><tr><th>浠诲姟椤哄簭</th><th>ID</th><th>璧峰鍦板潃</th><th>鐩殑鍦板潃</th><th>鏂欐灦鍙�</th><th>浠诲姟绫诲瀷</th><th>鎿嶄綔</th></tr></thead>";
+ tablehteml+="<tbody id='station'></tbody>";
+ $('#Content').append(tablehteml); */
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/Config/selectOutTasks",
+ success:function(data){
+ console.log(data);
+ var html="";
+ for(var i = 0; i < data.length; i++){
+ var row=data[i];
+ html+="<tr>";
+ html+="<td>"+(i+1)+"</td>";
+ html+="<td class='taskid'>"+row.id+"</td>";
+ html+="<td>"+row.stockName+"</td>";
+ html+="<td>"+row.destination+row.rackNumber+"</td>";
+ html+="<td>"+row.stockName+"</td>";
+ html+="<td>"+row.taskType+"</td>";
+ html+="<td>";
+ html+="<button class='btn btn-default btn-lg' style='margin-right:10px;' onclick='taskCancel(this)'>澶辫触</button>";
+ html+="<button class='btn btn-default btn-lg' style='margin-right:10px;' onclick='taskCancel(this)'>瀹屾垚</button>";
+ html+="<button class='btn btn-default btn-lg' style='margin-right:10px;' onclick='taskCancel(this)'>鍙栨秷</button>";
+ html+="</td>";
+ html+="</tr>";
+ }
+ $('#OneContent').append(html);
+ }
+ });
+}
+/*鎿嶄綔銆愬彇娑�/閲嶆柊鍙戦��/瀹屾垚銆�*/
+function taskCancel(oneself){
+ var Controls=oneself.innerHTML;
+ var row=oneself.parentNode.parentNode;
+ var taskid=row.getElementsByClassName("taskid")[0].innerHTML;
+ console.log(Controls);
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/Config/updateTask",
+ data:{
+ "taskid":taskid,
+ "Controls":Controls
+ },success:function(data){
+ // 鍒锋柊褰撳墠椤甸潰
+
+ //window.location.href="${ctx }/Config/updateTask;";
+ }
+ });
+ location.reload();
+}
+</script>
+</head>
+<body>
+ <div class="content-wrapper" style="background-color: white;">
+ <section class="content-header">
+ <div id="Top">
+ <!-- <button class="btn" style="background-color: #fd5f56;" onclick="delAll()">鎵归噺鍒犻櫎</button> -->
+ <button class="btn" onclick="modifyraw()">娣诲姞鎵嬪姩浠诲姟</button>
+ <span style="float: right; line-height: 40px"></span>
+ </div>
+ <div class="modal fade" id="add-fix-info" tabindex="-1" role="dialog"
+ aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-dialog" style="width: 100%; height: 100%;">
+ <div class="modal-content"
+ style="width: 1000px; margin: auto;">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal"
+ aria-hidden="true" data-backdrop="static">×</button>
+ <h3 class="modal-title" id="myModalLabel" style="font-weight: bolder;">娣诲姞鎵嬪姩浠诲姟</h3>
+ </div>
+ <!--鎻愪氦-->
+ <form class="form-horizontal" role="form" id="category_add" action="${ctx}/Config/addTask" method="post">
+ <div style="margin-top: 20px;">
+ <!-- 鏈哄櫒閫昏緫閰嶇疆娣诲姞 -->
+ <table class="two" id="addManualOperation">
+ <thead>
+ <tr>
+ <th>搴忓彿</th>
+ <th>璧峰鍦板潃</th>
+ <th>鐩爣鍦板潃</th>
+ <!-- <th>鎿嶄綔</th> -->
+ </tr>
+ </thead>
+ <tbody id="station">
+
+ </tbody>
+
+ </table>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default btn-lg" data-dismiss="modal">鍏抽棴</button>
+ <button type="submit" class="btn btn-primary btn-lg" id="addbtnsubmit">鎻愪氦</button>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </section>
+
+ <section class="content container-fluid">
+ <div id="contents">
+ <!-- <table class="One">
+ <thead>
+ <tr>
+ <th>浠诲姟椤哄簭</th>
+ <th>ID</th>
+ <th>璧峰鍦板潃</th>
+ <th>鐩殑鍦板潃</th>
+ <th>鏂欐灦鍙�</th>
+ <th>浠诲姟绫诲瀷</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id='OneContent'>
+
+ </tbody> -->
+
+ </table>
+ </div>
+ </section>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/minche.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/minche.jsp"
index e1a9c82..869d5e5 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/minche.jsp"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/minche.jsp"
@@ -36,28 +36,65 @@
#Table_Minche thead tr {
background-color: #00BFFF;
- font-weight:800;
+ font-weight: 800;
}
-#Table_Minche thead td{
- border:1px solid #00BFFF;
+
+#Table_Minche thead td {
+ border: 1px solid #00BFFF;
padding: 5px 10px 5px 10px;
}
+
#Table_Minche td {
border: 1px solid #f2f2f2;
height: 20px;
line-height: 20px;
- text-align:center;
+ text-align: center;
padding: 2px 10px 2px 10px;
}
+
+.two thead tr {
+ background-color: #f2f2f2;
+}
+
+.two {
+ width: 100%;
+ border-collapse: collapse;
+ text-align:center;
+}
+
+.two th {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+ text-align:center;
+}
+
+.two td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+}
</style>
-<script type="text/javascript" src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+<script type="text/javascript"
+ src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
<script>
- setInterval(function(){
- window.location.reload();
- },3000);
+ //鍚姩瀹氭椂鍣�,func鏄弬鏁帮紝鎵�浠ヤ笉鑳戒娇鐢ㄦ嫭鍙�
+ var interval = setInterval(func,3000); //鍚姩,func涓嶈兘浣跨敤鎷彿
+
+
+ function func(){
+ window.location.reload();
+ }
+ function start(){
+ //閲嶆柊鍚姩
+ interval = setInterval(func, 3000);
+ }
function modifyraw(){
- disableAutoRefresh()
- $("#add-fix-info").modal('show');
+ // 鍋滄瀹氭椂鍣�
+ clearInterval(interval);
+ $("#add-fix-info").modal('show');
}
function checkAll() {
var checkedAll=document.getElementById("checkall");
@@ -92,34 +129,75 @@
}
}
</script>
+
</head>
<body>
+
<div class="content-wrapper" style="background-color: white;">
- <!-- 鍐呭 -->
+
<section class="content container-fluid">
<div>
- <table id="Table_Minche" style="width: 100%;min-width:1200px; border-collapse: collapse; border-spacing: 0;">
+ <button class="btn" onclick="modifyraw()">浠撳偍浠诲姟</button>
+ <table id="Table_Minche"
+ style="width: 100%; min-width: 1200px; border-collapse: collapse; border-spacing: 0;">
<thead>
<tr>
<td>ID</td>
<td>鏈哄櫒鍚嶇О</td>
- <td>浠诲姟ID</td>
+ <td>浠诲姟ID</td>
<td>閾佹灦鍙�</td>
<td>娲惧皵鐘舵��</td>
- <td>MES鐘舵��</td>
- <td>宸ヤ綔鐘舵��</td>
+ <td>MES鐘舵��</td>
+ <td>宸ヤ綔鐘舵��</td>
<td>鏈哄櫒鐘舵��</td>
<td>绛夊緟鏁伴噺</td>
<td>鎶ヨ淇℃伅</td>
- <td style="width:200px;">鎿嶄綔</td>
+ <td style="width: 200px;">鎿嶄綔</td>
</tr>
</thead>
- <tbody>
- ${MachineOutTaskhtmls}
+ <tbody>${MachineOutTaskhtmls}
</tbody>
</table>
+ </div>
+
+ <div class="modal fade" id="add-fix-info" tabindex="-1" role="dialog"
+ aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-dialog" style="width: 100%; height: 100%;">
+ <div class="modal-content"
+ style="width: 1000px; margin: auto;">
+ <div class="modal-header">
+ <button type="button" class="close" onclick="start()" data-dismiss="modal"
+ aria-hidden="true" data-backdrop="static">×</button>
+ <h3 class="modal-title" id="myModalLabel" style="font-weight: bolder;">浠撳偍寰呮墽琛屼换鍔�</h3>
+ </div>
+ <!--鎻愪氦-->
+ <form class="form-horizontal" role="form" id="category_add" action="${ctx}/Config/addTask" method="post">
+ <div style="margin-top: 20px;">
+ <!-- 浠诲姟鏄剧ず -->
+ <table class="two" id="addManualOperation">
+ <thead>
+ <tr>
+ <th>浠诲姟ID</th>
+ <th>鏂欐灦鍙�</th>
+ <th>鐩殑绾胯矾</th>
+ <th>鐩爣宸ヤ綅</th>
+ <th>璁″垝涓婄墖鏁伴噺</th>
+ <th>鏂欐灦涓婄幓鐠冩暟閲�</th>
+ <th>绫诲瀷</th>
+ <!-- <th>鎿嶄綔</th> -->
+ </tr>
+ </thead>
+ <tbody>${outTasksTasks}
+ </tbody>
+ </table>
+ </div>
+
+ </form>
+ </div>
+ </div>
</div>
</section>
</div>
</body>
+
</html>
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/taskInfos.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/taskInfos.jsp"
new file mode 100644
index 0000000..75609fc
--- /dev/null
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/configuration/taskInfos.jsp"
@@ -0,0 +1,325 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}" />
+<html>
+<head>
+
+<title></title>
+<style type="text/css">
+* {
+ padding: 0px;
+ margin: 0px;
+ font-family: "microsoft yahei", "Helvetica Neue", Helvetica, Arial,
+ sans-serif;
+}
+#Top {
+ display: block;
+ margin-bottom: 10px;
+ padding: 5px;
+ padding-left: 6px;
+ padding-right: 15px;
+ line-height: 22px;
+ border-radius: 0 2px 2px 0;
+ background-color: #f2f2f2;
+}
+
+.btn {
+ height: 35px;
+ line-height: 35px;
+ background-color: #0dc316;
+ padding: 0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+
+table thead tr {
+ background-color: #f2f2f2;
+}
+
+table {
+ width: 100%;
+ border-collapse: collapse;
+ text-align:center;
+}
+
+table th {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+ text-align:center;
+}
+
+.One td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+}
+
+.two td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 9px 15px 9px 15px;
+}
+</style>
+<script type="text/javascript" src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+<script>
+
+/*寮圭獥-鎵嬪姩娣诲姞*/
+function modifyraw(){
+ $("#add-fix-info").modal('show');
+ initializeData();
+}
+/*鍒濆鍖栧姞杞借〃鏍�*/
+initialize();
+function initialize(){
+ initializeTable();
+}
+function initializeData(){
+ $('#station').empty();
+ var row="<tr><td>1</td>";
+ var stationOption="";
+ for(var i = 1; i < 10; i++){
+ stationOption+="<option value='"+i+"'>"+i+" 鍙峰簱浣�</option>";
+ }
+ for(var i=1101;i<=1114;i++){
+ stationOption+="<option value='"+i+"'>"+i+" 鍙蜂笂鐗囦綅</option>";
+ }
+ for(var i=990;i<=993;i++){
+ stationOption+="<option value='"+i+"'>"+i+" 鍙峰悐瑁呬綅</option>";
+ }
+
+ row+="<td><select name='start'>"+stationOption+"</select></td>"+
+ "<td><select name='end'>"+stationOption+"</select></td></tr>";
+ $('#station').append(row);
+}
+var Tb={
+ id:"tb1",
+ style:"margin-top: 20px;",
+ className:null,
+ positionId:"contents",
+ columns:[
+ {
+ text:"浠诲姟椤哄簭",
+ calssName:"id",
+ index:0
+ },
+ {
+ text:"ID",
+ calssName:"id",
+ index:1
+ },
+ {
+ text:"璧峰鍦板潃",
+ calssName:"stockName",
+ index:2
+ },
+ {
+ text:"鐩殑鍦板潃",
+ calssName:"destination",
+ index:3
+ },
+ {
+ text:"鏂欐灦鍙�",
+ calssName:"stockName",
+ index:4
+ },
+ {
+ text:"浠诲姟绫诲瀷",
+ calssName:"taskType",
+ index:5
+ },
+ {
+ text:"鎿嶄綔",
+ calssName:"",
+ index:6
+ }
+ ]
+}
+function createTable(model,data){
+ var columns=model.columns;
+ var positionid=model.positionId;
+ var position=document.getElementById(positionid);
+ var tablehtml=document.createElement("table");
+ console.log(data[0]);
+ console.log(data[0][columns[0].calssName]);
+ tablehtml.style=model.style;
+ //澶撮儴
+ var theadhtml=document.createElement("thead");
+ var thRowhtml=document.createElement("tr");
+ for(var thj = 0; thj < columns.length; thj++){
+ var thColhtml=document.createElement("th");
+ var thtext=document.createTextNode(columns[thj].text);
+ thColhtml.appendChild(thtext);
+ thRowhtml.appendChild(thColhtml);
+ }
+ theadhtml.appendChild(thRowhtml);
+ //鍐呭
+ var tbodyhtml=document.createElement("tbody");
+ for(var i = 0; i < data.length; i++){
+ var row=data[i];
+ var rowhtml=document.createElement("tr");
+ for(var j = 0; j < columns.length; j++){
+ var colhtml=document.createElement("td");
+ var text=document.createTextNode("");
+ if(!(columns[j].calssName==null||columns[j].calssName=="")){
+ text=document.createTextNode(row[columns[j].calssName]);
+ }
+ colhtml.appendChild(text);
+ rowhtml.appendChild(colhtml);
+ }
+ tbodyhtml.appendChild(rowhtml);
+ }
+ console.log(tablehtml);
+ tablehtml.appendChild(theadhtml);
+ tablehtml.appendChild(tbodyhtml);
+ position.appendChild(tablehtml);
+}
+function initializeTable(){
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/Config/selectOutTasks",
+ success:function(data){
+ console.log(data);
+ console.log(data[0][0]);
+ /* for(var i = 0; i < data.length; i++){
+ data[i][0]
+ }
+ createTable(Tb,data); */
+
+ }
+ });
+}
+function initializeTable2(){
+ //$('#OneContent').empty();
+ /* var tablehteml="<table class='One'><thead><tr><th>浠诲姟椤哄簭</th><th>ID</th><th>璧峰鍦板潃</th><th>鐩殑鍦板潃</th><th>鏂欐灦鍙�</th><th>浠诲姟绫诲瀷</th><th>鎿嶄綔</th></tr></thead>";
+ tablehteml+="<tbody id='station'></tbody>";
+ $('#Content').append(tablehteml); */
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/Config/selectOutTasks",
+ success:function(data){
+ console.log(data);
+ var html="";
+ for(var i = 0; i < data.length; i++){
+ var row=data[i];
+ html+="<tr>";
+ html+="<td>"+(i+1)+"</td>";
+ html+="<td class='taskid'>"+row.id+"</td>";
+ html+="<td>"+row.stockName+"</td>";
+ html+="<td>"+row.destination+row.rackNumber+"</td>";
+ html+="<td>"+row.stockName+"</td>";
+ html+="<td>"+row.taskType+"</td>";
+ html+="<td>";
+ html+="<button class='btn btn-default btn-lg' style='margin-right:10px;' onclick='taskCancel(this)'>澶辫触</button>";
+ html+="<button class='btn btn-default btn-lg' style='margin-right:10px;' onclick='taskCancel(this)'>瀹屾垚</button>";
+ html+="<button class='btn btn-default btn-lg' style='margin-right:10px;' onclick='taskCancel(this)'>鍙栨秷</button>";
+ html+="</td>";
+ html+="</tr>";
+ }
+ $('#OneContent').append(html);
+ }
+ });
+}
+/*鎿嶄綔銆愬彇娑�/閲嶆柊鍙戦��/瀹屾垚銆�*/
+function taskCancel(oneself){
+ var Controls=oneself.innerHTML;
+ var row=oneself.parentNode.parentNode;
+ var taskid=row.getElementsByClassName("taskid")[0].innerHTML;
+ console.log(Controls);
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/Config/updateTask",
+ data:{
+ "taskid":taskid,
+ "Controls":Controls
+ },success:function(data){
+ // 鍒锋柊褰撳墠椤甸潰
+
+ //window.location.href="${ctx }/Config/updateTask;";
+ }
+ });
+ location.reload();
+}
+</script>
+</head>
+<body>
+ <div class="content-wrapper" style="background-color: white;">
+ <section class="content-header">
+ <div id="Top">
+ <!-- <button class="btn" style="background-color: #fd5f56;" onclick="delAll()">鎵归噺鍒犻櫎</button> -->
+ <button class="btn" onclick="modifyraw()">娣诲姞鎵嬪姩浠诲姟</button>
+ <span style="float: right; line-height: 40px"></span>
+ </div>
+ <div class="modal fade" id="add-fix-info" tabindex="-1" role="dialog"
+ aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-dialog" style="width: 100%; height: 100%;">
+ <div class="modal-content"
+ style="width: 1000px; margin: auto;">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal"
+ aria-hidden="true" data-backdrop="static">×</button>
+ <h3 class="modal-title" id="myModalLabel" style="font-weight: bolder;">娣诲姞鎵嬪姩浠诲姟</h3>
+ </div>
+ <!--鎻愪氦-->
+ <form class="form-horizontal" role="form" id="category_add" action="${ctx}/Config/addTask" method="post">
+ <div style="margin-top: 20px;">
+ <!-- 鏈哄櫒閫昏緫閰嶇疆娣诲姞 -->
+ <table class="two" id="addManualOperation">
+ <thead>
+ <tr>
+ <th>搴忓彿</th>
+ <th>璧峰鍦板潃</th>
+ <th>鐩爣鍦板潃</th>
+ <!-- <th>鎿嶄綔</th> -->
+ </tr>
+ </thead>
+ <tbody id="station">
+
+ </tbody>
+
+ </table>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default btn-lg" data-dismiss="modal">鍏抽棴</button>
+ <button type="submit" class="btn btn-primary btn-lg" id="addbtnsubmit">鎻愪氦</button>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </section>
+
+ <section class="content container-fluid">
+ <div id="contents">
+ <!-- <table class="One">
+ <thead>
+ <tr>
+ <th>浠诲姟椤哄簭</th>
+ <th>ID</th>
+ <th>璧峰鍦板潃</th>
+ <th>鐩殑鍦板潃</th>
+ <th>鏂欐灦鍙�</th>
+ <th>浠诲姟绫诲瀷</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id='OneContent'>
+
+ </tbody> -->
+
+ </table>
+ </div>
+ </section>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/loadtask/loadMachine.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/loadtask/loadMachine.jsp"
new file mode 100644
index 0000000..8c3766d
--- /dev/null
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/loadtask/loadMachine.jsp"
@@ -0,0 +1,391 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}" />
+<html>
+<head>
+
+<script type="text/javascript"
+ src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+<script>
+ /* setInterval(function(){
+ window.location.reload();
+ },3000); */
+<%String state = request.getParameter("taskstate");
+ String lines = request.getParameter("line");
+ if (state == null)
+ state = "null";
+ out.print("var state='" + state + "';\r\n");
+ out.print("var line='" + lines + "';\r\n");%>
+ function checkAll() {
+ var checkedAll = document.getElementsByClassName("checkall")[0];
+ var ischeked = false;
+ if (checkedAll.checked) {
+ ischeked = true;
+ }
+ var checkboxs = document.getElementById(tablename).getElementsByClassName("checkboxs");
+ for (var i = 0; i < checkboxs.length; i++) {
+ checkboxs[i].checked = ischeked;
+ }
+ }
+ function loadcheckAll() {
+ var checkedAll = document.getElementsByClassName("loadcheckall")[0];
+ var ischeked = false;
+ if (checkedAll.checked) {
+ ischeked = true;
+ }
+ var checkboxs = document.getElementById(tablename).getElementsByClassName("loadcheckboxs");
+ for (var i = 0; i < checkboxs.length; i++) {
+ checkboxs[i].checked = ischeked;
+ }
+ }
+ /*淇敼淇濆瓨 */
+
+ function Updates(){
+ var checkboxs=document.getElementsByClassName("loadcheckboxs");
+/* var RowHtml="";
+ var RackIdHtml="";
+ var TaskIdHtml=""; */
+ for(var i=0;i<checkboxs.length;i++){
+ var checkbox=checkboxs[i];
+ if(checkbox.checked){
+ var RowHtml=checkbox.parentNode.parentNode;
+ var RackIdHtml=RowHtml.getElementsByClassName("RackId")[0].innerHTML;
+ var TaskIdHtml=RowHtml.getElementsByClassName("OutTaskId")[0].value;
+ $.ajax({
+ cache:false,
+ type:"POST",
+ dataType : "json",
+ url:"${ctx}/tasks/Updates",
+ data:{
+ "RackId":RackIdHtml,
+ "TaskIdHtml":TaskIdHtml,
+ },success:function(data){
+ window.location.href="${ctx }/loadTask/loadHtml?line="+line;
+ }
+ });
+ break;
+ }
+ }
+ }
+ /* 鏍囪 绫诲瀷 锛� 鐘舵�� */
+ function TaskStusts(Stusts) {
+ var table=document.getElementById("Table_Minche");
+ var checkboxs = table.getElementsByClassName("checkboxs");
+ for (var i = 0; i < checkboxs.length; i++) {
+ var checkbox = checkboxs[i];
+ if (checkbox.checked) {
+ var RowHtml = checkbox.parentNode.parentNode;
+ var TaskIdHtml = RowHtml.getElementsByClassName("OutTaskId")[0].innerHTML;
+ $.ajax({
+ cache : false,
+ type : "POST",
+ dataType : "json",
+ url : "${ctx}/loadTask/updateTask",
+ data : {
+ "Stusts" : Stusts,
+ "TaskIdHtml" : TaskIdHtml,
+ },
+ success : function(data) {
+ window.location.href="${ctx }/loadTask/loadHtml?line="+line;
+ //console.log(data);
+ /* location.reload(); */
+ }
+ });
+ }
+ }
+
+ }
+ /* 鏍囪 绫诲瀷 锛� 鐘舵�� */
+ function loadTaskStusts(Stusts) {
+ var table=document.getElementById("Table_Load");
+ var checkboxs = table.getElementsByClassName("checkboxs");
+ for (var i = 0; i < checkboxs.length; i++) {
+ var checkbox = checkboxs[i];
+ if (checkbox.checked) {
+ var RowHtml = checkbox.parentNode.parentNode;
+ var TaskIdHtml = RowHtml.getElementsByClassName("OutTaskId")[0].value;
+ $.ajax({
+ cache : false,
+ type : "POST",
+ dataType : "json",
+ url : "${ctx}/loadTask/updateTask",
+ data : {
+ "Stusts" : Stusts,
+ "TaskIdHtml" : TaskIdHtml,
+ },
+ success : function(data) {
+ window.location.href="${ctx }/loadTask/loadHtml?line="+line;
+ //console.log(data);
+ /* location.reload(); */
+ }
+ });
+ }
+ }
+
+ }
+ Initialize();
+ function Initialize() {
+
+ loadData();
+ loadDataRack();
+ }
+ function loadDataRack() {
+ $.ajax({
+ cache : false,
+ type : "POST",
+ dataType : "json",
+ url : "${ctx}/loadTask/loadRackLine",
+ data : {
+ "line" : line
+ },
+ success : function(data) {
+ console.log(data);
+ var LoadRackshtml = "";
+ $('#loaddata').remove();
+ $('#Table_Load').append("<tbody id='loaddata'></tbody>");
+ for (var i = 0; i < data.length; i++) {
+ var row = data[i];
+
+ LoadRackshtml+="<tr><td style=\"text-align: center;\"><input class=\"loadcheckboxs\" type=\"checkbox\" /></td>";
+ LoadRackshtml+="<td class=\"RackId\">"+row.id+"</td>";
+ if(row.id%2!=0){
+ LoadRackshtml+="<td rowspan='2'>"+row.rackName+"</td>";
+ LoadRackshtml+="<td rowspan='2'>"+row.machineLoad.workState+"</td>";
+ }
+ LoadRackshtml+="<td>"+row.number+"</td>";
+ LoadRackshtml+="<td>"+row.state+"</td>";
+ if(row.outTasks==undefined||row.outTasks==null){
+ LoadRackshtml+="<td><input style=\"width:70px;\" class=\"OutTaskId\" type=\"text\" value=''/></td>";
+ LoadRackshtml+="<td></td>";
+ LoadRackshtml+="<td></td>";
+ LoadRackshtml+="<td style=\"width:100px;\"></td>";
+ LoadRackshtml+="<td style=\"width:100px;\"></td>";
+ LoadRackshtml+="<td></td>";
+ LoadRackshtml+="<td></td>";
+ }else{
+ LoadRackshtml+="<td><input style=\"width:70px;\" class=\"OutTaskId\" type=\"text\" value='"+row.outTasks.taskId+"'/></td>";
+ LoadRackshtml+="<td>"+row.outTasks.stockName+"</td>";
+ LoadRackshtml+="<td>"+(row.outTasks.planLoadNum1+row.outTasks.planLoadNum2+row.outTasks.planLoadNum3)+"</td>";
+ LoadRackshtml+="<td style=\"width:100px;\">"+row.outTasks.stockNum+"</td>";
+ LoadRackshtml+="<td style=\"width:100px;\">"+row.outTasks.posunCount+"</td>";
+ LoadRackshtml+="<td>"+row.outTasks.machineStatus+"</td>";
+ LoadRackshtml+="<td>"+row.outTasks.workStatus+"</td>";
+ }
+
+ LoadRackshtml+="<td>"+"</td>";
+ LoadRackshtml+="<td>"+"</td>"
+ + "</tr>";
+ }
+ $('#loaddata').append(LoadRackshtml);
+ }
+ });
+}
+ function loadData() {
+ $.ajax({
+ cache : false,
+ type : "POST",
+ dataType : "json",
+ url : "${ctx}/loadTask/notFinshTask",
+ data : {
+ "line" : line
+ },
+ success : function(data) {
+ console.log(data);
+ var OutTaskshtml = "";
+ $('#taskdata').remove();
+ $('#Table_Minche').append(
+ "<tbody id='taskdata'></tbody>");
+
+ for (var i = 0; i < data.length; i++) {
+ var row = data[i];
+ if (("绛夊緟寮�濮�" == row.machineStatus || "绛夊緟閫�鍥炲簱鍖�" == row.machineStatus)
+ && "姝ｅ湪宸ヤ綔" == row.machineStatus) {
+ OutTaskshtml += "<tr style=\"background-color:#0dc316\">";
+ } else {
+ OutTaskshtml += "<tr>";
+ }
+ OutTaskshtml += "<td style=\"text-align: center;\"><input class=\"checkboxs\" type=\"checkbox\" /></td>";
+ OutTaskshtml += "<td>" + row.id + "</td>";
+ OutTaskshtml += "<td class=\"OutTaskId\">"
+ + row.taskId + "</td>";
+ OutTaskshtml += "<td>" + row.taskType + "</td>";
+ OutTaskshtml += "<td>" + row.mesStatus + "</td>";
+ OutTaskshtml += "<td>" + row.machineStatus
+ + "</td>";
+ OutTaskshtml += "<td>" + row.workStatus + "</td>";
+ OutTaskshtml += "<td>" + row.infoContent + "</td>";
+ OutTaskshtml += "<td>" + row.pkgId + "</td>";
+ OutTaskshtml += "<td>" + row.stockName + "</td>";
+ OutTaskshtml += "<td>" + row.destination + "</td>";
+ OutTaskshtml += "<td>" + row.planLoadNum1 + "</td>";
+ OutTaskshtml += "<td>" + row.planLoadNum2 + "</td>";
+ OutTaskshtml += "<td>" + row.planLoadNum3 + "</td>";
+ OutTaskshtml += "<td>" + row.stockNum + "</td>";
+ OutTaskshtml += "<td>" + row.loadeNum + "</td>";
+ OutTaskshtml += "<td>" + row.posunCount + "</td>";
+ OutTaskshtml += "<td>" + row.bb + "</td>";
+ OutTaskshtml += "<td>" + row.hh + "</td>";
+ OutTaskshtml += "<td>" + row.color + "</td>";
+ OutTaskshtml += "<td>" + row.thickness + "</td>";
+ OutTaskshtml += "<td>" + row.stockNum
+ + "</td></tr>";
+ }
+ $('#taskdata').append(OutTaskshtml);
+ }
+ });
+ }
+</script>
+<title>涓婄墖浠诲姟绠＄悊</title>
+<style type="text/css">
+* {
+ padding: 0px;
+ margin: 0px;
+ font-family: "microsoft yahei", "Helvetica Neue", Helvetica, Arial,
+ sans-serif;
+}
+
+#Top {
+ display: block;
+ padding: 5px;
+ padding-left: 6px;
+ padding-right: 15px;
+ line-height: 22px;
+ /* border-left: 5px solid #15c142; */
+ border-radius: 0 2px 2px 0;
+ background-color: #f2f2f2;
+}
+
+.btn {
+ height: 35px;
+ line-height: 35px;
+ background-color: #0dc316;
+ padding: 0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+
+.Rowbtn {
+ height: 20px;
+ line-height: 20px;
+ background-color: #0dc316;
+ padding: 0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+
+#Table_Minche thead tr {
+ background-color: #00BFFF;
+ font-weight: 800;
+}
+
+#Table_Minche thead td {
+ border: 1px solid #00BFFF;
+}
+
+#Table_Minche td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 3px 6px 3px 6px;
+}
+
+.dtable thead tr {
+ background-color: #00BFFF;
+ font-weight: 800;
+}
+
+.dtable thead td {
+ border: 1px solid #00BFFF;
+}
+
+.dtable td {
+ border:1px solid #f2f2f2;
+ text-align:center;
+ padding:5px 5px 5px 5px;
+}
+</style>
+</head>
+<body>
+ <div class="content-wrapper" style="background-color: white;">
+ <!-- <section class="content-header"></section> -->
+ <section class="content container-fluid">
+ <div id="Top">
+ <button class="btn" onclick="Updates()">缁戝畾浠诲姟</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('閾佹灦宸插埌浜屾鎺ュ姏')">閾佹灦宸插埌浜屾鎺ュ姏</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('閾佹灦宸插埌涓婄墖浣�')">閾佹灦宸插埌涓婄墖浣�</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('涓婄墖瀹屾垚璇锋眰閫�鍥�')">涓婄墖瀹屾垚璇锋眰閫�鍥�</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('閾佹灦閫�鍥炰簩娆℃帴鍔�')">閾佹灦閫�鍥炰簩娆℃帴鍔�</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('绛夊緟閫�鍥炲簱鍖�')">绛夊緟閫�鍥炲簱鍖�</button>
+ </div>
+ <div>
+ <div id="PageHeads" style="text-align: center; background-color: #0dc316; color: white; font-size: 25px; line-height: 50px; height: 50px;"></div>
+ <div style="margin-top: 10px;margin-bottom: 30px;">
+ <table id="Table_Load" class="dtable"
+ style="width: 100%; min-width: 1200px; border-collapse: collapse; border-spacing: 0;">
+ <thead>
+ <tr>
+ <td style="text-align: center;"><input type="checkbox"
+ class="loadcheckall" onclick="loadcheckAll()" /></td>
+ <td>ID</td>
+ <td>鏈哄櫒</td>
+ <td>涓婄墖鏈虹姸鎬�</td>
+ <td>宸ヤ綅缂栧彿</td>
+ <td>鐘舵��</td>
+ <td>浠诲姟ID</td>
+ <td>鏋跺彿</td>
+ <td>寰呬笂鏁伴噺</td>
+ <td>宸蹭笂鐗囨暟閲�</td>
+ <td>鐮存崯鏁伴噺</td>
+ <td>MES鐘舵��</td>
+ <td>浠诲姟鐘舵��</td>
+ <td>鍚敤鐘舵��</td>
+ <td>鎿嶄綔</td>
+ </tr>
+ </thead>
+ <tbody id="loaddata">
+ </tbody>
+ </table>
+ </div>
+ <div id="Top">
+ <button class="btn" onclick="TaskStusts('绛夊緟寮�濮�')">绛夊緟寮�濮�</button>
+ <button class="btn" onclick="TaskStusts('浠诲姟瀹屾垚')">浠诲姟瀹屾垚</button>
+ <button class="btn" onclick="TaskStusts('娲惧皵纭浠诲姟瀹屾垚')">娲惧皵纭浠诲姟瀹屾垚</button>
+ </div>
+ <table id="Table_Minche"
+ style="width: 100%; border-collapse: collapse; min-width: 1200px; border-spacing: 0;">
+ <thead>
+ <tr>
+ <td style="text-align: center;"><input class="checkall"
+ onclick="checkAll('Table_Minche')" type="checkbox" /></td>
+ <td>ID</td>
+ <td>浠诲姟ID</td>
+ <td>浠诲姟绫诲瀷</td>
+ <td>娲惧皵鐘舵��</td>
+ <td>MES鐘舵��</td>
+ <td>宸ヤ綔鐘舵��</td>
+ <td>鎻愮ず淇℃伅</td>
+ <td>鍘熺墖鍖匢D</td>
+ <td>閾佹灦鍙�</td>
+ <td>鐩殑鍦�</td>
+ <td>璁″垝涓婄墖鏁伴噺1</td>
+ <td>璁″垝涓婄墖鏁伴噺2</td>
+ <td>璁″垝涓婄墖鏁伴噺3</td>
+ <td>鏋朵笂鎬绘暟閲�</td>
+ <td>宸蹭笂鐗囨暟閲�</td>
+ <td>鐮存崯鏁伴噺</td>
+ <td>鍘熺墖瀹�</td>
+ <td>鍘熺墖楂�</td>
+ <td>鍘熺墖棰滆壊</td>
+ <td>鍘熺墖鍘氬害</td>
+ <td>鍘熺墖鏁伴噺</td>
+ </tr>
+ </thead>
+ <tbody id="taskdata"></tbody>
+ </table>
+ </div>
+ </section>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/loadtask/loadTask.jsp" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/loadtask/loadTask.jsp"
new file mode 100644
index 0000000..501724f
--- /dev/null
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/loadtask/loadTask.jsp"
@@ -0,0 +1,190 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}" />
+<html>
+<head>
+
+<script type="text/javascript"
+ src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
+<script>
+ setInterval(function(){
+ Initialize();
+ },1000);
+<%String lines = request.getParameter("line");
+out.print("var line='" + lines + "';\r\n");%>
+
+ Initialize();
+ function Initialize() {
+
+ loadDataRack();
+ }
+ function loadDataRack() {
+ $.ajax({
+ cache : false,
+ type : "POST",
+ dataType : "json",
+ url : "${ctx}/loadTask/loadRackLine",
+ data : {
+ "line" : line
+ },
+ success : function(data) {
+ console.log(data);
+ var LoadRackshtml = "";
+ $('#loaddata').remove();
+ $('#Table_Load').append("<tbody id='loaddata'></tbody>");
+ for (var i = 0; i < data.length; i++) {
+ var row = data[i];
+
+ LoadRackshtml+="<tr><td style=\"text-align: center;\"><input class=\"loadcheckboxs\" type=\"checkbox\" /></td>";
+ LoadRackshtml+="<td class=\"RackId\">"+row.id+"</td>";
+ if(row.id%2!=0){
+ LoadRackshtml+="<td rowspan='2'>"+row.rackName+"</td>";
+ LoadRackshtml+="<td rowspan='2'>"+row.machineLoad.workState+"</td>";
+ }
+ LoadRackshtml+="<td>"+row.number+"</td>";
+ LoadRackshtml+="<td>"+row.state+"</td>";
+ if(row.outTasks==undefined||row.outTasks==null){
+ LoadRackshtml+="<td><input style=\"width:70px;\" class=\"OutTaskId\" type=\"text\" value=''/></td>";
+ LoadRackshtml+="<td></td>";
+ LoadRackshtml+="<td></td>";
+ LoadRackshtml+="<td style=\"width:100px;\"></td>";
+ LoadRackshtml+="<td style=\"width:100px;\"></td>";
+ LoadRackshtml+="<td></td>";
+ LoadRackshtml+="<td></td>";
+ }else{
+ LoadRackshtml+="<td><input style=\"width:70px;\" class=\"OutTaskId\" type=\"text\" value='"+row.outTasks.taskId+"'/></td>";
+ LoadRackshtml+="<td>"+row.outTasks.stockName+"</td>";
+ LoadRackshtml+="<td>"+(row.outTasks.planLoadNum1+row.outTasks.planLoadNum2+row.outTasks.planLoadNum3)+"</td>";
+ LoadRackshtml+="<td style=\"width:100px;\">"+row.outTasks.stockNum+"</td>";
+ LoadRackshtml+="<td style=\"width:100px;\">"+row.outTasks.posunCount+"</td>";
+ LoadRackshtml+="<td>"+row.outTasks.machineStatus+"</td>";
+ LoadRackshtml+="<td>"+row.outTasks.workStatus+"</td>";
+ }
+
+ LoadRackshtml+="<td>"+"</td>";
+ LoadRackshtml+="<td>"+"</td>"
+ + "</tr>";
+ }
+ $('#loaddata').append(LoadRackshtml);
+ }
+ });
+}
+</script>
+<title>涓婄墖浠诲姟绠＄悊</title>
+<style type="text/css">
+* {
+ padding: 0px;
+ margin: 0px;
+ font-family: "microsoft yahei", "Helvetica Neue", Helvetica, Arial,
+ sans-serif;
+}
+
+#Top {
+ display: block;
+ padding: 5px;
+ padding-left: 6px;
+ padding-right: 15px;
+ line-height: 22px;
+ /* border-left: 5px solid #15c142; */
+ border-radius: 0 2px 2px 0;
+ background-color: #f2f2f2;
+}
+
+.btn {
+ height: 35px;
+ line-height: 35px;
+ background-color: #0dc316;
+ padding: 0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+
+.Rowbtn {
+ height: 20px;
+ line-height: 20px;
+ background-color: #0dc316;
+ padding: 0 15px;
+ color: #fff;
+ border: none;
+ border-radius: 2px;
+}
+
+#Table_Minche thead tr {
+ background-color: #00BFFF;
+ font-weight: 800;
+}
+
+#Table_Minche thead td {
+ border: 1px solid #00BFFF;
+}
+
+#Table_Minche td {
+ border: 1px solid #f2f2f2;
+ height: 20px;
+ line-height: 20px;
+ padding: 3px 6px 3px 6px;
+}
+
+.dtable thead tr {
+ background-color: #00BFFF;
+ font-weight: 800;
+}
+
+.dtable thead td {
+ border: 1px solid #00BFFF;
+}
+
+.dtable td {
+ border:1px solid #f2f2f2;
+ text-align:center;
+ padding:5px 5px 5px 5px;
+}
+</style>
+</head>
+<body>
+ <div class="content-wrapper" style="background-color: white;">
+ <!-- <section class="content-header"></section> -->
+ <section class="content container-fluid">
+ <div id="Top">
+ <button class="btn" onclick="Updates()">缁戝畾浠诲姟</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('閾佹灦宸插埌浜屾鎺ュ姏')">閾佹灦宸插埌浜屾鎺ュ姏</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('閾佹灦宸插埌涓婄墖浣�')">閾佹灦宸插埌涓婄墖浣�</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('涓婄墖瀹屾垚璇锋眰閫�鍥�')">涓婄墖瀹屾垚璇锋眰閫�鍥�</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('閾佹灦閫�鍥炰簩娆℃帴鍔�')">閾佹灦閫�鍥炰簩娆℃帴鍔�</button>
+ <button class="btn" style="margin-left:10px;" onclick="loadTaskStusts('绛夊緟閫�鍥炲簱鍖�')">绛夊緟閫�鍥炲簱鍖�</button>
+ </div>
+ <div>
+
+ <div style="margin-top: 10px;margin-bottom: 30px;">
+ <table id="Table_Load" class="dtable"
+ style="width: 100%; min-width: 1200px; border-collapse: collapse; border-spacing: 0;">
+ <thead>
+ <tr>
+ <td style="text-align: center;">閫夋嫨</td>
+ <td>ID</td>
+ <td>鏈哄櫒</td>
+ <td>涓婄墖鏈虹姸鎬�</td>
+ <td>宸ヤ綅缂栧彿</td>
+ <td>鐘舵��</td>
+ <td>浠诲姟ID</td>
+ <td>鏋跺彿</td>
+ <td>寰呬笂鏁伴噺</td>
+ <td>宸蹭笂鐗囨暟閲�</td>
+ <td>鐮存崯鏁伴噺</td>
+ <td>MES鐘舵��</td>
+ <td>浠诲姟鐘舵��</td>
+ <td>鍚敤鐘舵��</td>
+ <td>鎿嶄綔</td>
+ </tr>
+ </thead>
+ <tbody id="loaddata">
+ </tbody>
+ </table>
+ </div>
+
+ </div>
+ </section>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties"
index 69d73dc..8fa510c 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties"
@@ -1,7 +1,7 @@
#Generated by Maven Integration for Eclipse
-#Mon Jan 17 08:08:31 CST 2022
+#Thu Aug 29 16:29:41 CST 2024
version=1.0-SNAPSHOT
groupId=com.northglass
-m2e.projectName=Haojing
-m2e.projectLocation=D\:\\workeclipse\\Haojing
+m2e.projectName=Haojing7-20
+m2e.projectLocation=D\:\\workeclipse\\Haojing7-20
artifactId=gmms2
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/maven-archiver/pom.properties" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/maven-archiver/pom.properties"
index 4bdc623..69abf74 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/maven-archiver/pom.properties"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/maven-archiver/pom.properties"
@@ -1,5 +1,5 @@
#Generated by Maven
-#Tue Jan 04 22:54:39 CST 2022
+#Thu Aug 29 10:31:24 CST 2024
version=1.0-SNAPSHOT
groupId=com.northglass
artifactId=gmms2
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst"
index 977ccce..5aec52f 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst"
@@ -2,6 +2,7 @@
com\northglass\constants\StateConstants$GlassArrangeState.class
com\northglass\entity\OutTasks.class
com\northglass\listener\ClientListener.class
+com\northglass\service\device\ToolService.class
com\northglass\constants\StateConstants$RawPackageTxtState.class
com\northglass\constants\FunctionNumber$GrindFaceMachineFunctionNumber.class
com\northglass\util\CRCUtil.class
@@ -23,9 +24,11 @@
com\northglass\service\common\AbstractMessageProcessor.class
com\northglass\log\GLoggerFactory.class
com\northglass\constants\MachineState.class
+com\northglass\web\alltasks\loadTaskController.class
com\northglass\constants\StateConstants$ManufactureBatchState.class
com\northglass\constants\StateConstants$ArrangeMachineTaskState.class
com\northglass\constants\StateConstants$LoadMachineState.class
+com\northglass\service\device\ApiHttp.class
com\northglass\constants\StateConstants$CountMachineState.class
com\northglass\constants\StateConstants$GrindFaceMachineState.class
com\northglass\repository\UserDao.class
@@ -51,6 +54,7 @@
com\northglass\web\alltasks\tasksController.class
com\northglass\repository\MachinesTypeDao.class
com\northglass\entity\LoadRack.class
+com\northglass\service\task\LoadTaskService.class
com\northglass\util\ExcelUtil.class
com\northglass\rest\RestExceptionHandler.class
com\northglass\constants\StateConstants$LightTaskState.class
diff --git "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst"
index e3c8167..d7b922d 100644
--- "a/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst"
+++ "b/\346\261\237\350\213\217\347\232\223\346\231\266\351\241\271\347\233\256/Haojing/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst"
@@ -1,72 +1,76 @@
-D:\workeclipse\Haojing\src\main\java\com\northglass\constants\WebColor.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\TelecomsService\TelecomsService.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\device\Device.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\constants\ShelfTaskType.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\web\account\UserAdminController.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\constants\MessageType.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\util\ExcelUtil.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\ServiceException.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\web\account\ProfileController.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\constants\ConnectState.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\constants\StateConstants.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\repository\UserDao.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\repository\LoadRackDao.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\web\account\RegisterController.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\common\AbstractMessageService.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\util\CRCUtil.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\web\manage\ManageController.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\common\AbstractMachineService.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\repository\OutTasksDao.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\entity\IdEntity.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\entity\Machine.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\rest\RestException.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\entity\MachineType.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\rest\TaskRestController.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\web\home\HomeController.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\common\ServiceInterface.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\entity\AbstractMachineClient.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\constants\GlassColor.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\applicationListener\InitializeSystemApplicationListener.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\constants\ShelfTaskFlag.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\util\JbarcodeUtil.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\message\MessageProcessor.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\web\configuration\ConfigController.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\repository\MachinesTypeDao.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\util\HexUtil.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\entity\AbstractMachine.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\common\AbstractMessageProcessor.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\entity\MachineDispose.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\util\SetupUtil.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\entity\AbstractMessage.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\entity\Task.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\account\AccountService.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\constants\ArrangeMachineTaskType.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\task\TaskService.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\listener\MachineClientListener.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\system\SystemService.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\entity\User.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\listener\ServerListener.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\rest\RestExceptionHandler.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\constants\FunctionNumber.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\repository\MachineDisposeDao.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\web\manage\CutManageController.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\log\GLoggerConstants.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\account\ShiroDbRealm.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\constants\MachineState.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\entity\Telecoms.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\message\AbstractMessageProcessor.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\web\alltasks\tasksController.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\json\JsonTimeValueProcessor.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\util\FolderUtil.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\web\account\LoginController.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\web\home\Test.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\service\device\DeviceService.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\log\GLoggerFactory.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\repository\TelecomsDao.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\repository\MachineDao.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\entity\LoadRack.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\listener\AbstractServerListener.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\listener\ClientListener.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\repository\TaskDao.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\entity\OutTasks.java
-D:\workeclipse\Haojing\src\main\java\com\northglass\listener\ServerConnection.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\task\TaskService.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\repository\TelecomsDao.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\task\LoadTaskService.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\web\home\Test.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\entity\User.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\util\CRCUtil.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\util\JbarcodeUtil.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\applicationListener\InitializeSystemApplicationListener.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\entity\Machine.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\web\configuration\ConfigController.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\entity\MachineType.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\entity\Task.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\constants\GlassColor.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\log\GLoggerFactory.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\listener\ClientListener.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\constants\ShelfTaskType.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\entity\MachineDispose.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\repository\TaskDao.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\common\ServiceInterface.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\rest\RestException.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\device\DeviceService.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\util\ExcelUtil.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\TelecomsService\TelecomsService.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\device\Device.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\constants\MachineState.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\message\MessageProcessor.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\repository\MachineDisposeDao.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\web\account\LoginController.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\json\JsonTimeValueProcessor.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\repository\UserDao.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\constants\WebColor.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\listener\ServerConnection.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\web\alltasks\tasksController.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\entity\IdEntity.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\listener\ServerListener.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\constants\ConnectState.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\constants\ShelfTaskFlag.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\web\account\UserAdminController.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\util\HexUtil.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\repository\MachineDao.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\util\SetupUtil.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\system\SystemService.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\ServiceException.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\account\ShiroDbRealm.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\constants\FunctionNumber.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\web\home\HomeController.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\util\FolderUtil.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\listener\MachineClientListener.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\rest\TaskRestController.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\web\manage\ManageController.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\web\alltasks\loadTaskController.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\device\ToolService.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\message\AbstractMessageProcessor.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\constants\StateConstants.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\rest\RestExceptionHandler.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\web\manage\CutManageController.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\common\AbstractMessageProcessor.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\web\account\RegisterController.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\constants\MessageType.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\entity\OutTasks.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\listener\AbstractServerListener.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\web\account\ProfileController.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\log\GLoggerConstants.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\repository\LoadRackDao.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\entity\AbstractMessage.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\device\ApiHttp.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\entity\LoadRack.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\entity\AbstractMachine.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\entity\Telecoms.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\repository\OutTasksDao.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\constants\ArrangeMachineTaskType.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\common\AbstractMessageService.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\common\AbstractMachineService.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\entity\AbstractMachineClient.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\repository\MachinesTypeDao.java
+D:\workeclipse\Haojing7-20\src\main\java\com\northglass\service\account\AccountService.java
--
Gitblit v1.8.0