feat(router): 添加档案管理和合同档案路由配置

- 在路由中新增 `/manage` 路径，指向档案管理页面- 添加子路由 `/manage/order`，用于访问合同档案功能模块
- 新增隐藏路由 `/service-query`，支持服务查询页面访问
- 配置了相关路由的组件引入和元信息（标题、图标等）- 设置了路由重定向及权限控制相关属性

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))

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
   }
 ]
 

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));
     }
 
 }

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<DeliveryInfoVo.ServiceInfo> query(MaintenanceRecordsDto dto) {
 
         ApiDataQueryDto apiDataQueryDto = new ApiDataQueryDto();
         apiDataQueryDto.setSerialNumber(dto.getSerialNumber());
-        List<DeliveryInfoVo> numberInfo = deliveryListService.getNumberInfo(apiDataQueryDto);
+        List<DeliveryInfoVo> numberInfo = deliveryService.getNumberInfo(apiDataQueryDto);
         if (CollUtil.isEmpty(numberInfo)){
             return Collections.emptyList();
         }

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)
         )
+        <choose>
+            <when test="updateTimeStart!=null and updateTimeEnd!=null">
+                and t1.update_time between #{updateTimeStart} and #{updateTimeEnd}
+            </when>
+            <when test="updateTimeStart!=null">
+                and t1.update_time   <![CDATA[ >= ]]>  #{updateTimeStart}
+            </when>
+            <when test="updateTimeEnd!=null">
+                and t1.update_time   <![CDATA[ <= ]]>  #{updateTimeEnd}
+            </when>
+        </choose>
+
         <if test="productSn!=null and productSn!=''">
-            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} ) )
         </if>
     </select>
     <select id="listByCodeList" resultType="com.ruoyi.sip.domain.ProjectOrderInfo">

ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml

@@ -81,12 +81,12 @@
         t1.catalogue_price,
         t1.guidance_discount,
         t1.vendor_code,
-        t2.serial_number
+        t2.product_sn as serial_number
         FROM
-        product_info t1  left join delivery_list t2 on t1.product_code=t2.product_code
+        product_info t1  left join oms_inventory_info t2 on t1.product_code=t2.product_code
         <where>
             <if test="serialNumber!=null and serialNumber!=''">
-                and t2.serial_number=#{serialNumber}
+                and t2.product_sn=#{serialNumber}
             </if>
             <if test="productCode!=null and productCode!=''">
                 and t1.product_code=#{productCode}