diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java index b567e2c..90fff16 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java @@ -440,7 +440,8 @@ public class BigScreenServiceImpl implements BigScreenService { // 库位数量 QueryWrapper structattrWrapper = new QueryWrapper<>(); structattrWrapper.lambda().eq(Structattr::getStor_code, storCode) - .eq(Structattr::getIs_used, Boolean.TRUE); + .eq(Structattr::getIs_used, Boolean.TRUE) + .ne(Structattr::getSect_code,"SSX"); stats.put("locationCount", iStructattrService.count(structattrWrapper)); // 在库数量 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/bigscreen_manage/service/impl/PdaBigScreenServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/bigscreen_manage/service/impl/PdaBigScreenServiceImpl.java index 7482ff6..df28b60 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/bigscreen_manage/service/impl/PdaBigScreenServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/bigscreen_manage/service/impl/PdaBigScreenServiceImpl.java @@ -480,7 +480,8 @@ public class PdaBigScreenServiceImpl implements PdaBigScreenService { // 库位数量 QueryWrapper structattrWrapper = new QueryWrapper<>(); structattrWrapper.lambda().eq(Structattr::getStor_code, storCode) - .eq(Structattr::getIs_used, Boolean.TRUE); + .eq(Structattr::getIs_used, Boolean.TRUE) + .ne(Structattr::getSect_code,"SSX"); stats.put("locationCount", iStructattrService.count(structattrWrapper)); // 在库数量 diff --git a/nladmin-ui/src/views/wms/pm_manage/form_data/formData.js b/nladmin-ui/src/views/wms/pm_manage/form_data/formData.js index a43f81a..eba33cb 100644 --- a/nladmin-ui/src/views/wms/pm_manage/form_data/formData.js +++ b/nladmin-ui/src/views/wms/pm_manage/form_data/formData.js @@ -27,21 +27,21 @@ export function edit(data) { export function getFormType() { return request({ url: 'api/bmFormStruc/getTypes', - method: 'get', + method: 'get' }) } export function getParentFormTypes() { return request({ url: 'api/bmFormStruc/getParentFormTypes', - method: 'get', + method: 'get' }) } export function getSonFormData(id) { return request({ url: 'api/pmFormData/getSonFormData/' + id, - method: 'get', + method: 'get' }) } @@ -54,4 +54,4 @@ export function exportFile(query) { }) } -export default {add, edit, del, getFormType, getParentFormTypes, getSonFormData} +export default { add, edit, del, getFormType, getParentFormTypes, getSonFormData } diff --git a/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue b/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue index e29cdff..7f38ef4 100644 --- a/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue +++ b/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue @@ -225,7 +225,7 @@