From 216364228cf5ac635353e4601bebbe8e9167d09f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Tue, 1 Aug 2023 17:02:20 +0800
Subject: [PATCH] 2023-08-01

---
 .../pda/dao/ToolTransDetailMapper.java        |  1 +
 .../service/impl/ToolHeaderServiceImpl.java   |  3 ++
 .../mapper/pda/ToolTransDetailMapper.xml      | 48 ++++++++++++++++++-
 .../templates/pda/toolOutOfLibrary.ftl        |  2 +-
 4 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/jtem/modules/pda/dao/ToolTransDetailMapper.java b/src/main/java/com/jtem/modules/pda/dao/ToolTransDetailMapper.java
index c0b3d6a..80c635c 100644
--- a/src/main/java/com/jtem/modules/pda/dao/ToolTransDetailMapper.java
+++ b/src/main/java/com/jtem/modules/pda/dao/ToolTransDetailMapper.java
@@ -109,4 +109,5 @@ public interface ToolTransDetailMapper {
 
     IPage<ToolTransDetailQuery> queryToolRequisitionRecord(Page<ToolTransDetailQuery> qcItemDataPage, @Param("query") ToolTransDetailQuery data);
 
+    IPage<ToolTransDetailQuery> queryToolWarehousingRecord(Page<ToolTransDetailQuery> toolTransDetailQueryPage, @Param("query") ToolTransDetailQuery data);
 }
diff --git a/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java b/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java
index 55a481a..4770958 100644
--- a/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java
+++ b/src/main/java/com/jtem/modules/pda/service/impl/ToolHeaderServiceImpl.java
@@ -665,6 +665,9 @@ public class ToolHeaderServiceImpl implements ToolHeaderService {
         } else if (data.getTypeFlag().equals("TL")) { // 工具领用
             IPage<ToolTransDetailQuery> resultList = this.toolTransDetailMapper.queryToolRequisitionRecord(new Page<ToolTransDetailQuery>(data.getPage(), data.getLimit()), data);
             return new PageUtils(resultList);
+        } else if (data.getTypeFlag().equals("TR")) { // 工具入库
+            IPage<ToolTransDetailQuery> resultList = this.toolTransDetailMapper.queryToolWarehousingRecord(new Page<ToolTransDetailQuery>(data.getPage(), data.getLimit()), data);
+            return new PageUtils(resultList);
         } else {
             IPage<ToolTransDetailQuery> resultList = this.toolTransDetailMapper.queryToolOperatorRecord(new Page<ToolTransDetailQuery>(data.getPage(), data.getLimit()), data);
             return new PageUtils(resultList);
diff --git a/src/main/resources/mapper/pda/ToolTransDetailMapper.xml b/src/main/resources/mapper/pda/ToolTransDetailMapper.xml
index 14a76c7..5ed738c 100644
--- a/src/main/resources/mapper/pda/ToolTransDetailMapper.xml
+++ b/src/main/resources/mapper/pda/ToolTransDetailMapper.xml
@@ -351,7 +351,7 @@
             trd.ware_house_id,
             trd.location_id,
             trd.supplier_id,
-            s.ResourceDesc as supplierName,
+            dbo.Get_WorkCenterResourceDesc(td.site,trd.supplier_id) as supplierName,
             trd.remark,
             trd.created_by,
             trd.created_date,
@@ -359,7 +359,6 @@
             trd.est_use_qty
         FROM tool_trans_detail as trd
         LEFT JOIN ToolDetail as td on trd.tool_instance_id = td.ToolInstanceID
-        LEFT JOIN WorkCenterResource as s on s.ResourceID = trd.supplier_id
         <where>
             trd.delflag = 'N'
             <choose>
@@ -432,4 +431,49 @@
             </if>
         </where>
     </select>
+    <!-- 获取工具实例入库操作记录 -->
+    <select id="queryToolWarehousingRecord" resultType="com.jtem.modules.pda.query.ToolTransDetailQuery" parameterType="com.jtem.modules.pda.query.ToolTransDetailQuery">
+        SELECT
+        trd.trans_no,
+        trd.tool_instance_id,
+        trd.trans_qty,
+        trd.ware_house_id,
+        trd.location_id,
+        trd.supplier_id,
+        s.SupplierName,
+        trd.remark,
+        trd.created_by,
+        trd.created_date,
+        trd.trans_price,
+        trd.est_use_qty
+        FROM tool_trans_detail as trd
+        LEFT JOIN ToolDetail as td on trd.tool_instance_id = td.ToolInstanceID
+        LEFT JOIN Supplier as s on s.supplierID = trd.supplier_id
+        <where>
+            trd.delflag = 'N'
+            <choose>
+                <when test="query.typeFlag.length() == 2">
+                    AND (trd.trans_no like #{query.typeFlag} + '[^F]%' or trd.trans_no like 'CR' + '[^F]%')
+                </when>
+                <otherwise>
+                    and trd.trans_no like #{query.typeFlag} + '%'
+                </otherwise>
+            </choose>
+            <if test = "query.toolId != null and query.toolId != ''">
+                AND td.tool_id LIKE '%' + #{query.toolId}+'%'
+            </if>
+            <if test = "query.toolInstanceId != null and query.toolInstanceId != ''">
+                AND trd.tool_instance_id LIKE '%' + #{query.toolInstanceId}+'%'
+            </if>
+            <if test = "query.locationId != null and query.locationId != ''">
+                AND trd.location_id LIKE '%' + #{query.locationId}+'%'
+            </if>
+            <if test="query.startDate != null">
+                AND trd.created_date >= #{query.startDate}
+            </if>
+            <if test="query.endDate != null">
+                AND #{query.endDate} >= trd.created_date
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/src/main/resources/templates/pda/toolOutOfLibrary.ftl b/src/main/resources/templates/pda/toolOutOfLibrary.ftl
index fe01d93..214f047 100644
--- a/src/main/resources/templates/pda/toolOutOfLibrary.ftl
+++ b/src/main/resources/templates/pda/toolOutOfLibrary.ftl
@@ -95,7 +95,7 @@
 	</div>
 	<div autocomplete="off" class="ivu-form ivu-form-label-right">
 		<div class="ivu-form-item" style="margin-bottom: 24px;">
-			<label class="ivu-form-item-label" style="width: 100px;">工序：</label>
+			<label class="ivu-form-item-label" style="width: 100px;">机台：</label>
 			<div class="ivu-form-item-content" style="margin-left: 100px;">
 				<div id="selectview" class="ivu-input-wrapper ivu-input-type">
 					<select id="workCenter_no" class=" form-input-2 "  name="supplierId" style="background-color: #ffffff;" data-first-option="false" title='请选择供应商'>