From 02164a9fd8d5697b08ae2ef0ef4f9ded7d260a2a Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 11 Jan 2022 14:31:15 +0800
Subject: [PATCH] 20211213

---
 src/main/java/com/gaotao/modules/base/dao/BaseMapper.java  | 2 ++
 src/main/java/com/gaotao/modules/base/entity/SiteData.java | 4 ++--
 .../gaotao/modules/base/service/Impl/BaseServiceImpl.java  | 7 +++++++
 src/main/resources/mapper/base/BaseMapper.xml              | 4 +++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
index 11c195d..23362ed 100644
--- a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
+++ b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
@@ -428,6 +428,8 @@ public interface BaseMapper {
      * @throw
      */
     void editUMData (UmData inData);
+
+    List<PartData> checkUmIDInPart(@Param("site") String site,@Param("umid") String umid);
     /**
      * @Description 删除物料分类
      * @Title deletePartFamily
diff --git a/src/main/java/com/gaotao/modules/base/entity/SiteData.java b/src/main/java/com/gaotao/modules/base/entity/SiteData.java
index 34545df..4677999 100644
--- a/src/main/java/com/gaotao/modules/base/entity/SiteData.java
+++ b/src/main/java/com/gaotao/modules/base/entity/SiteData.java
@@ -79,8 +79,8 @@ public class SiteData {
     /**
      *
      */
-    @DateTimeFormat(pattern = "HH:mm")
-    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
     private Date shipTime;
 
     /**
diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
index 5eb8b50..1b8cbd7 100644
--- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
@@ -757,6 +757,12 @@ public class BaseServiceImpl implements BaseService {
     @Override
     public ResponseData deleteUMData(UmData inData) {
         ResponseData responseData = new ResponseData();
+        List<PartData> check= baseMapper.checkUmIDInPart(inData.getSite(),inData.getUmid());
+        if(check.size()>0){
+            responseData.setMsg("该计量单位已在物料中引用无法删除！");
+            responseData.setCode("500");
+            return responseData;
+        }
         baseMapper.deleteUMData(inData);
         responseData.setCode("200");
         responseData.setSuccess(true);
@@ -835,6 +841,7 @@ public class BaseServiceImpl implements BaseService {
     @Override
     public ResponseData saveReferencePartInfoData(ReferencePartInfoData inData){
         ResponseData responseData = new ResponseData();
+
         if (inData.getAdd()==0){
             List<SiteData> list3=baseMapper.checkSiteId(inData.getSite());
             if(list3.size()==0){
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index 925ca03..510c4b1 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -351,7 +351,9 @@
         UPDATE UM SET Site=#{site},UMName=#{uMName},Active=#{active}
         where UMID=#{umid} and Site=#{site}
     </update>
-
+    <select id="checkUmIDInPart" resultType="com.gaotao.modules.base.entity.PartData">
+        SELECT PartNo,PartDescription FROM Part where Site=#{site} and  UMID=#{umid}
+    </select>
     <delete id="deleteUMData" parameterType="com.gaotao.modules.base.entity.UmData">
         delete from UM where UMID=#{umid} and Site=#{site}
     </delete>