diff --git a/ruoyi-admin/src/main/resources/templates/layout/product-list.html b/ruoyi-admin/src/main/resources/templates/layout/product-list.html
index ecc3958a..4f87d88a 100644
--- a/ruoyi-admin/src/main/resources/templates/layout/product-list.html
+++ b/ruoyi-admin/src/main/resources/templates/layout/product-list.html
@@ -278,7 +278,7 @@
         $('.productTable .catalogue-price-format').on('input', function () {
             let val = $(this).val()
             $(this).parent().parent().find('.cataloguePrice').val(val)
-            // let quantity = $(this).parent().parent().find('.quantity').val()
+            let quantity = $(this).parent().parent().find('.quantity').val()
             // let discount=$(this).parent().parent().find('.discount').val()
             // if (discount && val){
             //     $(this).parent().parent().find('.price').val((val * discount).toFixed(2))
@@ -290,10 +290,10 @@
             //         $(this).parent().parent().find('.allPrice-formmat').val(formatAmountNumber(allPrice))
             //     }
             // }
-            // if (quantity && val) {
-            //     $(this).parent().parent().find('.catalogueAllPrice').val((val * quantity).toFixed(2))
-            //     $(this).parent().parent().find('.catalogueAllPrice-formmat').val(formatAmountNumber((val * quantity).toFixed(2)))
-            // }
+            if (quantity && val) {
+                $(this).parent().parent().find('.catalogueAllPrice').val((val * quantity).toFixed(2))
+                $(this).parent().parent().find('.catalogueAllPrice-formmat').val(formatAmountNumber((val * quantity).toFixed(2)))
+            }
 
         })
         $('.productTable .guidance-discount-format').on('input', function () {
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
index d9330f19..9b0f9e6f 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
@@ -96,6 +96,7 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
         projectInfo.setHardwareProjectProductInfoList(productListMap.get(ProductInfo.ProductTypeEnum.HARDWARE.getType()));
         List<ProjectProductInfo> maintenanceProjectProductInfoList = productListMap.getOrDefault(ProductInfo.ProductTypeEnum.HARDWARE_MAINTENANCE.getType(), new ArrayList<>());
         maintenanceProjectProductInfoList.addAll(productListMap.getOrDefault(ProductInfo.ProductTypeEnum.SOFTWARE_MAINTENANCE.getType(), new ArrayList<>()));
+        maintenanceProjectProductInfoList.addAll(productListMap.getOrDefault(ProductInfo.ProductTypeEnum.OTHER.getType(), new ArrayList<>()));
         projectInfo.setMaintenanceProjectProductInfoList(maintenanceProjectProductInfoList);
         //查询变更记录信息
         List<ProjectWorkProgress> projectWorkProgresses = workProgressService.selectProjectWorkProgressListByProjectId(Collections.singletonList((projectInfo.getId())));
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
index 30afef56..15b0a237 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
@@ -171,12 +171,12 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService {
         }
         String shortCode = cnareas.get(0).getShortCode();
         StringBuilder result = new StringBuilder();
-        result.append("ZGXS-").append(currentDate).append(shortCode);
+        result.append("ZGXV-").append(currentDate).append(shortCode);
         // 查询当天已有的订单数量，用于生成顺序编码
         int count = projectOrderInfoMapper.selectMaxOrderCode(result.toString());
         // 生成顺序编码，不足三位补零
         String sequence = String.format("%03d", count + 1);
-        result.append(sequence).append("-VDI");
+        result.append(sequence);
         // 拼接订单编号
         return result.toString();
     }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectProductInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectProductInfoServiceImpl.java
index 4b875c73..487910ba 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectProductInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectProductInfoServiceImpl.java
@@ -134,7 +134,7 @@ public class ProjectProductInfoServiceImpl implements IProjectProductInfoService
 
         List<ProjectProductInfo> projectProductInfos = projectProductInfoMapper.selectProjectProductInfoListByProjectId(Collections.singletonList(list.get(0).getProjectId()));
         Set<Long> idSet = list.stream().map(ProjectProductInfo::getId).collect(Collectors.toSet());
-        String[] deleteIds = projectProductInfos.stream().filter(item -> !idSet.contains(item.getId())).map(item -> item.getId().toString()).toArray(String[]::new);
+        String[] deleteIds = projectProductInfos.stream().filter(item ->  !idSet.contains(item.getId())).map(item -> item.getId().toString()).toArray(String[]::new);
         //删除数据
         if (deleteIds.length > 0) {
             projectProductInfoMapper.deleteProjectProductInfoByIds(deleteIds);