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

fix: 修复大屏

Browse Source
This commit is contained in:
liyongde
2023-04-14 15:30:54 +08:00
parent a6e780d56c
commit b258e973fa
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/rest/CockpitController.java
View File

@@ -103,6 +103,7 @@ public class CockpitController{
*/ */
@PostMapping("/workshopCondition") @PostMapping("/workshopCondition")
@Log("车间情况") @Log("车间情况")
@SaIgnore
@ApiOperation("车间情况") @ApiOperation("车间情况")
public CommonResult<Object> workshopCondition() { public CommonResult<Object> workshopCondition() {
return RestBusinessTemplate.execute(cockpitService::workshopCondition); return RestBusinessTemplate.execute(cockpitService::workshopCondition);

2
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_DEVICE.wql
View File

@@ -79,7 +79,7 @@
`pdm_bi_device` d `pdm_bi_device` d
LEFT JOIN pdm_bd_workorder w ON ( d.device_code = w.device_code LEFT JOIN pdm_bd_workorder w ON ( d.device_code = w.device_code
OR d.extend_code = w.device_code ) AND w.order_status <> '5' OR d.extend_code = w.device_code ) AND w.order_status <> '5'
LEFT JOIN md_me_materialbase m ON w.material_id = m.material_id LEFT JOIN md_me_material_detail m ON w.material_id = m.material_id
WHERE WHERE
d.is_used = '1' d.is_used = '1'
ORDER BY ORDER BY