diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/InventoryStockController.java b/src/main/java/com/xujie/sys/modules/pms/controller/InventoryStockController.java
index c6e08324..28a0ab34 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/InventoryStockController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/InventoryStockController.java
@@ -48,8 +48,12 @@ public class InventoryStockController {
      */
     @RequestMapping("/saveCoreSparePart")
     public R saveCoreSparePart(@RequestBody CoreSparePart data){
-        inventoryStockService.saveCoreSparePart(data);
-        return R.ok();
+        try {
+            inventoryStockService.saveCoreSparePart(data);
+            return R.ok("保存成功");
+        } catch (Exception e) {
+            return R.error(e.getMessage() == null ? "保存失败" : e.getMessage());
+        }
     }
     /**
      * @author: ZHB
diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/EamWorkOrderCoreComponentsData.java b/src/main/java/com/xujie/sys/modules/pms/entity/EamWorkOrderCoreComponentsData.java
index 81fed51c..01421f50 100644
--- a/src/main/java/com/xujie/sys/modules/pms/entity/EamWorkOrderCoreComponentsData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/entity/EamWorkOrderCoreComponentsData.java
@@ -44,7 +44,7 @@ public class EamWorkOrderCoreComponentsData extends EamWorkOrderCoreComponents {
     private String serialNo;
     //上下机状态
     private String onOffStatus;
-    //上机时长 （月）
+    //上机时长（天）
     private BigDecimal timeDiffMonths;
     //故障原因
     private String feedBackDesc;
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/InventoryStockMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/InventoryStockMapper.java
index 5c3b353b..543f85d9 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/InventoryStockMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/InventoryStockMapper.java
@@ -45,6 +45,8 @@ public interface InventoryStockMapper extends BaseMapper<InventoryStockEntity> {
 
     void saveCoreSparePart(CoreSparePart data);
 
+    Integer countCoreSparePartBySerial(CoreSparePart data);
+
     List<CoreSparePart> getCoreSparePartList(CoreSparePart data);
 
     void updateCoreSparePart(CoreSparePart data);
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/InventoryStockServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/InventoryStockServiceImpl.java
index 89af45dd..b9c778cb 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/InventoryStockServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/InventoryStockServiceImpl.java
@@ -64,9 +64,17 @@ public class InventoryStockServiceImpl extends ServiceImpl<InventoryStockMapper,
             throw new RuntimeException("工厂和部门有误!");
         }
 
-        if (data.getFlag().equals("1")){
+        Integer serialCount = baseMapper.countCoreSparePartBySerial(data);
+
+        if ("1".equals(data.getFlag())){
+            if (!Objects.isNull(serialCount) && serialCount > 0) {
+                throw new RuntimeException("序列号不允许重复！");
+            }
             baseMapper.saveCoreSparePart(data);
-        } else if (data.getFlag().equals("2")){
+        } else if ("2".equals(data.getFlag())){
+            if (!Objects.isNull(serialCount) && serialCount > 1) {
+                throw new RuntimeException("序列号不允许重复！");
+            }
             baseMapper.updateCoreSparePart(data);
         }
 
diff --git a/src/main/resources/mapper/pms/InventoryStockMapper.xml b/src/main/resources/mapper/pms/InventoryStockMapper.xml
index 186a6e60..39ac566d 100644
--- a/src/main/resources/mapper/pms/InventoryStockMapper.xml
+++ b/src/main/resources/mapper/pms/InventoryStockMapper.xml
@@ -38,6 +38,13 @@
         insert into core_spare_part(site,bu_no,part_no,part_desc,serial_number,status,arrival_time,remark,create_time,create_by)
         values(#{site},#{buNo},#{partNo},#{partDesc},#{serialNumber},#{status},#{arrivalTime},#{remark},GETDATE(),#{createBy})
     </insert>
+    <select id="countCoreSparePartBySerial" resultType="java.lang.Integer">
+        select count(1)
+        from core_spare_part
+        where site = #{site}
+          and bu_no = #{buNo}
+          and serial_number = #{serialNumber}
+    </select>
     <delete id="deleteCoreSparePart">
         delete from core_spare_part
         where site = #{site}  and bu_no = #{buNo}  and part_no = #{partNo} and serial_number = #{serialNumber}
@@ -367,7 +374,7 @@
                 WHEN action = '上机' THEN '第' + CAST(rn AS VARCHAR) + '次上机'
                 WHEN action = '下机' THEN '第' + CAST(rn AS VARCHAR) + '次下机'
                 END AS status,
-                DATEDIFF(MONTH,
+                DATEDIFF(DAY,
                 LAG(created_date) OVER (PARTITION BY partno, serialNo ORDER BY created_date),
                 created_date
                 ) AS time_diff_months