Merge remote-tracking branch 'origin/master'

pom.xml

@@ -276,7 +276,7 @@
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
+        <finalName>${project.artifactId}</finalName>
         <extensions>
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>

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>

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>

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",

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",