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

优化

Browse Source
This commit is contained in:
zds
2022-07-20 11:47:33 +08:00
parent 4f30f55b66
commit c600760225
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java
View File

@@ -172,6 +172,9 @@ public class EquipmentfileServiceImpl implements EquipmentfileService {
String nowStatus = jsonMst.getString("status");
HashMap<String, String> map = new HashMap<>();
if ("10".equals(status)) {//启用
if (!"11,00".contains(nowStatus)) {
throw new BadRequestException("只有停用、生成状态才可启用！");
}
if (StrUtil.isEmpty(jsonMst.getString("device_bom_id"))) {
throw new BadRequestException("设备BOM不能为空！");
}
@@ -200,7 +203,9 @@ public class EquipmentfileServiceImpl implements EquipmentfileService {
EM_BI_DeviceLifeCycle.insert(jo2);
} else if ("11".equals(status)) {//禁用
map.put("status", "11");
if (!"10".contains(nowStatus)) {
throw new BadRequestException("只有启用状态才可停用！");
}
JSONObject jo2 = new JSONObject();
jo2.put("devicechangedtl_id", IdUtil.getSnowflake(1, 1).nextId());
jo2.put("devicerecord_id", jsonMst.getString("devicerecord_id"));

12
mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
View File

@@ -407,7 +407,7 @@ export default {
if (!'00,11'.includes(rows[i].status)) {
this.sub_flag = true
}
if (!'00,10'.includes(rows[i].status)) {
if (!'10'.includes(rows[i].status)) {
this.dissub_flag = true
}
if (rows.length !== 1) {
@@ -477,12 +477,12 @@ export default {
LODOP.PRINT_INIT('')
LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
LODOP.SET_PRINT_STYLE('FontSize', 9)
LODOP.SET_PRINT_STYLE('FontSize', 12)
LODOP.SET_PRINT_STYLE('Bold', 1)
LODOP.ADD_PRINT_BARCODE('10mm', '15mm', '60mm', '20mm', '128A', data.device_code)
LODOP.ADD_PRINT_TEXT('35mm', '15mm', '80mm', '15mm', '设备编码：' + data.device_code + '')
LODOP.ADD_PRINT_TEXT('40mm', '15mm', '80mm', '15mm', '设备名称：' + data.device_name + '')
LODOP.ADD_PRINT_TEXT('45mm', '15mm', '80mm', '15mm', '型号：' + data.device_model + '')
LODOP.ADD_PRINT_BARCODE('10mm', '12mm', '60mm', '20mm', '128A', data.device_code)
LODOP.ADD_PRINT_TEXT('34mm', '12mm', '80mm', '15mm', '设备编码：' + data.device_code + '')
LODOP.ADD_PRINT_TEXT('42mm', '12mm', '80mm', '15mm', '设备名称：' + data.device_name + '')
LODOP.ADD_PRINT_TEXT('49mm', '12mm', '80mm', '15mm', '设备型号：' + data.device_model + '')
LODOP.PRINT()// 打印
this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()