diff --git a/oms_web/oms_vue/src/permission.js b/oms_web/oms_vue/src/permission.js index 480e0445..d36e5d14 100644 --- a/oms_web/oms_vue/src/permission.js +++ b/oms_web/oms_vue/src/permission.js @@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register'] +const whiteList = ['/login', '/register', '/service-query'] const isWhiteList = (path) => { return whiteList.some(pattern => isPathMatch(pattern, path)) diff --git a/oms_web/oms_vue/src/router/index.js b/oms_web/oms_vue/src/router/index.js index c9027ea5..db24cebf 100644 --- a/oms_web/oms_vue/src/router/index.js +++ b/oms_web/oms_vue/src/router/index.js @@ -88,6 +88,24 @@ export const constantRoutes = [ } ] }, + { + path: '/manage', + component: Layout, + redirect: 'noRedirect', + name: 'Manage', + meta: { + title: '档案管理', + icon: 'documentation' + }, + children: [ + { + path: 'order', + component: () => import('@/views/manage/order/index'), + name: 'ManageOrder', + meta: { title: '合同档案', icon: 'documentation' } + } + ] + }, { path: '/project/order', component: Layout, @@ -100,6 +118,11 @@ export const constantRoutes = [ meta: { title: '订单管理', icon: 'order' } } ] + }, + { + path: '/service-query', + component: () => import('@/views/manage/service/index'), + hidden: true } ] diff --git a/oms_web/oms_vue/src/views/index.vue b/oms_web/oms_vue/src/views/index.vue index 03e8c87f..df880550 100644 --- a/oms_web/oms_vue/src/views/index.vue +++ b/oms_web/oms_vue/src/views/index.vue @@ -1,1053 +1,20 @@ - +.app-container { + padding: 20px; +} + \ No newline at end of file diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java index 826d90f0..b3252e43 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java @@ -6,10 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.sip.domain.MaintenanceRecordsDto; import com.ruoyi.sip.dto.ApiDataQueryDto; -import com.ruoyi.sip.service.IMaintenanceService; -import com.ruoyi.sip.service.IOrderDeliveryService; -import com.ruoyi.sip.service.IOrderInfoService; -import com.ruoyi.sip.service.IProductInfoService; +import com.ruoyi.sip.service.*; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -44,6 +41,8 @@ public class MaintenanceController { private IProductInfoService productInfoService; @Autowired private IOrderInfoService orderInfoService; + @Autowired + private IProjectOrderInfoService projectOrderInfoService; @Anonymous @GetMapping() @@ -83,7 +82,7 @@ public class MaintenanceController { } ApiDataQueryDto queryDto=new ApiDataQueryDto(); queryDto.setSerialNumber(dto.getSerialNumber()); - return AjaxResult.success(orderInfoService.getOrderInfo(queryDto)); + return AjaxResult.success(projectOrderInfoService.getOrderInfo(queryDto)); } } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java index 3d7138f4..bfe94942 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java @@ -7,6 +7,7 @@ import com.ruoyi.sip.domain.MaintenanceRecordsDto; import com.ruoyi.sip.dto.ApiDataQueryDto; import com.ruoyi.sip.mapper.MaintenanceMapper; import com.ruoyi.sip.service.IDeliveryListService; +import com.ruoyi.sip.service.IInventoryDeliveryService; import com.ruoyi.sip.service.IMaintenanceService; import com.ruoyi.sip.vo.DeliveryInfoVo; import org.springframework.beans.factory.annotation.Autowired; @@ -38,14 +39,15 @@ public class MaintenanceServiceImpl implements IMaintenanceService { private MaintenanceMapper mapper; @Autowired private IDeliveryListService deliveryListService; - + @Autowired + private IInventoryDeliveryService deliveryService; @Override public List query(MaintenanceRecordsDto dto) { ApiDataQueryDto apiDataQueryDto = new ApiDataQueryDto(); apiDataQueryDto.setSerialNumber(dto.getSerialNumber()); - List numberInfo = deliveryListService.getNumberInfo(apiDataQueryDto); + List numberInfo = deliveryService.getNumberInfo(apiDataQueryDto); if (CollUtil.isEmpty(numberInfo)){ return Collections.emptyList(); } diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml index 7165d5e8..7cf55451 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml @@ -264,11 +264,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN project_info t2 ON t1.project_id = t2.id LEFT JOIN agent_info t3 ON t2.agent_code = t3.agent_code LEFT JOIN customer_info t4 ON t2.customer_code = t4.customer_code - where t1.update_time between #{updateTimeStart} and #{updateTimeEnd} - and t1.order_code in ( select DISTINCT order_code from oms_inventory_outer where outer_code in (SELECT outer_code from oms_inventory_delivery where delivery_status=1) + where t1.order_code in ( select DISTINCT order_code from oms_inventory_outer where outer_code in (SELECT outer_code from oms_inventory_delivery where delivery_status=1) ) + + + and t1.update_time between #{updateTimeStart} and #{updateTimeEnd} + + + and t1.update_time = ]]> #{updateTimeStart} + + + and t1.update_time #{updateTimeEnd} + + + - and t1.order_code in (select select DISTINCT order_code from oms_inventory_outer where outer_code in (select outer_code from oms_inventory_info where product_sn=#{productSn} ) ) + and t1.order_code in (select DISTINCT order_code from oms_inventory_outer where outer_code in (select outer_code from oms_inventory_info where product_sn=#{productSn} ) )