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 35625ea..20b8514 100644 --- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue +++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue @@ -136,16 +136,10 @@ <span slot="action" slot-scope="text, record"> <a v-has="'inventoryHeader:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a> - <!-- <a-dropdown> - <a class="ant-dropdown-link" >更多 <a-icon type="down"/></a> - <a-menu slot="overlay" v-has="'inventoryHeader:delete'"> - <a-menu-item> - <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> - <a>删除</a> - </a-popconfirm> - </a-menu-item> - </a-menu> - </a-dropdown> --> + <a-divider type="vertical"/> + <a-popconfirm v-has="'inventoryHeader:delete'" title="确定删除吗?" @confirm="() => handleDelete(record.id)"> + <a>删除</a> + </a-popconfirm> </span> </a-table> @@ -257,14 +251,14 @@ export default { align: "center", dataIndex: 'updateTime' }, - // { - // title: '操作', - // dataIndex: 'action', - // align: "center", - // fixed: "right", - // width: 147, - // scopedSlots: {customRender: 'action'}, - // } + { + title: '操作', + dataIndex: 'action', + align: "center", + fixed: "right", + width: 147, + scopedSlots: {customRender: 'action'}, + } ], url: { list: "/inventory/inventoryHeader/list", diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryDetailServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryDetailServiceImpl.java index eaba459..bc36392 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryDetailServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryDetailServiceImpl.java @@ -141,7 +141,7 @@ public class InventoryDetailServiceImpl extends ServiceImpl<InventoryDetailMappe .eq(InventoryDetail::getMaterialCode, inventoryDetail.getMaterialCode()).eq(InventoryDetail::getWarehouseCode, inventoryDetail.getWarehouseCode()) .eq(StringUtils.isNotEmpty(inventoryDetail.getBatch()), InventoryDetail::getBatch, inventoryDetail.getBatch()) .eq(StringUtils.isNotEmpty(inventoryDetail.getLot()), InventoryDetail::getLot, inventoryDetail.getLot()) - .eq(StringUtils.isNotEmpty(inventoryDetail.getProject()), InventoryDetail::getProject, inventoryDetail.getLot()) + .eq(StringUtils.isNotEmpty(inventoryDetail.getProject()), InventoryDetail::getProject, inventoryDetail.getProject()) .eq(InventoryDetail::getCompanyCode, inventoryDetail.getCompanyCode()); String value = parameterConfigurationService.getValueByCode(QuantityConstant.RULE_SHIPMENT_ZONE); @@ -379,7 +379,7 @@ public class InventoryDetailServiceImpl extends ServiceImpl<InventoryDetailMappe } return containerCodeList; } - + @Override public IPage<InventoryDetail> pageByMainIds(Page<InventoryDetail> page, List<String> inventoryHeaderIds) { LambdaQueryWrapper<InventoryDetail> queryWrapper = Wrappers.lambdaQuery();