opt:越南富佳优化增导出功能

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<Structattr> 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));
 
         // 在库数量

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<Structattr> 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));
 
         // 在库数量

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 }

nladmin-ui/src/views/wms/pm_manage/form_data/index.vue

@@ -225,7 +225,7 @@
 </template>
 
 <script>
-import crudFormData,  { exportFile }  from './formData'
+import crudFormData, { exportFile } from './formData'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation.vue'
 import rrOperation from '@crud/RR.operation.vue'

nladmin-ui/src/views/wms/pm_manage/form_data2/index.vue

@@ -155,7 +155,7 @@
 </template>
 
 <script>
-import crudFormData,  { exportFile } from './formData'
+import crudFormData, { exportFile } from './formData'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation.vue'
 import rrOperation from '@crud/RR.operation.vue'

nladmin-ui/src/views/wms/st/inbill/index.vue

@@ -219,7 +219,7 @@
 </template>
 
 <script>
-import rawAssist,  { exportFile } from '@/views/wms/st/inbill/rawassist'
+import rawAssist, { exportFile } from '@/views/wms/st/inbill/rawassist'
 import crudRawAssist from '@/views/wms/st/inbill/rawassist'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
@@ -304,7 +304,7 @@ export default {
       const fileName = `入库管理导出${year}${month}${day}.xlsx`
       if (this.query.createTime) {
         this.query.start_time = this.query.createTime[0]
-        this.query.begin_time= this.query.createTime[0]
+        this.query.begin_time = this.query.createTime[0]
         if (this.query.createTime.length > 1) {
           this.query.end_time = this.query.createTime[1]
         }

nladmin-ui/src/views/wms/st/outbill/index.vue

@@ -218,7 +218,7 @@
 </template>
 
 <script>
-import checkoutbill,  { exportFile } from '@/views/wms/st/outbill/checkoutbill'
+import checkoutbill, { exportFile } from '@/views/wms/st/outbill/checkoutbill'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -297,7 +297,7 @@ export default {
       const fileName = `出库管理导出${year}${month}${day}.xlsx`
       if (this.query.createTime) {
         this.query.start_time = this.query.createTime[0]
-        this.query.begin_time= this.query.createTime[0]
+        this.query.begin_time = this.query.createTime[0]
         if (this.query.createTime.length > 1) {
           this.query.end_time = this.query.createTime[1]
         }