库存地点变更增加字段

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageVo.java

@@ -44,4 +44,9 @@ public class ScmVehicleGressionPageVo implements Vo {
     @ApiModelProperty("是否显示临时出门证按钮 审批流程完成后并且未上传现场照片时显示")
     private boolean showDownloadBtn;
 
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
+
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml

@@ -23,16 +23,18 @@
     <select id="selectCarTransferList"
             resultType="com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo">
         SELECT svg.sid,
-               svg.vinNo                                       as vin,
+        svg.vinNo as vin,
-               svg.applicantNo                                 as applyId,
+        svg.applicantNo as applyId,
-               if(length(svg.nodeState) > 0, nodeState, '待提交') as `state`,
+        if(length(svg.nodeState) > 0, nodeState, '待提交') as `state`,
-               svg.applicantName                               as applyName,
+        svg.applicantName as applyName,
-               svg.applicantDate                               as applyDate,
+        svg.applicantDate as applyDate,
-               svg.applicantFunds                              as applyPrice,
+        svg.applicantFunds as applyPrice,
-               svg.temporaryCard                               as downloadUrl,
+        svg.temporaryCard as downloadUrl,
-               svg.location,
+        svg.location,
-               svg.targetLocation,
+        svg.targetLocation,
-               svg.operator
+        svg.operator,
+        svg.procDefId,
+        svg.procInstId
         FROM scm_vehicle_gression svg
         <where>
             ${ew.sqlSegment}
@@ -43,26 +45,26 @@
     <select id="getCarTransferList"
             resultType="com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionPageVo">
         SELECT svg.sid,
-               svg.vinNo                                       as vin,
+        svg.vinNo as vin,
-               svg.applicantNo                                 as applyId,
+        svg.applicantNo as applyId,
-               if(length(svg.nodeState) > 0, nodeState, '待提交') as `state`,
+        if(length(svg.nodeState) > 0, nodeState, '待提交') as `state`,
-               if(length(svg.nodeState) > 0, false, true)      as showDetectBtn,
+        if(length(svg.nodeState) > 0, false, true) as showDetectBtn,
-               if(length(svg.nodeState) > 0, false, true)      as showUpdateBtn,
+        if(length(svg.nodeState) > 0, false, true) as showUpdateBtn,
-               if(length(svg.nodeState) > 0, true, false)      as showUploadBtn,
+        if(length(svg.nodeState) > 0, true, false) as showUploadBtn,
-               if(length(svg.nodeState) > 0, true, false)      as showDownloadBtn,
+        if(length(svg.nodeState) > 0, true, false) as showDownloadBtn,
-               svg.applicantName                               as applyName,
+        svg.applicantName as applyName,
-               svg.applicantDate                               as applyDate,
+        svg.applicantDate as applyDate,
-               svg.applicantFunds                              as applyPrice,
+        svg.applicantFunds as applyPrice,
-               svg.taskId,
+        svg.taskId,
-               svg.procInstId
+        svg.procInstId
         FROM scm_vehicle_gression svg
         <where>
             ${ew.sqlSegment}
             <if test="names != '' and names != null">
                 and concat(svg.applicantNo
-                  , svg.vinNo) LIKE concat('%'
+                , svg.vinNo) LIKE concat('%'
-                  , #{names}
+                , #{names}
-                  , '%')
+                , '%')
             </if>
         </where>
         ORDER BY id DESC
@@ -99,11 +101,11 @@
     </select>
 
     <select id="selectNum" resultType="java.lang.String">
-        select RIGHT(applicantNo, 4)
+        select RIGHT (applicantNo, 4)
         from scm_vehicle_gression
         where applicantNo LIKE concat(#{bill}, '%')
         order by id desc
-        limit 1
+            limit 1
     </select>
 
     <select id="getlastTimeEqual" resultType="com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionVo">
@@ -112,15 +114,14 @@
         where vinNo = #{vinNo}
           and targetLocationSid = #{targetLocationSid}
           and LENGTH(nodeState) > 0
-        order by id desc
+        order by id desc limit 1
-        limit 1
     </select>
 
 
     <update id="updateFlowFiled">
         UPDATE scm_vehicle_gression
         SET nodeState=#{nodeState}
-          , nodeId=#{taskDefKey}
+        , nodeId=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>