diff --git a/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java b/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java index 7ab7de4b6..4d71a0c35 100644 --- a/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java +++ b/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java @@ -121,4 +121,12 @@ public class ClassstandardController { return new ResponseEntity<>(ClassstandardService.getType(type_id,level), HttpStatus.OK); } + @GetMapping("/getClassName") + @Log("获取分类名称下拉框") + @ApiOperation("获取分类名称下拉框") + public ResponseEntity getClassName() { + return new ResponseEntity<>(ClassstandardService.getClassName(), HttpStatus.OK); + } + + } diff --git a/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java b/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java index 6960a8550..2772ff7bd 100644 --- a/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java +++ b/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java @@ -124,4 +124,9 @@ public interface ClassstandardService { */ String getAllChildIdStr(String class_idStr); + /** + * 获取分类名称下拉框 + * @return + */ + JSONArray getClassName(); } diff --git a/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java b/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java index 50141143b..2ddb62900 100644 --- a/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java +++ b/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/ClassstandardDto.java @@ -19,8 +19,6 @@ public class ClassstandardDto implements Serializable { @JsonSerialize(using= ToStringSerializer.class) private Long class_id; - private String base_data_type; - private String path_code; private String class_code; diff --git a/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java index 6578e4e90..64856070a 100644 --- a/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java @@ -44,10 +44,10 @@ public class ClassstandardServiceImpl implements ClassstandardService { @Override public Map queryAll(Map whereJson, Pageable page) { WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); - String base_data_type = (String) whereJson.get("base_data_type"); + String class_code = (String) whereJson.get("class_code"); String where = ""; - if (!StrUtil.isEmpty(base_data_type)) { - where = "AND base_data_type = '" + base_data_type + "'"; + if (!StrUtil.isEmpty(class_code)) { + where = "AND class_code = '" + class_code + "'"; } ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "(parent_class_id is null OR parent_class_id = '0') AND is_delete = '0'" + where + "", "update_time desc"); final JSONObject json = rb.pageResult(); @@ -100,7 +100,7 @@ public class ClassstandardServiceImpl implements ClassstandardService { public void create(ClassstandardDto dto) { String class_code = dto.getClass_code(); ClassstandardDto classstandardDto = this.findByCode(class_code); - if (classstandardDto != null && classstandardDto.getIs_delete().equals("0") && dto.getBase_data_type().equals(classstandardDto.getBase_data_type())) { + if (classstandardDto != null && classstandardDto.getIs_delete().equals("0") ) { throw new BadRequestException("存在相同的基础类别编号"); } Long currentUserId = SecurityUtils.getCurrentUserId(); @@ -120,10 +120,6 @@ public class ClassstandardServiceImpl implements ClassstandardService { dto.setPath_code(dto.getClass_code()); dto.setLong_class_code(dto.getClass_code()); - if (StrUtil.equals(dto.getBase_data_type(), "03")) { - dto.setIs_modify("0"); - } - WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.insert(json); @@ -144,7 +140,7 @@ public class ClassstandardServiceImpl implements ClassstandardService { String class_code = dto.getClass_code(); ClassstandardDto classstandardDto = this.findByCode(class_code); - if (classstandardDto != null && !dto.getClass_id().equals(classstandardDto.getClass_id()) && classstandardDto.getIs_delete().equals("0") && dto.getBase_data_type().equals(classstandardDto.getBase_data_type())) { + if (classstandardDto != null && !dto.getClass_id().equals(classstandardDto.getClass_id()) && classstandardDto.getIs_delete().equals("0") ) { throw new BadRequestException("存在相同的供应商编号"); } @@ -240,15 +236,10 @@ public class ClassstandardServiceImpl implements ClassstandardService { @Override public JSONArray getSuperior(JSONObject jo, JSONArray ja) { - String base_data_type=jo.getString("base_data_type"); WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); if (StrUtil.isEmpty(jo.getString("parent_class_id")) || jo.getString("parent_class_id").equals("0")) { JSONArray null_pids = new JSONArray(); - if (jo.getString("base_data_type").equals(base_data_type)) { - null_pids = wo.query("(parent_class_id = '0' OR parent_class_id is null) and is_delete = '0' and base_data_type = '"+base_data_type+"'").getResultJSONArray(0); - } else { - null_pids = wo.query("(parent_class_id = '0' OR parent_class_id is null) and is_delete = '0'").getResultJSONArray(0); - } + null_pids = wo.query("(parent_class_id = '0' OR parent_class_id is null) and is_delete = '0'").getResultJSONArray(0); for (int m = 0; m < null_pids.size(); m++) { JSONObject null_pid = null_pids.getJSONObject(m); @@ -536,6 +527,21 @@ public class ClassstandardServiceImpl implements ClassstandardService { return str; } + @Override + public JSONArray getClassName() { + WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); + // 获取的是父节点 + JSONArray result = wo.query("(parent_class_id is null OR parent_class_id = '0') AND is_delete = '0'").getResultJSONArray(0); + JSONArray res = new JSONArray(); + for (int i=0; i queryAll(Map whereJson, Pageable page){ - WQLObject wo = WQLObject.getWQLObject("st_ivt_deliverypointivt"); - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); - final JSONObject json = rb.pageResult(); + JSONObject map = new JSONObject(); + map.put("flag", "1"); + if (!ObjectUtil.isNull(whereJson.get("point_code"))) + map.put("point_code", "%" + whereJson.get("point_code") + "%"); + map.put("product_area", whereJson.get("product_area")); + map.put("point_status", whereJson.get("point_status")); + map.put("is_used", whereJson.get("is_used")); + JSONObject json = WQL.getWO("ST_IVT_DELIVERYPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); return json; } diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_DELIVERYPOINTIVT.wql b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_DELIVERYPOINTIVT.wql new file mode 100644 index 000000000..727f0056e --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_DELIVERYPOINTIVT.wql @@ -0,0 +1,66 @@ +[交易说明] + 交易名： 分切输送线点位库存 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.point_code TYPEAS s_string + 输入.point_status TYPEAS s_string + 输入.product_area TYPEAS s_string + 输入.is_used TYPEAS s_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + IF 输入.flag = "1" + PAGEQUERY + SELECT + deliver.* + FROM + st_ivt_deliverypointivt deliver + WHERE + 1=1 + OPTION 输入.point_code <> "" + point_code LIKE 输入.point_code + ENDOPTION + OPTION 输入.point_status <> "" + point_status = 输入.point_status + ENDOPTION + OPTION 输入.product_area <> "" + product_area = 输入.product_area + ENDOPTION + OPTION 输入.is_used <> "" + is_used = 输入.is_used + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF \ No newline at end of file diff --git a/nladmin-ui/src/components/Crud/crud.js b/nladmin-ui/src/components/Crud/crud.js index 8479cf5fe..74d4f802f 100644 --- a/nladmin-ui/src/components/Crud/crud.js +++ b/nladmin-ui/src/components/Crud/crud.js @@ -210,6 +210,18 @@ function CRUD(options) { callVmHook(crud, CRUD.HOOK.afterToAdd, crud.form) callVmHook(crud, CRUD.HOOK.afterToCU, crud.form) }, + /** + * 启动添加 可携带参数 + */ + toAddAndData(data) { + crud.resetForm(JSON.parse(JSON.stringify(data))) + if (!(callVmHook(crud, CRUD.HOOK.beforeToAdd, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) { + return + } + crud.status.add = CRUD.STATUS.PREPARED + callVmHook(crud, CRUD.HOOK.afterToAdd, crud.form) + callVmHook(crud, CRUD.HOOK.afterToCU, crud.form) + }, /** * 启动编辑 * @param {*} data 数据项 diff --git a/nladmin-ui/src/views/wms/basedata/master/class/classstandard.js b/nladmin-ui/src/views/wms/basedata/master/class/classstandard.js index a24583e9a..0c216de38 100644 --- a/nladmin-ui/src/views/wms/basedata/master/class/classstandard.js +++ b/nladmin-ui/src/views/wms/basedata/master/class/classstandard.js @@ -72,4 +72,11 @@ export function getClassTable(params) { }) } -export default { add, edit, del, getClass, getClassSuperior, getClassType, getClassTable, getType, queryClassById } +export function getClassName() { + return request({ + url: 'api/Classstandard/getClassName', + method: 'get' + }) +} + +export default { add, edit, del, getClass, getClassSuperior, getClassType, getClassTable, getType, queryClassById, getClassName } diff --git a/nladmin-ui/src/views/wms/basedata/master/class/index.vue b/nladmin-ui/src/views/wms/basedata/master/class/index.vue index fe10a17e2..9fbfab2fa 100644 --- a/nladmin-ui/src/views/wms/basedata/master/class/index.vue +++ b/nladmin-ui/src/views/wms/basedata/master/class/index.vue @@ -2,33 +2,49 @@
- - - - - 基础分类： - - - - - - - - - - - - +
+ + + + + + + + + + +
- + + + 全部展开 + + - - - - - - @@ -105,17 +106,20 @@ @@ -135,7 +139,7 @@ import udOperation from '@crud/UD.operation' import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' -const defaultForm = { +let defaultForm = { class_id: null, base_data_type: null, path_code: null, @@ -180,14 +184,12 @@ export default { data() { return { classes: [], + classNames: [], permission: {}, rules: { class_id: [ { required: true, message: '不能为空', trigger: 'blur' } ], - base_data_type: [ - { required: true, message: '不能为空', trigger: 'blur' } - ], path_code: [ { required: true, message: '不能为空', trigger: 'blur' } ], @@ -218,7 +220,15 @@ export default { } } }, + created() { + this.getClassNames() // 获取分类 + }, methods: { + getClassNames() { + crudClassstandard.getClassName().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树 + this.classNames = res + }) + }, getClassDatas(tree, treeNode, resolve) { const params = { pid: tree.id } setTimeout(() => { @@ -318,6 +328,72 @@ export default { }, 100) }) } + }, + clearFrom() { + defaultForm = { + id: null, + class_id: null, + base_data_type: null, + path_code: null, + class_code: null, + long_class_code: null, + class_name: null, + class_desc: null, + parent_class_id: null, + is_leaf: null, + sub_count: null, + is_modify: null, + is_delete: null, + class_level: null, + ext_id: null, + ext_parent_id: null, + create_id: null, + create_name: null, + create_time: null, + update_optid: null, + update_optname: null, + update_time: null, + isTop: null + } + }, + addSibling(row) { + this.clearFrom() // 将默认的表单数据清除 + defaultForm.id = row.id // 获取分类树的id - 懒加载依赖此id，不可为空 + defaultForm.class_id = row.class_id + defaultForm.parent_class_id = row.parent_class_id // 同级为父类class_id + defaultForm.isTop = row.isTop + return defaultForm + }, + addChildren(row) { + this.clearFrom() + defaultForm.id = row.id // 获取分类树的id + defaultForm.class_id = row.parent_class_id + defaultForm.parent_class_id = row.id // 子级为本身的class_id + defaultForm.isTop = row.isTop + return defaultForm + }, + // 全部展开 参考：https://www.cnblogs.com/toughy/p/12667805.html + ToExpandall() { + const els = document.getElementsByClassName('el-table__expand-icon') + if (this.crud.data.length !== 0 && els.length !== 0) { + for (let j1 = 0; j1 < els.length; j1++) { + els[j1].classList.add('dafult') + } + if (this.$el.getElementsByClassName('el-table__expand-icon--expanded')) { + const open = this.$el.getElementsByClassName('el-table__expand-icon--expanded') + for (let j = 0; j < open.length; j++) { + open[j].classList.remove('dafult') + } + const dafult = this.$el.getElementsByClassName('dafult') + for (let a = 0; a < dafult.length; a++) { + debugger + dafult[a].click() + } + } + } + }, + hand(value) { + this.crud.toQuery() } } } diff --git a/nladmin-ui/src/views/wms/basedata/master/customer/index.vue b/nladmin-ui/src/views/wms/basedata/master/customer/index.vue index 9facbe86b..3b0791e97 100644 --- a/nladmin-ui/src/views/wms/basedata/master/customer/index.vue +++ b/nladmin-ui/src/views/wms/basedata/master/customer/index.vue @@ -92,19 +92,6 @@ - - - - - - - diff --git a/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue index a0b6c2645..669cfa6c2 100644 --- a/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue +++ b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue @@ -228,7 +228,11 @@ - + + +