diff --git a/oms_web/oms_vue/src/views/inventory/info/index.vue b/oms_web/oms_vue/src/views/inventory/info/index.vue index 66e57d0e..a3d0d772 100644 --- a/oms_web/oms_vue/src/views/inventory/info/index.vue +++ b/oms_web/oms_vue/src/views/inventory/info/index.vue @@ -351,11 +351,7 @@ - - - + @@ -376,8 +372,6 @@ - - @@ -388,7 +382,6 @@ import InnerLog from './innerLog'; import OuterLog from './outerLog'; import OrderDetail from "@/views/inventory/inner/components/OrderDetail.vue"; import ServiceDetail from "@/views/inventory/inner/components/ServiceDetail.vue"; -import ProjectDetailDrawer from "@/views/project/info/ProjectDetailDrawer.vue"; import ApproveLayout from "@/views/approve/ApproveLayout.vue"; import PurchaseOrderDetailView from "@/views/purchaseorder/components/PurchaseOrderDetailView.vue"; import { getPurchaseorder, getPurchaseOrderHistoryDetail } from "@/api/sip/purchaseorder"; @@ -400,7 +393,6 @@ export default { OuterLog, OrderDetail, ServiceDetail, - ProjectDetailDrawer, ApproveLayout, PurchaseOrderDetailView }, @@ -426,8 +418,6 @@ export default { open: false, // 是否显示详情抽屉 drawerVisible: false, - projectDrawerVisible: false, - currentProjectId: null, // 制造商选项 vendorOptions: [], // 仓库选项 @@ -780,10 +770,6 @@ export default { this.purchaseOrderDetailOpen = false; }); }, - handleViewProject(row) { - this.currentProjectId = row.projectId; - this.projectDrawerVisible = true; - }, /** 处理锁单量 */ handleBindOrder(row) { if (!row.warehouseId) { diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/OmsInventoryInnerMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/OmsInventoryInnerMapper.xml index 0ce93cc8..012c9b4d 100644 --- a/ruoyi-sip/src/main/resources/mapper/inventory/OmsInventoryInnerMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/inventory/OmsInventoryInnerMapper.xml @@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from oms_purchase_order as tt1 inner join oms_purchase_order_map as tt2 on tt1.id = tt2.purchase_id where tt1.purchase_no = t1.purchase_no and tt2.product_code = t2.product_code - ) as bind_num + ) - sum(if(t2.inventory_status = 1, 1, 0)) as bind_num from oms_inventory_inner as t1 inner join oms_inventory_info as t2 on t1.inner_code = t2.inner_code @@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t2.warehouse_id = #{warehouseId} group by t1.id + having inventory_num > 0 order by t1.create_time desc