From f5200dcd8573fcc5783a1e093313a1299f3735de Mon Sep 17 00:00:00 2001
From: zuowenwen <zuowenwen>
Date: Thu, 26 Aug 2021 16:55:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8D=A3=E5=85=B4=20=E5=B7=A5=E5=85=B7Mapp?=
 =?UTF-8?q?er-zww?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/toolman/ToolDetailMapper.xml | 2 +-
 src/main/resources/mapper/toolman/ToolHeaderMapper.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/toolman/ToolDetailMapper.xml b/src/main/resources/mapper/toolman/ToolDetailMapper.xml
index d919158..053a040 100644
--- a/src/main/resources/mapper/toolman/ToolDetailMapper.xml
+++ b/src/main/resources/mapper/toolman/ToolDetailMapper.xml
@@ -249,7 +249,7 @@
                 and Site=#{site,jdbcType=VARCHAR}
             </if>
             <if test="toolId != null and toolId != ''">
-                and ToolInstanceID LIKE '%'+#{toolId,jdbcType=VARCHAR}+'%'
+                and ToolInstanceID LIKE #{toolId,jdbcType=VARCHAR}+'%'
             </if>
         </where>
     </select>
diff --git a/src/main/resources/mapper/toolman/ToolHeaderMapper.xml b/src/main/resources/mapper/toolman/ToolHeaderMapper.xml
index ed0feaf..e641e43 100644
--- a/src/main/resources/mapper/toolman/ToolHeaderMapper.xml
+++ b/src/main/resources/mapper/toolman/ToolHeaderMapper.xml
@@ -121,9 +121,9 @@
         INSERT INTO ToolHeader
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="toolId != null and toolId != ''">ToolID,</if>
-            <if test="site!=null">Site,</if>
+            <if test="site != null and site != ''">Site,</if>
             <if test="toolDescription != null and toolDescription != ''">ToolDescription,</if>
-            <if test="spec!=null">Spec,</if>
+            <if test="spec != null and spec != ''">Spec,</if>
             <if test="familyId != null and familyId != ''">FamilyID,</if>
             <if test="active != null and active != ''">Active,</if>
             <if test="remark != null and remark != ''">Remark,</if>
@@ -131,7 +131,7 @@
             <if test="codeNo != null and codeNo != ''">CodeNo,</if>
             <if test="createDate != null">CreateDate,</if>
             <if test="createdBy != null and createdBy != ''">CreatedBy,</if>
-            <if test="umid!=null">UMID,</if>
+            <if test="umid != null and umid != ''">UMID,</if>
             <if test="defaultWarehouseId != null and defaultWarehouseId != ''">DefaultWarehouseID,</if>
             <if test="lastUpdateBy != null and lastUpdateBy != ''">LastUpdateBy,</if>
             <if test="defaultLocationId != null and defaultLocationId != ''">DefaultLocationID,</if>

From 49a3c89beed71c6b8965085853f469120d2f6620 Mon Sep 17 00:00:00 2001
From: zuowenwen <zuowenwen>
Date: Wed, 1 Sep 2021 11:21:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8D=A3=E5=85=B4=20=E5=B7=A5=E5=85=B7Mapp?=
 =?UTF-8?q?er-zww?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                             | 2 +-
 src/main/resources/static/js/pda/toolMoveLibrary.js | 2 +-
 src/main/resources/static/js/pda/toolWarehousing.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index d3ba17f..8743e49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,7 +247,7 @@
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
+        <finalName>${project.artifactId}</finalName>
         <extensions>
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
diff --git a/src/main/resources/static/js/pda/toolMoveLibrary.js b/src/main/resources/static/js/pda/toolMoveLibrary.js
index 7f67632..cee13f4 100644
--- a/src/main/resources/static/js/pda/toolMoveLibrary.js
+++ b/src/main/resources/static/js/pda/toolMoveLibrary.js
@@ -164,7 +164,7 @@ $("#location_modal").on("hidden.bs.modal",function(){
 function getLocation(locationId){
 	var jsonData = {
 		site : site,
-		locationid : locationId,
+		locationId : locationId,
 	}
 	$.ajax({
         url: "/toolPda/getLocation",
diff --git a/src/main/resources/static/js/pda/toolWarehousing.js b/src/main/resources/static/js/pda/toolWarehousing.js
index ff687ea..642eeb4 100644
--- a/src/main/resources/static/js/pda/toolWarehousing.js
+++ b/src/main/resources/static/js/pda/toolWarehousing.js
@@ -55,7 +55,7 @@ function getToolInstanceData(toolInstanceId){
 	$("#tool_detail").val("");
 	var jsonData = {
 		site : site,
-		toolinstanceid : toolInstanceId,
+		toolInstanceId : toolInstanceId,
 	}
 	$.ajax({
 		url: "/toolPda/getToolDetail",