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

修改设备表

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-10-08 13:56:44 +08:00
parent 5fc1250f82
commit 2df3b8fcff
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java
View File

@@ -247,7 +247,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService {
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
String device_id = param.getString("device_id");
WQLObject wo_device = WQLObject.getWQLObject("pdm_bi_device");
WQLObject wo_device = WQLObject.getWQLObject("em_bi_deviceinfo");
JSONObject device = wo_device.query("device_id = '" + device_id + "'").uniqueResult(0);
String device_code = device.getString("device_code");
JSONObject row = param.getJSONObject("row");

8
nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEDURE001.wql
View File

@@ -66,7 +66,7 @@
FROM
MPS_BD_ProduceShiftOrder ShiftOrder
LEFT JOIN md_me_materialbase material ON material.material_id = ShiftOrder.material_id
LEFT JOIN pdm_bi_device device ON ShiftOrder.device_id = device.device_id
LEFT JOIN em_bi_deviceinfo device ON ShiftOrder.device_id = device.device_id
LEFT JOIN md_pb_classstandard classstandard ON classstandard.class_id = material.product_series
WHERE
ShiftOrder.is_delete = '0'
@@ -114,7 +114,7 @@
device.workprocedure_id
FROM
PDM_BI_PersonCorrDevice personDevice
LEFT JOIN PDM_BI_Device device ON personDevice.device_id = device.device_id
LEFT JOIN em_bi_deviceinfo device ON personDevice.device_id = device.device_id
WHERE
device.is_delete = '0' and personDevice.jockey_id = 输入.jockey_id
ENDSELECT
@@ -150,7 +150,7 @@
device.device_name
FROM
PDM_BI_PersonCorrDevice personDevice
LEFT JOIN PDM_BI_Device device ON personDevice.device_id = device.device_id
LEFT JOIN em_bi_deviceinfo device ON personDevice.device_id = device.device_id
WHERE
device.is_delete = '0' and personDevice.jockey_id = 输入.jockey_id and device.workprocedure_id = 输入.workprocedure_id
ENDSELECT
@@ -166,7 +166,7 @@
user.nick_name
FROM
MPS_BD_MacOperateRecord record
LEFT JOIN PDM_BI_Device device ON record.device_id = device.device_id
LEFT JOIN em_bi_deviceinfo device ON record.device_id = device.device_id
LEFT JOIN sys_user user ON user.user_id = record.jockey_id
WHERE
record.produceorder_id = 输入.produceorder_id

6
nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql
View File

@@ -80,7 +80,7 @@
FROM
PDM_BI_PersonCorrDevice personDevice
LEFT JOIN sys_user user ON personDevice.jockey_id = user.user_id
LEFT JOIN PDM_BI_Device device ON personDevice.device_id = device.device_id
LEFT JOIN em_bi_deviceinfo device ON personDevice.device_id = device.device_id
left join PDM_BI_DeviceItemValue deviceValue on deviceValue.device_id = device.device_id
left join PDM_BI_DeviceItem item on item.item_id = deviceValue.item_id
where
@@ -101,7 +101,7 @@
work.workprocedure_name
FROM
PDM_BI_PersonCorrDevice personDevice
left join PDM_BI_Device device on device.device_id = personDevice.device_id
left join em_bi_deviceinfo device on device.device_id = personDevice.device_id
left join PDM_BI_WorkProcedure work on device.workprocedure_id = work.workprocedure_id
where
personDevice.jockey_id = 输入.user_id and (personDevice.device_id is not null or personDevice.device_id != "" )
@@ -118,7 +118,7 @@
item.item_code
FROM
PDM_BI_DeviceItemValue deviceItemValue
LEFT JOIN PDM_BI_Device device ON deviceItemValue.device_id = device.device_id
LEFT JOIN em_bi_deviceinfo device ON deviceItemValue.device_id = device.device_id
LEFT JOIN PDM_BI_DeviceItem item ON deviceItemValue.item_id = item.item_id
where
deviceItemValue.device_id = 输入.device_id

14
nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java
View File

@@ -50,7 +50,7 @@ public class DeviceServiceImpl implements DeviceService {
@Override
public List<DeviceDto> queryAll(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("pdm_bi_device");
WQLObject wo = WQLObject.getWQLObject("em_bi_deviceinfo");
JSONArray arr = wo.query().getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(DeviceDto.class);
return null;
@@ -58,7 +58,7 @@ public class DeviceServiceImpl implements DeviceService {
@Override
public DeviceDto findById(Long device_id) {
WQLObject wo = WQLObject.getWQLObject("pdm_bi_device");
WQLObject wo = WQLObject.getWQLObject("em_bi_deviceinfo");
JSONObject json = wo.query("device_id = '" + device_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)) {
return json.toJavaObject(DeviceDto.class);
@@ -68,7 +68,7 @@ public class DeviceServiceImpl implements DeviceService {
@Override
public DeviceDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("pdm_bi_device");
WQLObject wo = WQLObject.getWQLObject("em_bi_deviceinfo");
JSONObject json = wo.query("device_code ='" + code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)) {
return json.toJavaObject(DeviceDto.class);
@@ -91,7 +91,7 @@ public class DeviceServiceImpl implements DeviceService {
dto.setCreate_name(nickName);
dto.setCreate_time(now);
WQLObject wo = WQLObject.getWQLObject("pdm_bi_device");
WQLObject wo = WQLObject.getWQLObject("em_bi_deviceinfo");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
}
@@ -103,7 +103,7 @@ public class DeviceServiceImpl implements DeviceService {
if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
//编码唯一性校验
WQLObject wo = WQLObject.getWQLObject("pdm_bi_device");
WQLObject wo = WQLObject.getWQLObject("em_bi_deviceinfo");
String where = "is_delete = '0' and device_code = '" + dto.getDevice_code() + "' and device_id != '" + dto.getDevice_id() + "'";
JSONObject jsonObject = wo.query(where).uniqueResult(0);
@@ -119,7 +119,7 @@ public class DeviceServiceImpl implements DeviceService {
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(Long[] ids) {
WQLObject wo = WQLObject.getWQLObject("pdm_bi_device");
WQLObject wo = WQLObject.getWQLObject("em_bi_deviceinfo");
WQLObject wo_value = WQLObject.getWQLObject("PDM_BI_DeviceItemValue");
for (Long device_id : ids) {
wo.delete("device_id = '" + device_id + "'");
@@ -134,7 +134,7 @@ public class DeviceServiceImpl implements DeviceService {
is_used = "0";
}
json.put("is_used", is_used);
WQLObject.getWQLObject("PDM_BI_Device").update(json);
WQLObject.getWQLObject("em_bi_deviceinfo").update(json);
}
}

2
nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql
View File

@@ -44,7 +44,7 @@
SELECT
device.*
FROM
PDM_BI_Device device
em_bi_deviceinfo device
WHERE
device.is_delete = '0'

BIN
nladmin-system/src/main/java/org/nl/wms/pdm/wql/em.xls Normal file
View File

Binary file not shown.

BIN
nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
View File

Binary file not shown.