root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt: 看板加急字段显示

Browse Source
This commit is contained in:
liyongde
2025-07-02 10:26:22 +08:00
parent d30e25a8cd
commit 56285ab21c
4 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lms/nladmin-system/doc/套轴点位日志记录实时看板v3.html
View File

@@ -157,13 +157,13 @@
margin-bottom: 15px; margin-bottom: 15px;
gap: 20px; gap: 20px;
} }
.legend-item { .legend-item {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 0.9em; font-size: 0.9em;
} }
.color-box { .color-box {
display: inline-block; display: inline-block;
width: 16px; width: 16px;
@@ -171,11 +171,11 @@
margin-right: 8px; margin-right: 8px;
border-radius: 3px; border-radius: 3px;
} }
.red-box { .red-box {
background-color: #8B0000; background-color: #8B0000;
} }
.yellow-box { .yellow-box {
background-color: #FFC107; background-color: #FFC107;
} }
@@ -223,6 +223,7 @@
<th>呼叫时间</th> <th>呼叫时间</th>
<th>管芯规格</th> <th>管芯规格</th>
<th>套轴标记</th> <th>套轴标记</th>
<th>是否加急</th>
<th>一键恢复</th> <th>一键恢复</th>
</tr> </tr>
</thead> </thead>
@@ -241,7 +242,7 @@
recoverApiUrl: `${BASE_URL}/api/wms/apply/recover`, recoverApiUrl: `${BASE_URL}/api/wms/apply/recover`,
tipApiUrl: `${BASE_URL}/api/wms/apply/v2/tzTaskINfo` tipApiUrl: `${BASE_URL}/api/wms/apply/v2/tzTaskINfo`
}; };
const refreshInterval = 5000; // 刷新间隔统一为5秒 const refreshInterval = 5000; // 刷新间隔统一为5秒
const devices = ['B_CBJ01', 'B_CBJ02']; const devices = ['B_CBJ01', 'B_CBJ02'];
@@ -254,9 +255,9 @@
}, },
body: JSON.stringify({ device_code: deviceCode }), body: JSON.stringify({ device_code: deviceCode }),
}); });
if (!response.ok) { if (!response.ok) {
const errorText = await response.text(); const errorText = await response.text();
console.error(`HTTP error response for ${deviceCode} (log):`, errorText); console.error(`HTTP error response for ${deviceCode} (log):`, errorText);
throw new Error(`HTTP error! status: ${response.status} for ${deviceCode} (log). Response: ${errorText}`); throw new Error(`HTTP error! status: ${response.status} for ${deviceCode} (log). Response: ${errorText}`);
} }
@@ -374,7 +375,7 @@
row.insertCell().textContent = item.up_or_down === '1' ? '上' : (item.up_or_down === '2' ? '下' : item.up_or_down || 'N/A'); row.insertCell().textContent = item.up_or_down === '1' ? '上' : (item.up_or_down === '2' ? '下' : item.up_or_down || 'N/A');
row.insertCell().textContent = item.qzz_size || 'N/A'; row.insertCell().textContent = item.qzz_size || 'N/A';
row.insertCell().textContent = item.qzz_generation || 'N/A'; row.insertCell().textContent = item.qzz_generation || 'N/A';
let statusText = '已完成'; let statusText = '已完成';
if (item.status === '01') { if (item.status === '01') {
statusText = '准备套轴'; statusText = '准备套轴';
@@ -389,7 +390,7 @@
const startTimeCell = row.insertCell(); const startTimeCell = row.insertCell();
startTimeCell.textContent = item.start_time || 'N/A'; startTimeCell.textContent = item.start_time || 'N/A';
row.insertCell().textContent = item.tube || 'N/A'; row.insertCell().textContent = item.tube || 'N/A';
let tzText = '未套轴'; let tzText = '未套轴';
@@ -406,7 +407,14 @@
tzText = '套轴异常'; tzText = '套轴异常';
} }
row.insertCell().textContent = tzText || 'N/A'; row.insertCell().textContent = tzText || 'N/A';
// 是否加急
let urgentText = '未加急';
if (item.manufacture_sort === 'P2') {
urgentText = '已加急';
}
row.insertCell().textContent = urgentText || 'N/A';
// 添加恢复按钮 // 添加恢复按钮
const recoverCell = row.insertCell(); const recoverCell = row.insertCell();
const recoverBtn = document.createElement('button'); const recoverBtn = document.createElement('button');
@@ -424,7 +432,7 @@
container_name: item.container_name container_name: item.container_name
}) })
}); });
if (response.ok) { if (response.ok) {
const alertDiv = document.createElement('div'); const alertDiv = document.createElement('div');
alertDiv.style.position = 'fixed'; alertDiv.style.position = 'fixed';
@@ -451,7 +459,7 @@
} }
}; };
recoverCell.appendChild(recoverBtn); recoverCell.appendChild(recoverBtn);
// 检查start_time是否超过2小时，并设置行样式 // 检查start_time是否超过2小时，并设置行样式
if (item.start_time) { if (item.start_time) {
const startTime = new Date(item.start_time.replace(/-/g, '/')); const startTime = new Date(item.start_time.replace(/-/g, '/'));
@@ -467,7 +475,7 @@
} else { } else {
const row = tableBody.insertRow(); const row = tableBody.insertRow();
const cell = row.insertCell(); const cell = row.insertCell();
cell.colSpan = 7; cell.colSpan = 11;
cell.textContent = '暂无数据。'; cell.textContent = '暂无数据。';
cell.style.textAlign = 'center'; cell.style.textAlign = 'center';
} }
@@ -492,7 +500,7 @@
const data = await response.json(); const data = await response.json();
tip = data.tip || ''; tip = data.tip || '';
tip2 = data.tip2 || ''; tip2 = data.tip2 || '';
// 显示tip2在对应设备标题下方 // 显示tip2在对应设备标题下方
document.getElementById('tip2-' + deviceCode).textContent = tip2; document.getElementById('tip2-' + deviceCode).textContent = tip2;
} }
@@ -544,4 +552,4 @@
cursor: not-allowed; cursor: not-allowed;
opacity: 0.6; opacity: 0.6;
} }
</style> </style>

