diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/dailyStructivt/StIvtStructivtDailyController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/dailyStructivt/StIvtStructivtDailyController.java index 02452e41..ce6f364a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/dailyStructivt/StIvtStructivtDailyController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/dailyStructivt/StIvtStructivtDailyController.java @@ -13,10 +13,7 @@ import org.nl.wms.masterdata_manage.storage.service.storage.dto.SectattrQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** *

@@ -40,12 +37,19 @@ public class StIvtStructivtDailyController { public ResponseEntity query(DailyStructivtQuery query, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(stIvtStructivtDailyService.page(page.build(),query.build())),HttpStatus.OK); } - @GetMapping("/sync") + @PostMapping("/sync") @Log("同步日库区") @SaIgnore - public ResponseEntity sync(String[] structivts){ + public ResponseEntity sync(@RequestBody String[] structivts){ stIvtStructivtDailyService.dailyStructivt(structivts); return new ResponseEntity<>(HttpStatus.OK); } + +// @GetMapping("/download") +// @Log("导出数据") +// @SaIgnore +// public ResponseEntity download(){ +// return new ResponseEntity<>(HttpStatus.OK); +// } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/impl/StIvtStructivtDailyServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/impl/StIvtStructivtDailyServiceImpl.java index 5fc32c93..86b0c03f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/impl/StIvtStructivtDailyServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/impl/StIvtStructivtDailyServiceImpl.java @@ -37,7 +37,7 @@ public class StIvtStructivtDailyServiceImpl extends ServiceImpl list = new ArrayList<>(); diff --git a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue index 0f3feaf5..01f75dd9 100644 --- a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue +++ b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue @@ -53,11 +53,11 @@ - + - + diff --git a/mes/qd/src/views/wms/masterdata_manage/master/customer/index.vue b/mes/qd/src/views/wms/masterdata_manage/master/customer/index.vue index d3f21d48..f9269131 100644 --- a/mes/qd/src/views/wms/masterdata_manage/master/customer/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/master/customer/index.vue @@ -272,19 +272,29 @@ export default { return true }, [CRUD.HOOK.afterToCU](crud, form) { - if (form.material_type_id != null) { - this.getSubTypes(form.material_type_id) + if (form.class_id != null) { + this.getSubTypes({'id':form.class_id,'parent_id':"1704039126057226240"}) } else { this.getClass() } }, getSubTypes(id) { - crudClassstandard.getClassSuperior(id).then(res => { + crudClassstandard.getClassSuperior2(id).then(res => { const date = res.content this.buildClass(date) this.classes = date }) }, + buildClass(classes) { + classes.forEach(data => { + if (data.children) { + this.buildClass(data.children) + } + if (data.hasChildren && !data.children) { + data.children = null + } + }) + }, getClass() { //queryClassById?class_idStr=1528555443906023424 crudClassstandard.queryClassById({ enabled: true, 'class_idStr': '1704039126057226240' }).then(res => { diff --git a/mes/qd/src/views/wms/masterdata_manage/master/supp/index.vue b/mes/qd/src/views/wms/masterdata_manage/master/supp/index.vue index 3645d821..4fd9c41a 100644 --- a/mes/qd/src/views/wms/masterdata_manage/master/supp/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/master/supp/index.vue @@ -268,19 +268,29 @@ export default { return true }, [CRUD.HOOK.afterToCU](crud, form) { - if (form.material_type_id != null) { - this.getSubTypes(form.material_type_id) + if (form.class_id != null) { + this.getSubTypes({'id':form.class_id,'parent_id':"1704039126057226240"}) } else { this.getClass() } }, getSubTypes(id) { - crudClassstandard.getClassSuperior(id).then(res => { + crudClassstandard.getClassSuperior2(id).then(res => { const date = res.content this.buildClass(date) this.classes = date }) }, + buildClass(classes) { + classes.forEach(data => { + if (data.children) { + this.buildClass(data.children) + } + if (data.hasChildren && !data.children) { + data.children = null + } + }) + }, getClass() { crudClassstandard.queryClassById({ enabled: true, 'class_idStr': '1704039126057226240' }).then(res => { this.classes = res.content.map(function(obj) { diff --git a/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/dailyStructivt.js b/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/dailyStructivt.js index 956aff35..6f3cac8b 100644 --- a/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/dailyStructivt.js +++ b/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/dailyStructivt.js @@ -15,6 +15,13 @@ export function del(ids) { data: ids }) } +export function sync(param) { + return request({ + url: 'api/structivtDaily/sync', + method: 'post', + param + }) +} export function edit(data) { return request({ @@ -23,4 +30,4 @@ export function edit(data) { data }) } -export default { add, edit, del } +export default { add, edit, del,sync } diff --git a/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/index.vue b/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/index.vue index 65eab7d1..ad82709e 100644 --- a/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/index.vue @@ -32,7 +32,30 @@ - + + + 同步 + + + + + + + + + + + + + { + this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + }).catch(() => { }) + }, + downloadMethod() { + this.beforeInit() + this.downloadLoading = true + download(this.url + '/download', this.params).then(result => { + this.downloadFile(result, this.title + '数据', 'xlsx') + this.downloadLoading = false + }).catch(() => { + this.downloadLoading = false + }) + }, + beforeInit() { + return true + }, sectChange(val) { this.form.sect_id = val[1] },