From e9488486167e641f85b4d27e8056b598f8e91eea Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Mon, 27 Feb 2023 11:06:10 +0800
Subject: [PATCH] 界面上 去掉高级查询
---
ant-design-vue-jeecg/src/views/system/config/AddressList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/AgvPortList.vue | 2 --
ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/CarrierList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/CompanyList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/ContainerCapacityList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/ContainerList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/CustomerList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/CycleCountPreferenceList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/LocationHighList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/LocationList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/LocationTypeList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/MaterialAreaList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/MaterialList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/MaterialMultipleList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/MaterialTypeList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/MaterialUnitList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/MaterialWarningList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/ParameterConfigurationList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/PortList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/ReceiptTypeList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/ShipmentTypeList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/SupplierList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/SysUserWarehouseList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/config/ZoneList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue | 2 --
ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountHeaderList.vue | 2 --
ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue | 2 --
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/service/impl/MaterialServiceImpl.java | 13 ++++++-------
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java | 34 ++++++++++++++++++----------------
40 files changed, 24 insertions(+), 133 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/config/AddressList.vue b/ant-design-vue-jeecg/src/views/system/config/AddressList.vue
index 7dfa9bb..cb2cf97 100644
--- a/ant-design-vue-jeecg/src/views/system/config/AddressList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/AddressList.vue
@@ -32,9 +32,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'address:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/AgvPortList.vue b/ant-design-vue-jeecg/src/views/system/config/AgvPortList.vue
index 19cfdeb..3beaed3 100644
--- a/ant-design-vue-jeecg/src/views/system/config/AgvPortList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/AgvPortList.vue
@@ -36,8 +36,6 @@
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" v-has="'agvPort:delete'" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
diff --git a/ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue b/ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue
index 8d46560..64bee65 100644
--- a/ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue
@@ -37,9 +37,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
</div>
<!-- table区域-begin -->
diff --git a/ant-design-vue-jeecg/src/views/system/config/CarrierList.vue b/ant-design-vue-jeecg/src/views/system/config/CarrierList.vue
index 58090f5..6b789dc 100644
--- a/ant-design-vue-jeecg/src/views/system/config/CarrierList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/CarrierList.vue
@@ -17,9 +17,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'carrier:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue b/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue
index baa00d7..70d13f4 100644
--- a/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue
@@ -37,9 +37,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'company:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/ContainerCapacityList.vue b/ant-design-vue-jeecg/src/views/system/config/ContainerCapacityList.vue
index deb2eab..4c53a3d 100644
--- a/ant-design-vue-jeecg/src/views/system/config/ContainerCapacityList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/ContainerCapacityList.vue
@@ -44,9 +44,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'containerCapacity:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/ContainerList.vue b/ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
index a40a850..16feec1 100644
--- a/ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
@@ -60,9 +60,6 @@
<a-button type="primary" icon="import">导入</a-button>
<a-button v-has="'container:print'" @click="batchPrint()" type="primary">打印</a-button>
</a-upload>
- <!-- 高级查询区域 -->
-<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
-<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'container:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue b/ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue
index 855db98..44b1df5 100644
--- a/ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue
@@ -37,9 +37,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'containerType:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/CustomerList.vue b/ant-design-vue-jeecg/src/views/system/config/CustomerList.vue
index 9238484..69c6f4f 100644
--- a/ant-design-vue-jeecg/src/views/system/config/CustomerList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/CustomerList.vue
@@ -17,9 +17,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'customer:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/CycleCountPreferenceList.vue b/ant-design-vue-jeecg/src/views/system/config/CycleCountPreferenceList.vue
index ca7d43f..63180ec 100644
--- a/ant-design-vue-jeecg/src/views/system/config/CycleCountPreferenceList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/CycleCountPreferenceList.vue
@@ -17,9 +17,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'cycleCountPreference:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/LocationHighList.vue b/ant-design-vue-jeecg/src/views/system/config/LocationHighList.vue
index 81fd863..7d69b48 100644
--- a/ant-design-vue-jeecg/src/views/system/config/LocationHighList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/LocationHighList.vue
@@ -37,9 +37,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'locationHigh:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/LocationList.vue b/ant-design-vue-jeecg/src/views/system/config/LocationList.vue
index 4b7586c..020f13e 100644
--- a/ant-design-vue-jeecg/src/views/system/config/LocationList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/LocationList.vue
@@ -113,9 +113,6 @@
<a-button type="primary" icon="import">导入</a-button>
<a-button v-has="'material:print'" @click="batchPrint()" type="primary">打印</a-button>
</a-upload>
- <!-- 高级查询区域 -->
-<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
-<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'location:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/LocationTypeList.vue b/ant-design-vue-jeecg/src/views/system/config/LocationTypeList.vue
index 69e80c2..e916e15 100644
--- a/ant-design-vue-jeecg/src/views/system/config/LocationTypeList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/LocationTypeList.vue
@@ -37,9 +37,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'locationType:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/MaterialAreaList.vue b/ant-design-vue-jeecg/src/views/system/config/MaterialAreaList.vue
index b4139ba..665729e 100644
--- a/ant-design-vue-jeecg/src/views/system/config/MaterialAreaList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/MaterialAreaList.vue
@@ -17,9 +17,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'materialArea:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/MaterialList.vue b/ant-design-vue-jeecg/src/views/system/config/MaterialList.vue
index 955ca1d..6c9340c 100644
--- a/ant-design-vue-jeecg/src/views/system/config/MaterialList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/MaterialList.vue
@@ -45,9 +45,6 @@
<a-button type="primary" icon="import">导入</a-button>
<a-button v-has="'material:print'" @click="batchPrint()" type="primary">打印</a-button>
</a-upload>
- <!-- 高级查询区域 -->
-<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
-<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'material:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/MaterialMultipleList.vue b/ant-design-vue-jeecg/src/views/system/config/MaterialMultipleList.vue
index f75eae2..38f7aed 100644
--- a/ant-design-vue-jeecg/src/views/system/config/MaterialMultipleList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/MaterialMultipleList.vue
@@ -17,9 +17,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'materialMultiple:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/MaterialTypeList.vue b/ant-design-vue-jeecg/src/views/system/config/MaterialTypeList.vue
index 37b58f5..e9cea3f 100644
--- a/ant-design-vue-jeecg/src/views/system/config/MaterialTypeList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/MaterialTypeList.vue
@@ -37,9 +37,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'materialType:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/MaterialUnitList.vue b/ant-design-vue-jeecg/src/views/system/config/MaterialUnitList.vue
index cca3c90..e733fde 100644
--- a/ant-design-vue-jeecg/src/views/system/config/MaterialUnitList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/MaterialUnitList.vue
@@ -44,9 +44,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'materialUnit:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/MaterialWarningList.vue b/ant-design-vue-jeecg/src/views/system/config/MaterialWarningList.vue
index 573ad14..053d2f5 100644
--- a/ant-design-vue-jeecg/src/views/system/config/MaterialWarningList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/MaterialWarningList.vue
@@ -37,9 +37,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'materialWarning:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/ParameterConfigurationList.vue b/ant-design-vue-jeecg/src/views/system/config/ParameterConfigurationList.vue
index 170e204..0164d87 100644
--- a/ant-design-vue-jeecg/src/views/system/config/ParameterConfigurationList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/ParameterConfigurationList.vue
@@ -44,9 +44,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'ParameterConfiguration:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/PortList.vue b/ant-design-vue-jeecg/src/views/system/config/PortList.vue
index c73b971..81b6dce 100644
--- a/ant-design-vue-jeecg/src/views/system/config/PortList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/PortList.vue
@@ -44,9 +44,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'port:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/ReceiptTypeList.vue b/ant-design-vue-jeecg/src/views/system/config/ReceiptTypeList.vue
index f2fda80..7b5139c 100644
--- a/ant-design-vue-jeecg/src/views/system/config/ReceiptTypeList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/ReceiptTypeList.vue
@@ -37,9 +37,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'receiptType:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/ShipmentTypeList.vue b/ant-design-vue-jeecg/src/views/system/config/ShipmentTypeList.vue
index c5d4d11..f0be1e7 100644
--- a/ant-design-vue-jeecg/src/views/system/config/ShipmentTypeList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/ShipmentTypeList.vue
@@ -37,9 +37,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'shipmentType:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/SupplierList.vue b/ant-design-vue-jeecg/src/views/system/config/SupplierList.vue
index f41da86..252fc55 100644
--- a/ant-design-vue-jeecg/src/views/system/config/SupplierList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/SupplierList.vue
@@ -44,9 +44,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'supplier:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/SysUserWarehouseList.vue b/ant-design-vue-jeecg/src/views/system/config/SysUserWarehouseList.vue
index 080491d..36ecaf3 100644
--- a/ant-design-vue-jeecg/src/views/system/config/SysUserWarehouseList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/SysUserWarehouseList.vue
@@ -17,9 +17,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'sysUserWarehouse:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue b/ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue
index ba67ded..ee0a56f 100644
--- a/ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue
@@ -44,9 +44,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
diff --git a/ant-design-vue-jeecg/src/views/system/config/ZoneList.vue b/ant-design-vue-jeecg/src/views/system/config/ZoneList.vue
index 3445ba4..d9ef739 100644
--- a/ant-design-vue-jeecg/src/views/system/config/ZoneList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/ZoneList.vue
@@ -37,9 +37,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'zone:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
index de152b8..def2b71 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
@@ -64,9 +64,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
</div>
<!-- table区域-begin -->
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
index 7183764..e487634 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
@@ -16,8 +16,6 @@
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
</div>
<!-- table区域-begin -->
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
index 78ddffa..b7453f0 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
@@ -104,9 +104,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'inventoryTransaction:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue b/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue
index 824cb7f..0e4971f 100644
--- a/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue
+++ b/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue
@@ -78,9 +78,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'apiLog:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
index e3cea54..0d634ee 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
@@ -66,9 +66,6 @@
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
-<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
-<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->
</div>
<!-- table区域-begin -->
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
index 154d7a4..9c773bc 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
@@ -107,9 +107,6 @@
@change='handleImportExcel'>
<!-- <a-button type="primary" icon="import">导入</a-button>-->
</a-upload>
- <!-- 高级查询区域 -->
-<!-- <j-super-query :fieldList='superFieldList' ref='superQueryModal'-->
-<!-- @handleSuperQuery='handleSuperQuery'></j-super-query>-->
</div>
<!-- table区域-begin -->
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
index fb50adb..6d66bcd 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
@@ -106,9 +106,6 @@
<a-button type="primary" icon="import">导入</a-button>
<a-button v-has="'receiptHeader:print'" @click="batchPrint()" type="primary">打印</a-button>
</a-upload>
- <!-- 高级查询区域 -->
-<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
-<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->
</div>
<!-- table区域-begin -->
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
index f061e06..377101f 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
@@ -74,9 +74,6 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
</div>
<!-- table区域-begin -->
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
index 6f94a0e..850f1fd 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
@@ -109,9 +109,6 @@
@change="handleImportExcel">
<!-- <a-button type="primary" icon="import">导入</a-button>-->
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
</div>
<!-- table区域-begin -->
diff --git a/ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountHeaderList.vue b/ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountHeaderList.vue
index 9e8bdec..a94720c 100644
--- a/ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/stocktaking/CycleCountHeaderList.vue
@@ -16,8 +16,6 @@
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
diff --git a/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue b/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
index 16ca404..a4eca56 100644
--- a/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
@@ -53,8 +53,6 @@
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
- <!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" v-has="'agvTask:delete'" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/service/impl/MaterialServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/service/impl/MaterialServiceImpl.java
index 3c49482..ab6fbeb 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/service/impl/MaterialServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/service/impl/MaterialServiceImpl.java
@@ -1,19 +1,18 @@
package org.jeecg.modules.wms.config.material.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.jeecg.common.api.vo.Result;
+import java.util.List;
+
import org.jeecg.modules.wms.config.material.entity.Material;
import org.jeecg.modules.wms.config.material.mapper.MaterialMapper;
import org.jeecg.modules.wms.config.material.service.IMaterialService;
import org.jeecg.utils.StringUtils;
+import org.jeecg.utils.constant.QuantityConstant;
import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import javax.annotation.Resource;
-import java.util.List;
-
/**
* @Description: 物料管理
* @Author: jeecg-boot
@@ -29,7 +28,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
return null;
}
LambdaQueryWrapper<Material> materialLambdaQueryWrapper = Wrappers.lambdaQuery();
- materialLambdaQueryWrapper.eq(Material::getCode, code);
+ materialLambdaQueryWrapper.eq(Material::getCode, code).eq(Material::getEnable, QuantityConstant.STATUS_DISABLE);
Material material = this.getOne(materialLambdaQueryWrapper);
return material;
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
index 599ccd0..7146578 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
@@ -1,27 +1,27 @@
package org.jeecg.utils.constant;
/**
- * 数字自定义常量
- * 1、入库单状态
- * 2、出库单状态
- * 3、单据上传状态
- * 4、入库组盘状态
- * 5、出库组盘状态
- * 6、任务类型
- * 7、任务状态
- * 8、波次状态
- * 9、质检状态
- * 10、盘点状态
- * 11、INVENTORY_TRANSACTION_RECEIPT
- * 12、调整单状态
- * 13、任务内部类型
- * 14、质检单类型
+ * 数字自定义常量
+ * 1、入库单状态
+ * 2、出库单状态
+ * 3、单据上传状态
+ * 4、入库组盘状态
+ * 5、出库组盘状态
+ * 6、任务类型
+ * 7、任务状态
+ * 8、波次状态
+ * 9、质检状态
+ * 10、盘点状态
+ * 11、INVENTORY_TRANSACTION_RECEIPT
+ * 12、调整单状态
+ * 13、任务内部类型
+ * 14、质检单类型
* 16、请求类型
* @author ricard
*/
public class QuantityConstant {
/**
-
+
*/
// 1、入库单状态
@@ -544,7 +544,9 @@ public class QuantityConstant {
public static final String BILL_TYPE_NAME_RN = "退货通知单";
public static final String BILL_TYPE_NAME_SO = "出库申请单";
+ /* 可用 */
public static final int STATUS_ENABLE = 1;
+ /* 不可用 */
public static final int STATUS_DISABLE = 0;
public static final int HTTP_OK = 200;
--
libgit2 0.22.2