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-25 18:04:27 +08:00
parent 6be529ed29
commit 297cb2d294
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/dto/WorkorderDto.java
View File

@@ -48,12 +48,15 @@ public class WorkorderDto implements Serializable{
* 生产量（已完成数量） * 生产量（已完成数量）
*/ */
private BigDecimal real_qty; private BigDecimal real_qty;
private BigDecimal qualified_qty;
private BigDecimal unqualified_qty;
/** /**
* 生产状态1未生产2已下发3生产中4停止5完成 * 生产状态1未生产2已下发3生产中4停止5完成
*/ */
private String order_status; private String order_status;
private String order_status_name;
/** /**
* 班次类型 * 班次类型

17
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
View File

@@ -212,16 +212,13 @@ public class CockpitServiceImpl implements CockpitService{
.addParam("flag", "3") .addParam("flag", "3")
.process() .process()
.getResultJSONArray(0); .getResultJSONArray(0);
// JSONObject devicesStatus = PointUpdateUtil.getDevicesStatus(result); JSONObject devicesStatus = PointUpdateUtil.getDevicesStatus(result);
// if (ObjectUtil.isEmpty(devicesStatus)) { if (ObjectUtil.isEmpty(devicesStatus)) {
// return null; return null;
// } }
// JSONArray data = ObjectUtil.isNotEmpty( JSONArray data = ObjectUtil.isNotEmpty(
// devicesStatus.getJSONArray("data"))?devicesStatus.getJSONArray("data"):null; devicesStatus.getJSONArray("data"))?devicesStatus.getJSONArray("data"):result;
// if (ObjectUtil.isEmpty(data)) { if(ObjectUtil.isNotEmpty(data)) {
// return null;
// }
if(ObjectUtil.isNotEmpty(result)) { //todo: result -> data
res = result.toJavaList(DeviceInfoDto.class); res = result.toJavaList(DeviceInfoDto.class);
res.forEach(d -> { res.forEach(d -> {
DeviceEnum deviceEnum = DeviceEnum.get(d.getDevice_model(), d.getDevice_code()); DeviceEnum deviceEnum = DeviceEnum.get(d.getDevice_model(), d.getDevice_code());

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

@@ -47,7 +47,7 @@
IF 输入.flag = "1" IF 输入.flag = "1"
PAGEQUERY PAGEQUERY
SELECT SELECT
dicts.label order_status, dicts.label order_status_name,
material.material_code, material.material_code,
device.device_name, device.device_name,
workorder.* workorder.*