4
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
View File

@@ -201,7 +201,8 @@
MIN(p.start_time) AS start_time, MIN(p.start_time) AS start_time,
IF(p.paper_tube_or_FRP = '1', p.paper_tube_description, p.FRP_description) AS tube, IF(p.paper_tube_or_FRP = '1', p.paper_tube_description, p.FRP_description) AS tube,
MIN(p.`status`) AS `status`, MIN(p.`status`) AS `status`,
MAX(p.qzzno) AS qzzno MAX(p.qzzno) AS qzzno,
MAX(p.manufacture_sort) AS manufacture_sort
FROM `pdm_bi_slittingproductionplan` p FROM `pdm_bi_slittingproductionplan` p
WHERE p.`status` <![CDATA[ < ]]> '09' WHERE p.`status` <![CDATA[ < ]]> '09'
AND p.is_delete = '0' AND p.is_delete = '0'
@@ -228,7 +229,6 @@
p.container_name p.container_name
ORDER BY ORDER BY
`status`, `status`,
qzz_size,
manufacture_sort desc, manufacture_sort desc,
start_time start_time
</select> </select>

1
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/CallPlanViewVO.java
View File

@@ -47,4 +47,5 @@ public class CallPlanViewVO implements Serializable {
private String start_time; private String start_time;
private String is_paper_ok; private String is_paper_ok;
private String qzzno; private String qzzno;
private String manufacture_sort;
} }

4
lms/nladmin-system/src/test/java/org/nl/init/EventTest.java
View File

@@ -90,11 +90,11 @@ public class EventTest {
// List<String> list = Arrays.asList("482210000000001"); // List<String> list = Arrays.asList("482210000000001");
// System.out.println(papervehicleMapper.getGXs("0", list)); // System.out.println(papervehicleMapper.getGXs("0", list));
// PdmBiSlittingproductionplan byContainerName = slittingproductionplanService.getByContainerName("B1虚拟-B50FQ00001-2"); // PdmBiSlittingproductionplan byContainerName = slittingproductionplanService.getByContainerName("B1虚拟-B50FQ00001-2");
PdmBiSlittingproductionplan byContainerName = slittingproductionplanService.getByContainerName("B1虚拟-B50FQ00003-0"); PdmBiSlittingproductionplan byContainerName = slittingproductionplanService.getByContainerName("BB3X2410280907A1");
List<PdmBiSlittingproductionplan> plans = new ArrayList<>(); List<PdmBiSlittingproductionplan> plans = new ArrayList<>();
plans.add(byContainerName); plans.add(byContainerName);
BstIvtShafttubeivt shafttubeivt = bstIvtShafttubeivtMapper.selectOne(new LambdaQueryWrapper<BstIvtShafttubeivt>().eq(BstIvtShafttubeivt::getPoint_code, "B_CBJ01")); BstIvtShafttubeivt shafttubeivt = bstIvtShafttubeivtMapper.selectOne(new LambdaQueryWrapper<BstIvtShafttubeivt>().eq(BstIvtShafttubeivt::getPoint_code, "B_CBJ01"));
autoCallAirShaftTask.toCallAgvMovePaperTube(plans, "0", shafttubeivt); autoCallAirShaftTask.toCallAgvMovePaperTube(plans, "0", shafttubeivt, slittingproductionplanService.getAllCutPlan(0));
} }
@Test @Test