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

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

@@ -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>
@@ -407,6 +408,13 @@
} }
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');
@@ -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';
} }

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