项目依赖包
This commit is contained in:
@@ -1,21 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<module type="JAVA_MODULE" version="4">
|
|
||||||
<component name="FacetManager">
|
|
||||||
<facet type="hibernate" name="Hibernate">
|
|
||||||
<configuration>
|
|
||||||
<datasource-map />
|
|
||||||
<naming-strategy-map />
|
|
||||||
<deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/wmsdssconfig/abb/hibernate.cfg.xml" />
|
|
||||||
</configuration>
|
|
||||||
</facet>
|
|
||||||
</component>
|
|
||||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
|
||||||
<exclude-output />
|
|
||||||
<content url="file://$MODULE_DIR$">
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
|
||||||
</content>
|
|
||||||
<orderEntry type="inheritedJdk" />
|
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
|
||||||
<orderEntry type="library" name="lib" level="project" />
|
|
||||||
</component>
|
|
||||||
</module>
|
|
||||||
@@ -46,18 +46,13 @@ public class ABBThreadSchedule extends ThreadSchedule {
|
|||||||
productionLineEndSsjThread.start();
|
productionLineEndSsjThread.start();
|
||||||
Thread.sleep(400);
|
Thread.sleep(400);
|
||||||
|
|
||||||
/*productionLineStartSsjThread = new ProductionLineStartSsjThread(m_hsSysParam);
|
|
||||||
productionLineStartSsjThread.setName("产线入库开始输送机");
|
Thread.sleep(400);
|
||||||
productionLineStartSsjThread.start();
|
|
||||||
Thread.sleep(400);*/
|
|
||||||
outTraySsjThread = new OutTraySsjThread(m_hsSysParam);
|
outTraySsjThread = new OutTraySsjThread(m_hsSysParam);
|
||||||
outTraySsjThread.setName("空托盘出库输送机");
|
outTraySsjThread.setName("空托盘出库输送机");
|
||||||
outTraySsjThread.start();
|
outTraySsjThread.start();
|
||||||
Thread.sleep(400);
|
Thread.sleep(400);
|
||||||
callTraySsjThread = new CallTraySsjThread(m_hsSysParam);
|
|
||||||
callTraySsjThread.setName("呼叫空托盘线程");
|
|
||||||
callTraySsjThread.start();
|
|
||||||
Thread.sleep(400);
|
|
||||||
|
|
||||||
rgvThread2 = new RgvThread2(m_hsSysParam);
|
rgvThread2 = new RgvThread2(m_hsSysParam);
|
||||||
rgvThread2.setName("RGV2线程组");
|
rgvThread2.setName("RGV2线程组");
|
||||||
@@ -71,6 +66,10 @@ public class ABBThreadSchedule extends ThreadSchedule {
|
|||||||
rgvThread3.setName("RGV3线程组");
|
rgvThread3.setName("RGV3线程组");
|
||||||
rgvThread3.start();
|
rgvThread3.start();
|
||||||
Thread.sleep(400);
|
Thread.sleep(400);
|
||||||
|
callTraySsjThread = new CallTraySsjThread(m_hsSysParam);
|
||||||
|
callTraySsjThread.setName("呼叫空托盘线程");
|
||||||
|
callTraySsjThread.start();
|
||||||
|
Thread.sleep(400);
|
||||||
|
|
||||||
} catch (Exception er) {
|
} catch (Exception er) {
|
||||||
Logger.error("........设备调度线程启动出错........" + er.getMessage());
|
Logger.error("........设备调度线程启动出错........" + er.getMessage());
|
||||||
|
|||||||
@@ -54,8 +54,8 @@ public class DbGet {
|
|||||||
List<SsjDevice> ls = new ArrayList<>();
|
List<SsjDevice> ls = new ArrayList<>();
|
||||||
try {
|
try {
|
||||||
HashMap<?, ?> hsSSJMap = (HashMap<?, ?>) hsComParamSSJ.get("hsSSJMap");
|
HashMap<?, ?> hsSSJMap = (HashMap<?, ?>) hsComParamSSJ.get("hsSSJMap");
|
||||||
ls.add((SsjDevice) hsSSJMap.get("productionLineStartSsj-5"));
|
|
||||||
ls.add((SsjDevice) hsSSJMap.get("productionLineStartSsj-6"));
|
ls.add((SsjDevice) hsSSJMap.get("productionLineStartSsj-6"));
|
||||||
|
ls.add((SsjDevice) hsSSJMap.get("productionLineStartSsj-5"));
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
Logger.error("获取输送机状态信息异常" + ex.getMessage());
|
Logger.error("获取输送机状态信息异常" + ex.getMessage());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ public class RgvThread3 extends CraneThread {
|
|||||||
Optional<SsjDevice> first = trayDisassembleEndSsj.stream().filter(x -> (x.RKDW == 1 && x.ssjNo.equals(startPoint))).findFirst();
|
Optional<SsjDevice> first = trayDisassembleEndSsj.stream().filter(x -> (x.RKDW == 1 && x.ssjNo.equals(startPoint))).findFirst();
|
||||||
if (first.isPresent()){
|
if (first.isPresent()){
|
||||||
SsjDevice startSsj = first.get();
|
SsjDevice startSsj = first.get();
|
||||||
QueryDbDataUtils.createRgvQueue(m_dao,startSsj.ssjNo, startSsj.RWH, "1111",TYPE_A_1.getXd(),TYPE_A_1.getCode());
|
QueryDbDataUtils.createRgvQueue(m_dao,startSsj.ssjNo, startSsj.RWH, "1017",TYPE_A_1.getXd(),TYPE_A_1.getCode());
|
||||||
}/*else {
|
}/*else {
|
||||||
Optional<SsjDevice> first1 = trayDisassembleEndSsj.stream().filter(x -> x.RKDW == 1).findFirst();
|
Optional<SsjDevice> first1 = trayDisassembleEndSsj.stream().filter(x -> x.RKDW == 1).findFirst();
|
||||||
if (first1.isPresent()){
|
if (first1.isPresent()){
|
||||||
|
|||||||
Reference in New Issue
Block a user