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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-08-24 10:15:56 +08:00
parent df49d82d34
commit 98336e9c34
8 changed files with 18 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.wms.basedata.em.service.DevicebomService;
import org.nl.wms.basedata.em.service.dto.DevicebomDto;
import org.nl.wms.basedata.master.service.ClassstandardService;
@@ -106,14 +107,10 @@ public class DevicebomServiceImpl implements DevicebomService {
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
String device_bom_code = whereJson.getString("device_bom_code");
JSONObject jsonObject = bomMstTab.query("device_bom_code = '" + device_bom_code + "' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonObject)) throw new BadRequestException("此编码已存在");
// 插入主表
JSONObject jsonMst = new JSONObject();
jsonMst.put("device_bom_id", IdUtil.getSnowflake(1,1).nextId());
jsonMst.put("device_bom_code",device_bom_code);
jsonMst.put("device_bom_code", CodeUtil.getNewCode("DEVICE_BOM_CODE"));
jsonMst.put("material_name",whereJson.getString("material_name"));
jsonMst.put("material_type_id",whereJson.get("material_type_id"));
jsonMst.put("detail_count",tableData.size());
@@ -152,7 +149,6 @@ public class DevicebomServiceImpl implements DevicebomService {
// 修改主表
JSONObject jsonMst = bomMstTab.query("device_bom_id ='" + device_bom_id + "'").uniqueResult(0);
jsonMst.put("device_bom_code",whereJson.getString("device_bom_code"));
jsonMst.put("material_name",whereJson.getString("material_name"));
jsonMst.put("material_type_id",whereJson.get("material_type_id"));
jsonMst.put("detail_count",tableData.size());
@@ -177,9 +173,6 @@ public class DevicebomServiceImpl implements DevicebomService {
bomDtlTab.insert(jsonDtl);
}
String device_bom_code = whereJson.getString("device_bom_code");
JSONArray jsonObject = bomMstTab.query("device_bom_code = '" + device_bom_code + "' and is_delete = '0'").getResultJSONArray(0);
if (jsonObject.size() > 1) throw new BadRequestException("此编码已存在");
}
@Override

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.wms.basedata.em.service.DevicefaultclassService;
import org.nl.wms.basedata.em.service.dto.DevicefaultclassDto;
import org.nl.wms.basedata.master.service.ClassstandardService;
@@ -101,13 +102,9 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService {
WQLObject wo = WQLObject.getWQLObject("em_bi_devicefaultclass");
String device_faultclass_code = whereJson.getString("device_faultclass_code");
JSONObject jsonObject = wo.query("device_faultclass_code = '" + device_faultclass_code + "' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonObject)) throw new BadRequestException("此编码已存在");
JSONObject json = new JSONObject();
json.put("device_faultclass_id",IdUtil.getSnowflake(1,1).nextId());
json.put("device_faultclass_code", whereJson.getString("device_faultclass_code"));
json.put("device_faultclass_code", CodeUtil.getNewCode("DEVICE_FACLASS_CODE"));
json.put("device_faultclass_name", whereJson.getString("device_faultclass_name"));
json.put("material_type_id", whereJson.getString("material_type_id"));
json.put("solutions", whereJson.getString("solutions"));
@@ -126,7 +123,6 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService {
WQLObject wo = WQLObject.getWQLObject("em_bi_devicefaultclass");
JSONObject json = wo.query("device_faultclass_id = '" + whereJson.getString("device_faultclass_id") + "'").uniqueResult(0);
json.put("device_faultclass_code", whereJson.getString("device_faultclass_code"));
json.put("device_faultclass_name", whereJson.getString("device_faultclass_name"));
json.put("material_type_id", whereJson.getString("material_type_id"));
json.put("solutions", whereJson.getString("solutions"));
@@ -136,10 +132,6 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService {
json.put("update_time", DateUtil.now());
wo.update(json);
String device_faultclass_code = whereJson.getString("device_faultclass_code");
JSONArray jsonObject = wo.query("device_faultclass_code = '" + device_faultclass_code + "' and is_delete = '0'").getResultJSONArray(0);
if (jsonObject.size() > 1) throw new BadRequestException("此编码已存在");
}
@Override

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

@@ -6,6 +6,7 @@ import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.wms.basedata.em.service.DevicemaintenanceitemsService;
import org.nl.wms.basedata.em.service.dto.DevicemaintenanceitemsDto;
import org.nl.wql.WQL;
@@ -94,7 +95,7 @@ public class DevicemaintenanceitemsServiceImpl implements Devicemaintenanceitems
JSONObject json = new JSONObject();
json.put("maint_item_id", IdUtil.getSnowflake(1,1).nextId());
json.put("maint_item_code", whereJson.getString("maint_item_code"));
json.put("maint_item_code", CodeUtil.getNewCode("MAINT_ITEM_CODE"));
json.put("maint_item_name", whereJson.getString("maint_item_name"));
json.put("item_level", whereJson.getString("item_level"));
json.put("contents", whereJson.getString("contents"));
@@ -119,7 +120,6 @@ public class DevicemaintenanceitemsServiceImpl implements Devicemaintenanceitems
WQLObject wo = WQLObject.getWQLObject("em_bi_devicemaintenanceitems");
JSONObject json = wo.query("maint_item_id = '" + whereJson.getString("maint_item_id") + "'").uniqueResult(0);
json.put("maint_item_code", whereJson.getString("maint_item_code"));
json.put("maint_item_name", whereJson.getString("maint_item_name"));
json.put("item_level", whereJson.getString("item_level"));
json.put("contents", whereJson.getString("contents"));

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

@@ -6,6 +6,7 @@ import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.wms.basedata.em.service.DevicerepairitemsService;
import org.nl.wms.basedata.em.service.dto.DevicerepairitemsDto;
import org.nl.wql.WQL;
@@ -90,7 +91,7 @@ public class DevicerepairitemsServiceImpl implements DevicerepairitemsService {
JSONObject json = new JSONObject();
json.put("repair_item_id", IdUtil.getSnowflake(1,1).nextId());
json.put("repair_item_code", whereJson.getString("repair_item_code"));
json.put("repair_item_code", CodeUtil.getNewCode("REPAIR_ITEM_CODE"));
json.put("repair_item_name", whereJson.getString("repair_item_name"));
json.put("requirement", whereJson.getString("requirement"));
json.put("remark", whereJson.getString("remark"));
@@ -115,7 +116,6 @@ public class DevicerepairitemsServiceImpl implements DevicerepairitemsService {
WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairitems");
JSONObject json = wo.query("repair_item_id = '" + whereJson.getString("repair_item_id") + "'").uniqueResult(0);
json.put("repair_item_code", whereJson.getString("repair_item_code"));
json.put("repair_item_name", whereJson.getString("repair_item_name"));
json.put("requirement", whereJson.getString("requirement"));
json.put("remark", whereJson.getString("remark"));

7
mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue
View File

@@ -34,8 +34,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="BOM编码" prop="device_bom_code">
<el-input v-model="form.device_bom_code" style="width: 250px;" :disabled="crud.status.view > 0" />
<el-form-item label="BOM编码">
<el-input v-model="form.device_bom_code" style="width: 250px;" disabled placeholder="系统生成" />
</el-form-item>
</el-col>
@@ -182,9 +182,6 @@ export default {
material_type_id: [
{ required: true, message: '设备类别不能为空', trigger: 'blur' }
],
device_bom_code: [
{ required: true, message: '设备BOM编码不能为空', trigger: 'blur' }
],
material_name: [
{ required: true, message: '设备BOM名称不能为空', trigger: 'blur' }
]

7
mes/qd/src/views/wms/basedata/em/devicefaultclass/index.vue
View File

@@ -41,10 +41,9 @@
<el-row>
<el-col span="12">
<el-form-item label="故障编码:" prop="device_faultclass_code">
<el-input v-model="form.device_faultclass_code" style="width: 280px;" />
<el-input v-model="form.device_faultclass_name" style="width: 280px;" disabled placeholder="系统生成" />
</el-form-item>
</el-col>
<el-col span="12">
<el-form-item label="故障名称:" prop="device_faultclass_name">
<el-input v-model="form.device_faultclass_name" style="width: 280px;" />
@@ -72,6 +71,7 @@
<el-input v-model="form.solutions" style="width: 650px;" rows="2" type="textarea" />
</el-form-item>
</el-col>
</el-row>
<el-row>
@@ -154,9 +154,6 @@ export default {
permission: {
},
rules: {
device_faultclass_code: [
{ required: true, message: '故障编码不能为空', trigger: 'blur' }
],
device_faultclass_name: [
{ required: true, message: '故障名称不能为空', trigger: 'blur' }
],

11
mes/qd/src/views/wms/basedata/em/devicemaintain/index.vue
View File

@@ -58,8 +58,8 @@
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
<el-row>
<el-col span="12">
<el-form-item label="保养项目编码:" prop="maint_item_code">
<el-input v-model="form.maint_item_code" style="width: 230px;" />
<el-form-item label="保养项目编码:">
<el-input v-model="form.maint_item_code" style="width: 230px;" disabled placeholder="系统生成" />
</el-form-item>
</el-col>
<el-col span="12">
@@ -83,7 +83,7 @@
</el-form-item>
</el-col>
<el-col span="12">
<el-form-item label="备注:">
<el-form-item label="保养实施人:">
<el-input v-model="form.remark" style="width: 230px;" />
</el-form-item>
</el-col>
@@ -128,7 +128,7 @@
<el-table-column prop="contents" label="保养内容" show-overflow-tooltip />
<el-table-column prop="requirement" label="保养要求" show-overflow-tooltip />
<el-table-column prop="acceptancecriteria" label="验收标准" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="remark" label="保养实施人" />
<el-table-column prop="create_name" label="创建人姓名" />
<el-table-column prop="create_time" label="创建时间" width="150px"/>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
@@ -184,9 +184,6 @@ export default {
permission: {
},
rules: {
maint_item_code: [
{ required: true, message: '保养项目编码不能为空', trigger: 'blur' }
],
maint_item_name: [
{ required: true, message: '保养项目名称不能为空', trigger: 'blur' }
],

7
mes/qd/src/views/wms/basedata/em/devicerepairitems/index.vue
View File

@@ -39,8 +39,8 @@
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
<el-row>
<el-col span="12">
<el-form-item label="维修项目编码:" prop="repair_item_code">
<el-input v-model="form.repair_item_code" style="width: 200px;" />
<el-form-item label="维修项目编码:">
<el-input v-model="form.repair_item_code" style="width: 200px;" disabled placeholder="系统生成" />
</el-form-item>
</el-col>
<el-col span="12">
@@ -129,9 +129,6 @@ export default {
permission: {
},
rules: {
repair_item_code: [
{ required: true, message: '设备维修项目编码不能为空', trigger: 'blur' }
],
repair_item_name: [
{ required: true, message: '设备维修项目名称不能为空', trigger: 'blur' }
],