From 6d0ade1df8426c093246b2179b2e5e95ead5c6a6 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Mon, 26 Dec 2022 17:23:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=85=A5=E5=BA=93=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E9=99=84=E4=BB=B6=202022=E5=B9=B412=E6=9C=8826?=
 =?UTF-8?q?=E6=97=A5=20=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseorder/dao/PRHeaderMapper.java        |  9 +++++++++
 .../service/impl/ToolHeaderServiceImpl.java      | 13 +++++++++++--
 .../mapper/purchaseorder/PRHeaderMapper.xml      | 16 ++++++++++++----
 .../mapper/toolman/ToolTransHeaderMapper.xml     |  2 +-
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/purchaseorder/dao/PRHeaderMapper.java b/src/main/java/com/gaotao/modules/purchaseorder/dao/PRHeaderMapper.java
index c1e1aa5..34e4b82 100644
--- a/src/main/java/com/gaotao/modules/purchaseorder/dao/PRHeaderMapper.java
+++ b/src/main/java/com/gaotao/modules/purchaseorder/dao/PRHeaderMapper.java
@@ -79,4 +79,13 @@ public interface PRHeaderMapper extends BaseMapper<PRHeader> {
      */
     void updateReceiveToolDetail(ToolDetailQuery toolDetailQuery);
 
+    /**
+     * @author: sxm
+     * @description: 获取申请工具类型呢
+     * @param [site, transactionId]
+     * @return: com.gaotao.modules.purchaseorder.entity.PRHeader
+     * @date: 2022/12/26 17:03
+     */
+    PRHeader getPRHeaderInfo(@Param("site") String site,@Param("transactionId") String transactionId);
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java b/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java
index 54a5af6..56f86c8 100644
--- a/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java
@@ -16,6 +16,8 @@ import com.gaotao.modules.finishedProduct.service.ReportfilelistUserprinterServi
 import com.gaotao.modules.finishedProduct.vo.ReportFileVo;
 import com.gaotao.modules.pda.utils.HttpClientUtil;
 import com.gaotao.modules.pda.utils.ResponseData;
+import com.gaotao.modules.purchaseorder.dao.PRHeaderMapper;
+import com.gaotao.modules.purchaseorder.entity.PRHeader;
 import com.gaotao.modules.sys.entity.SysUserEntity;
 import com.gaotao.modules.toolman.dao.*;
 import com.gaotao.modules.toolman.entity.*;
@@ -210,6 +212,8 @@ public class ToolHeaderServiceImpl implements ToolHeaderService {
         return returnR;
     }
 
+    @Autowired
+    private PRHeaderMapper prHeaderMapper;
     @Override
     @Transactional
     public R saveToolDetail(ToolDetailQuery toolDetailQuery) {
@@ -247,9 +251,11 @@ public class ToolHeaderServiceImpl implements ToolHeaderService {
             count = toolHeaderMapper.getToolHeaderCount(toolHeaderQuery);
             if (count == 0) {
                 // 工具基本信息主表
+                // 获取工具分类信息
+               PRHeader prHeader =  prHeaderMapper.getPRHeaderInfo(toolDetailQuery.getSite(),toolDetailQuery.getTransactionId());
                 toolHeaderQuery.setToolDescription(toolDetailQuery.getDescription());
-                toolHeaderQuery.setSpec("");
-                toolHeaderQuery.setFamilyId("");
+                toolHeaderQuery.setSpec("*");
+                toolHeaderQuery.setFamilyId(prHeader.getOrderref1());
                 toolHeaderQuery.setActive("Y");
                 toolHeaderQuery.setCreatedBy(toolDetailQuery.getUserName());
                 toolHeaderQuery.setCreateDate(new Date());
@@ -365,6 +371,9 @@ public class ToolHeaderServiceImpl implements ToolHeaderService {
     @Override
     public ToolDetail getToolDetail(ToolDetailQuery toolDetailQuery) {
         ToolDetail toolDetail = toolDetailMapper.getToolDetail(toolDetailQuery);
+        if (toolDetail == null){
+            throw new XJException("工具实例不存在");
+        }
         // 采购入库时需要校验是否 工具分类时否开始 校验
         if ("Y".equals(toolDetailQuery.getIsPurchase())) {
             PartFamilyData familyData = baseService.getPartFamilyInfo(toolDetail.getSite(),toolDetail.getFamilyID());
diff --git a/src/main/resources/mapper/purchaseorder/PRHeaderMapper.xml b/src/main/resources/mapper/purchaseorder/PRHeaderMapper.xml
index 1484e1e..13a476b 100644
--- a/src/main/resources/mapper/purchaseorder/PRHeaderMapper.xml
+++ b/src/main/resources/mapper/purchaseorder/PRHeaderMapper.xml
@@ -268,13 +268,21 @@
         </where>
     </delete>
     <select id="getTransNo" resultType="java.lang.String">
-    select dbo.Get_TransNo(#{site},#{dbType})
+        select dbo.Get_TransNo(#{site}, #{dbType})
+    </select>
+    <select id="getPRHeaderInfo" resultType="com.gaotao.modules.purchaseorder.entity.PRHeader">
+        select
+         *
+        from PRHeader
+        where site = #{site} and RequisitionNo = #{transactionId}
     </select>
     <update id="updateTransNo">
-        exec dbo.UpdateTransNo #{site},#{dbType}
+        exec dbo.UpdateTransNo #{site}, #{dbType}
     </update>
     <update id="updateReceiveToolDetail">
-         update po_receipt_detail_sub set tool_instance_id = #{newToolInstanceId}
-         where  tool_instance_id = #{toolInstanceId}  and site = #{site}
+        update po_receipt_detail_sub
+        set tool_instance_id = #{newToolInstanceId}
+        where tool_instance_id = #{toolInstanceId}
+          and site = #{site}
     </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/toolman/ToolTransHeaderMapper.xml b/src/main/resources/mapper/toolman/ToolTransHeaderMapper.xml
index 5f5f3fb..4af8dc8 100644
--- a/src/main/resources/mapper/toolman/ToolTransHeaderMapper.xml
+++ b/src/main/resources/mapper/toolman/ToolTransHeaderMapper.xml
@@ -215,6 +215,6 @@
     <select id="getToolFile" resultType="java.lang.Integer">
         SELECT COUNT(sys_oss_id) FROM po_receipt_detail_sub  s
         LEFT JOIN file_associate f  on s.site = f.site and s.transaction_id = f.associated_field1
-        WHERE s.site = #{site} and s.tool_instance_id = #{toolInstanceId}
+        WHERE s.site = #{site} and s.tool_instance_id = #{toolInstanceId} and f.type= 'InspectFile'
     </select>
 </mapper>
\ No newline at end of file