diff --git a/pom.xml b/pom.xml index 74cc1e8..324015b 100644 --- a/pom.xml +++ b/pom.xml @@ -276,7 +276,7 @@ - ${project.artifactId}-${project.version} + ${project.artifactId} org.apache.maven.wagon 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} - and ToolInstanceID LIKE '%'+#{toolId,jdbcType=VARCHAR}+'%' + and ToolInstanceID LIKE #{toolId,jdbcType=VARCHAR}+'%' 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 ToolID, - Site, + Site, ToolDescription, - Spec, + Spec, FamilyID, Active, Remark, @@ -131,7 +131,7 @@ CodeNo, CreateDate, CreatedBy, - UMID, + UMID, DefaultWarehouseID, LastUpdateBy, DefaultLocationID, 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",