diff --git a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiEmptyContainer.vue b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiEmptyContainer.vue index d94944b..3f4457b 100644 --- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiEmptyContainer.vue +++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiEmptyContainer.vue @@ -47,7 +47,7 @@ export default { // 多条件查询配置 queryConfigDefault: [ { - key: 'locationCode', + key: 'Code', label: '库位编码', }, ], diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/mapper/xml/LocationMapper.xml b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/mapper/xml/LocationMapper.xml index 2c90a6c..9bb7b03 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/mapper/xml/LocationMapper.xml +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/mapper/xml/LocationMapper.xml @@ -32,7 +32,7 @@ AND cc.code = #{map.containerCode} </if> <if test="map.locationCode != null and map.locationCode !=''"> - AND t.location_code = #{map.locationCode} + AND t.code = #{map.locationCode} </if> AND cc.warehouse_code = #{map.warehouseCode}) <if test="map.locationStatus != null and map.locationStatus !=''">