diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml
index ca6ebf28..c846b38c 100644
--- a/mes/hd/nladmin-system/pom.xml
+++ b/mes/hd/nladmin-system/pom.xml
@@ -38,6 +38,12 @@
core
3.3.3
+
+
+ com.sushengren
+ easyword
+ 1.1.4
+
gov.nist.math
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicebomServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicebomServiceImpl.java
index 826df68a..9b38710f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicebomServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicebomServiceImpl.java
@@ -106,10 +106,14 @@ 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",whereJson.getString("device_bom_code"));
+ jsonMst.put("device_bom_code",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());
@@ -172,6 +176,10 @@ public class DevicebomServiceImpl implements DevicebomService {
jsonDtl.put("dtl_remark",json.getString("dtl_remark"));
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
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicefaultclassServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicefaultclassServiceImpl.java
index e9b2ed15..1c654be3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicefaultclassServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/DevicefaultclassServiceImpl.java
@@ -100,6 +100,11 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService {
String now = DateUtil.now();
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"));
@@ -130,6 +135,11 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService {
json.put("update_optname", nickName);
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
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/test/rest/PrintDemo.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/test/rest/PrintDemo.java
index d259ba0f..00c7777b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/test/rest/PrintDemo.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/test/rest/PrintDemo.java
@@ -82,14 +82,6 @@ public class PrintDemo {
// 1根据实体类获取数据
DataDto dataDto = new DataDto();
- dataDto.setRaw_material_name("PG粉");
- dataDto.setRaw_pcsn("20211111");
- dataDto.setRaw_weight("50");
- dataDto.setRaw_confrim("是");
- dataDto.setFu_material_name("软废");
- dataDto.setFu_pcsn("2000000");
- dataDto.setFu_weight("100");
- dataDto.setFu_confrim("否");
// 2根据map或者数据
HashMap map = new HashMap<>();
@@ -124,25 +116,7 @@ public class PrintDemo {
// 1准备数据--集合
ArrayList data = new ArrayList<>();
DataDto dataDto = new DataDto();
- dataDto.setRaw_material_name("PG粉");
- dataDto.setRaw_pcsn("20211111");
- dataDto.setRaw_weight("50");
- dataDto.setRaw_confrim("是");
- dataDto.setFu_material_name("软废");
- dataDto.setFu_pcsn("2000000");
- dataDto.setFu_weight("100");
- dataDto.setFu_confrim("否");
- DataDto dataDto2 = new DataDto();
- dataDto2.setRaw_material_name("PG粉");
- dataDto2.setRaw_pcsn("20211111");
- dataDto2.setRaw_weight("50");
- dataDto2.setRaw_confrim("是");
- dataDto2.setFu_material_name("软废");
- dataDto2.setFu_pcsn("2000000");
- dataDto2.setFu_weight("100");
- dataDto2.setFu_confrim("否");
data.add(dataDto);
- data.add(dataDto2);
// 2准备数据--map
HashMap map = new HashMap<>();
map.put("proc_material_code","ZXCVBC");
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/test/service/dto/DataDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/test/service/dto/DataDto.java
index 9ddafaea..02d5d961 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/test/service/dto/DataDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/test/service/dto/DataDto.java
@@ -1,21 +1,25 @@
package org.nl.wms.test.service.dto;
+import com.sushengren.easyword.annotation.WordProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
public class DataDto {
- private String raw_material_name;
- private String raw_pcsn;
- private String raw_weight;
- private String raw_confrim;
+ @WordProperty("name")
+ private String name;
+ @WordProperty("age")
+ private String age;
-
- private String fu_material_name;
- private String fu_pcsn;
- private String fu_weight;
- private String fu_confrim;
+ @WordProperty("number")
+ private String number;
}
diff --git a/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue b/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue
index 48297f0a..16e94f9e 100644
--- a/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue
+++ b/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue
@@ -208,17 +208,18 @@ export default {
}
},
save() {
- if (this.stor_id === '') {
- this.crud.notify('请选择仓库', CRUD.NOTIFICATION_TYPE.INFO)
- return
- }
+ // if (this.stor_id === '') {
+ // this.crud.notify('请选择仓库', CRUD.NOTIFICATION_TYPE.INFO)
+ // return
+ // }
const data = {}
- data.stor_id = this.stor_id
+ data.stor_id = '1473162033548627968'
data.rows = this.crud.data
crudMaterialsafeivt.insertSafeBj(data).then(() => {
this.crud.dleChangePage(1)
this.crud.editSuccessNotify()
this.crud.refresh()
+ this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
storChange(val) {