From ab7a74dfb4d0748175a1f8fcaf9d1a20b3919d2a Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 20 六月 2023 16:42:02 +0800
Subject: [PATCH] 孚能
---
src/main/webapp/views/index.html | 1 +
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 16 +++++++++++-----
src/main/resources/application.yml | 4 ++--
src/main/webapp/views/indexTV.html | 9 ++++-----
5 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index eff1a19..8cfd820 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -206,14 +206,14 @@
Thread.sleep(200);
//娴嬭瘯鏌滅姸鎬佽幏鍙�
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB38.0", (short) 96);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB38.0", (short) 48);
//鍚姩绉诲簱鎸夐挳
OperateResultExOne<byte[]> result6 = siemensS7Net.Read("DB102.0", (short) 96);
//娑堥槻鎶ヨ
- OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 48);
+ OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 96);
if(result3.IsSuccess) {
for(int i=0; i<48; i++){
- startSignal[i][0] = siemensS7Net.getByteTransform().TransByte(result3.Content, i*2);//娴嬭瘯鏌滅姸鎬�
+ startSignal[i][0] = siemensS7Net.getByteTransform().TransByte(result3.Content, i);//娴嬭瘯鏌滅姸鎬�
startSignal[i][1] = siemensS7Net.getByteTransform().TransBool(result4.Content, i)?1:0;//娑堥槻鐘舵��
startSignal[i][2] = siemensS7Net.getByteTransform().TransInt16(result6.Content, i*2);//鍚姩鎸夐挳鐘舵��
}
@@ -288,11 +288,17 @@
boolean idFlag = false;
OperateResult write;
while(idCount < 5){
+
write = siemensS7Net.Write("DB100." + index*4, array); // 鍐�
if(write.IsSuccess){
Thread.sleep(200);
- OperateResultExOne<byte[]> readId = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
- if(readId.IsSuccess){
+ OperateResultExOne<byte[]> readId = siemensS7Net.Read("DB100." + index*4, (short) (staNoSize*2));
+ if(readId.IsSuccess){
+ if(staProtocol.getWorkNo()!=0&&staProtocol.getWorkNo()!=9999){
+ if(!staProtocol.isInEnable()&&(staProtocol.getSiteId()==201||staProtocol.getSiteId()==206)){
+ break;
+ }
+ }
short workNo = siemensS7Net.getByteTransform().TransInt16(readId.Content, 0);
if(staProtocol.getWorkNo().equals(workNo)){
//宸ヤ綔鍙峰啓鍏ユ垚鍔�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 993d52c..5272dec 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=zjfnasrs
+ url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
username: sa
password: sa@123
@@ -35,7 +35,7 @@
enable: false
wms:
- url: localhost:8081/fnwms
+ url: localhost:8080/fnwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 3276b8a..88e61c0 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -108,7 +108,7 @@
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_pri desc,io_time ASC,wrk_no ASC
</select>
<select id="selectLocMoving" resultMap="BaseResultMap">
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index d93a5d6..cebf04a 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -6,6 +6,7 @@
<link rel="stylesheet" href="../static/css/index.css">
<script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<style>
+
</style>
</head>
<body>
diff --git a/src/main/webapp/views/indexTV.html b/src/main/webapp/views/indexTV.html
index d03a904..1887e28 100644
--- a/src/main/webapp/views/indexTV.html
+++ b/src/main/webapp/views/indexTV.html
@@ -7,12 +7,11 @@
<script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<style>
html{
- transform: scale(1) translate(0,0);
- /*transform: scale(0.5) translate(-50%,-50%);*/
- height: 150%;
- width: 150%;
+ /*transform: scale(1) translate(0,0);*/
+ transform: scale(0.5) translate(-50%,-50%);
+ height: 200%;
+ width: 200%;
}
-
</style>
</head>
<body>
--
Gitblit v1.9.1