From 0a159089071404cf29441f1630b35226d23a5416 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Wed, 16 Jul 2025 16:07:40 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ClassStandardController.java | 7 +- .../service/IMdPbClassstandardService.java | 6 + .../service/dao/MdMeMaterialbase.java | 2 +- .../service/dao/Structattr.java | 2 +- .../impl/MdPbClassstandardServiceImpl.java | 17 ++ .../service/impl/StructattrServiceImpl.java | 22 --- .../views/wms/basedata/class/classstandard.js | 10 +- .../src/views/wms/basedata/material/index.vue | 121 +++++++++----- .../basedata/structattr/OneCreateDialog.vue | 151 ------------------ .../views/wms/basedata/structattr/index.vue | 105 +++++------- .../src/views/wms/st/movebill/AddDialog.vue | 3 +- 11 files changed, 162 insertions(+), 284 deletions(-) delete mode 100644 nladmin-ui/src/views/wms/basedata/structattr/OneCreateDialog.vue diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/ClassStandardController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/ClassStandardController.java index 43546ca..9fa15be 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/ClassStandardController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/ClassStandardController.java @@ -99,9 +99,14 @@ public class ClassStandardController { @GetMapping("/getClassTable") @Log("查询物料基础类型") - //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity queryClassTable(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(iMdPbClassstandardService.queryClassTable(whereJson, page)), HttpStatus.OK); } + @GetMapping("/getAllClass") + @Log("查询物料基础类型") + public ResponseEntity getAllClass(@RequestParam Map whereJson) { + return new ResponseEntity<>(iMdPbClassstandardService.getAllClass(whereJson), HttpStatus.OK); + } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbClassstandardService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbClassstandardService.java index 04d978b..9cc20fa 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbClassstandardService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbClassstandardService.java @@ -98,4 +98,10 @@ public interface IMdPbClassstandardService extends IService { * @return */ List getAllChildIdSet(String class_id); + + /** + * 获取分类名称下拉框 + * @return List + */ + List getAllClass(Map whereJson); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java index 01783b4..07eb159 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java @@ -75,7 +75,7 @@ public class MdMeMaterialbase implements Serializable { /** * 工程图号 */ - private String print_no; + private String remark; /** * 物料分类标识 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java index 4009b7a..dc45eca 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java @@ -172,7 +172,7 @@ public class Structattr implements Serializable { /** * 是否启用 */ - private Boolean is_used; + private String is_used; /** * 是否判断高度 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbClassstandardServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbClassstandardServiceImpl.java index 3ae89eb..91a8b2d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbClassstandardServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbClassstandardServiceImpl.java @@ -507,4 +507,21 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl getAllClass(Map whereJson) { + List daoList = this.list( + new QueryWrapper().lambda() + .eq(MdPbClassstandard::getIs_delete, BaseDataEnum.IS_YES_NOT.code("否")) + ); + + List result = new ArrayList<>(); + daoList.forEach(row -> { + JSONObject json = new JSONObject(); + json.put("label", row.getClass_name()); + json.put("value", row.getClass_id()); + result.add(json); + }); + return result; + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java index e47d22f..5954866 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java @@ -154,20 +154,6 @@ public class StructattrServiceImpl extends ServiceImpl - - + + - - + + + + + + + + @@ -75,14 +87,14 @@ - - + + 否 + 是 - - 否 - 是 + + @@ -105,7 +117,7 @@ - + + { + this.classlist = res + }) + const param = { + 'materOpt_code': '00' + } + crudMaterialbase.getMaterOptType(param).then(res => { + this.class_idStr = res.class_idStr + this.crud.query.class_idStr = res.class_idStr + this.queryClassId() + }) + }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { @@ -249,6 +259,41 @@ export default { this.crud.notify('同步成功!', CRUD.NOTIFICATION_TYPE.SUCCESS) }) }, + bill_typeFormat(row, column) { + for (const item of this.classlist) { + if (item.value === row.material_type_id) { + return item.label + } + } + }, + loadClass({ action, parentNode, callback }) { + if (action === LOAD_CHILDREN_OPTIONS) { + crudClassstandard.getClass({ pid: parentNode.id }).then(res => { + parentNode.children = res.content.map(function(obj) { + if (obj.hasChildren) { + obj.children = null + } + return obj + }) + setTimeout(() => { + callback() + }, 100) + }) + } + }, + queryClassId() { + const param = { + 'class_idStr': this.class_idStr + } + crudClassstandard.queryClassById(param).then(res => { + this.classes = res.content.map(obj => { + if (obj.hasChildren) { + obj.children = null + } + return obj + }) + }) + }, // 改变状态 changeEnabled(data, val) { this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.material_name + ', 是否继续？', '提示', { diff --git a/nladmin-ui/src/views/wms/basedata/structattr/OneCreateDialog.vue b/nladmin-ui/src/views/wms/basedata/structattr/OneCreateDialog.vue deleted file mode 100644 index f16159a..0000000 --- a/nladmin-ui/src/views/wms/basedata/structattr/OneCreateDialog.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - - - diff --git a/nladmin-ui/src/views/wms/basedata/structattr/index.vue b/nladmin-ui/src/views/wms/basedata/structattr/index.vue index 8bb4f7d..af70058 100644 --- a/nladmin-ui/src/views/wms/basedata/structattr/index.vue +++ b/nladmin-ui/src/views/wms/basedata/structattr/index.vue @@ -85,7 +85,7 @@ inactive-value="1" active-color="#C0CCDA" inactive-color="#409EFF" - @change="hand" + @change="crud.toQuery" /> @@ -93,16 +93,6 @@ - - - - - - - - - - @@ -174,12 +164,12 @@ - + - + @@ -187,13 +177,13 @@ - + - + @@ -201,31 +191,35 @@ - + - - - - + + 是 + 否 - - - 是 - 否 + + + + + + + + + + + + + + + + + + @@ -252,9 +246,6 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - @@ -266,12 +257,9 @@ {{ dict.label.d_lock_type[scope.row.lock_type] }} - - - - + + + @@ -317,7 +304,6 @@ import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import OneCreateDialog from '@/views/wms/basedata/structattr/OneCreateDialog' import crudSectattr from '@/views/wms/basedata/sectattr/sectattr' const defaultForm = { @@ -342,18 +328,13 @@ const defaultForm = { yqty: null, zqty: null, is_tempstruct: '0', - create_id: null, - create_name: null, - create_time: null, + col_num: null, + layer_num: null, + block_num: null, update_optid: null, update_optname: null, update_time: null, - is_delete: null, - back_ground_color: null, - front_ground_color: null, - back_ground_pic: null, - font_direction_scode: null, - is_used: null, + is_used: '0', is_zdepth: null, storagevehicle_id: null, storagevehicle_code: null, @@ -382,6 +363,7 @@ export default { optShow: { add: true, reset: true }, url: 'api/structattr', idField: 'struct_id', + query: { is_used: '1' }, crudMethod: { ...crudStructattr } }) }, @@ -429,28 +411,17 @@ export default { stor_id: [ { required: true, message: '仓库标识不能为空', trigger: 'blur' } ], - capacity: [ - { required: false, message: '不能为空', trigger: 'blur' }, - { validator: numberOne } - ], - weight: [ + row_num: [ { required: false, message: '不能为空', trigger: 'blur' }, { validator: numberOne } ], - width: [ + col_num: [ { required: false, message: '不能为空', trigger: 'blur' }, { validator: numberOne } ], - height: [ + layer_num: [ { required: false, message: '不能为空', trigger: 'blur' }, { validator: numberOne } - ], - zdepth: [ - { required: false, message: '不能为空', trigger: 'blur' }, - { validator: numberOne } - ], - material_height_type: [ - { required: true, message: '物料高度类型不能为空', trigger: 'blur' } ] } } diff --git a/nladmin-ui/src/views/wms/st/movebill/AddDialog.vue b/nladmin-ui/src/views/wms/st/movebill/AddDialog.vue index 3c85e64..d66a384 100644 --- a/nladmin-ui/src/views/wms/st/movebill/AddDialog.vue +++ b/nladmin-ui/src/views/wms/st/movebill/AddDialog.vue @@ -69,7 +69,6 @@ >