zww- 实例名称BUG修改

src/main/java/com/gaotao/modules/toolman/entity/PoToolInstanceId.java

@@ -57,4 +57,6 @@ public class PoToolInstanceId {
     private String status2;
 
     private String locationId;
+
+    private String toolDescription;
 }

src/main/resources/mapper/toolman/PoToolInstanceIdMapper.xml

@@ -18,6 +18,7 @@
     <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="status2" jdbcType="VARCHAR" property="status2" />
     <result column="location_id" jdbcType="VARCHAR" property="locationId" />
+    <result column="ToolDescription" jdbcType="VARCHAR" property="toolDescription"/>
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
@@ -108,9 +109,11 @@
         select A.id,A.site,A.transaction_id,A.tool_id,A.tool_instance_id,A.order_no,A.release_no,A.sequence_no,A.item_no
             ,A.vendor_no,A.vendor_name
             ,B.status2,B.status ,B.location_id
+            ,D.ToolDescription
         from po_tool_instance_id A
         left join po_receipt_detail B on B.part_no = A.tool_instance_id
         left join po_receipt C on C.receipt_no = B.receipt_no
+        left join ToolHeader D on A.site = D.site and A.tool_id = D.ToolID
         <where>
             A.site=#{site,jdbcType=VARCHAR}
             <if test="toolId != null and toolId != ''">

src/main/resources/mapper/toolman/ToolDetailMapper.xml

@@ -265,9 +265,10 @@
         </where>
     </select>
     <select id="getToolDetail" resultType="com.gaotao.modules.toolman.entity.ToolDetail">
-        select A.ToolID,A.Site,A.ToolInstanceID,A.LocationID,A.Status,A.Remark,A.CreateDate,A.CreatedBy,A.SupplierID
+        select A.ToolID,A.Site,A.ToolInstanceID,A.Status,A.Remark,A.CreateDate,A.CreatedBy,A.SupplierID
         ,A.PurchaseDate,A.PhaseInDate,A.PhaseOutDate,A.InspectDuration,A.LatestInspectDate,A.LatestUseDate,A.EstUseQty
         ,A.ActualUseQty,A.WorkCenterNo,A.LastUpdateBy,A.TorNumacc ,A.statusRef
+        ,isnull(A.LocationID ,'') as locationId
         ,B.ToolDescription
         from ToolDetail A
         left  join  ToolHeader B on A.ToolID = B.ToolID and A.Site = B.Site