zww-库位 及审核修改

src/main/java/com/gaotao/modules/purchaseorder/entity/PRDetail.java

@@ -192,4 +192,6 @@ public class PRDetail {
     private String strUserId;
 
     private String strCanAuthFlag;
+
+    private String strApproveResult;
 }

src/main/java/com/gaotao/modules/purchaseorder/service/impl/AuthorizationHistServiceImpl.java

@@ -70,7 +70,12 @@ public class AuthorizationHistServiceImpl implements AuthorizationHistService {
             updateHistDate.setSite(authorizationHist.getSite());
             updateHistDate.setStepId(Integer.parseInt(authorizationHist.getApproveResultComments()));
             updateHistDate.setCanAuthFlag("Y");
+            updateHistDate.setCanAuthFlag(authorizationHist.getApprovedFlag());
             authorizationHistMapper.updateAuthorizationHist(updateHistDate);
+            if(authorizationHist.getApprovedFlag().equals("N")){
+                prHeaderQuery.setAuthorizeFlag("Y");
+                prHeaderQuery.setApprovedFlag(authorizationHist.getApprovedFlag());
+            }
         }else if(authorizationHist.getLastStepFlag() != null && authorizationHist.getLastStepFlag().equals("Y")){
             //            设置审核是否结束
             prHeaderQuery.setAuthorizeFlag("Y");

src/main/resources/mapper/purchaseorder/PRDetailMapper.xml

@@ -54,6 +54,7 @@
             ,A.Qty * A.Price as totalPrice ,B.ApprovedFlag
             ,B.OrderType ,(case B.AuthorizeFlag when 'Y' then '已审批' else '未审批' end) as authorizeFlag
             ,isnull(C.can_auth_flag ,'N') as strCanAuthFlag
+            ,(case B.ApproveResult when 'Y' then '已通过' else '未通过' end) as strApproveResult
         from PRDetail A
         left join PRHeader B on A.RequisitionNo = B.RequisitionNo and A.Site = B.Site
         left join authorization_hist C on A.RequisitionNo = C.order_ref1 and A.site = C.site and C.auth_user_id = #{param2.strUserId,jdbcType=VARCHAR}

src/main/resources/templates/pda/toolBorrowingReturn.ftl

@@ -154,7 +154,7 @@
 	<div class="modal fade" id="location_modal" aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog"  style="width:260px; margin: 40% auto;">
 			<div class="modal-content" >
-				<div id="legend" class="" style="background-color: #26a2ff;color: #fff;">
+				<div id="legend" class="" style="background-color: #17b3a3;color: #fff;">
 					<legend class="" style="font-size: 18px;">请扫描库位条码</legend>
 				</div>
 				<div class="modal-body" style="padding: 1px 1px;">

src/main/resources/templates/pda/toolMoveLibrary.ftl

@@ -154,7 +154,7 @@
 	<div class="modal fade" id="location_modal" aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog"  style="width:260px; margin: 40% auto;">
 			<div class="modal-content" >
-				<div id="legend" class="" style="background-color: #26a2ff;color: #fff;">
+				<div id="legend" class="" style="background-color: #17b3a3;color: #fff;">
 					<legend class="" style="font-size: 18px;">请扫描库位条码</legend>
 				</div>
 				<div class="modal-body" style="padding: 1px 1px;">

src/main/resources/templates/pda/toolRepairReturn.ftl

@@ -154,7 +154,7 @@
 	<div class="modal fade" id="location_modal" aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog"  style="width:260px; margin: 40% auto;">
 			<div class="modal-content" >
-				<div id="legend" class="" style="background-color: #26a2ff;color: #fff;">
+				<div id="legend" class="" style="background-color: #17b3a3;color: #fff;">
 					<legend class="" style="font-size: 18px;">请扫描库位条码</legend>
 				</div>
 				<div class="modal-body" style="padding: 1px 1px;">

src/main/resources/templates/pda/toolWarehousing.ftl

@@ -154,7 +154,7 @@
 	<div class="modal fade" id="location_modal" aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog"  style="width:260px; margin: 40% auto;">
 			<div class="modal-content" >
-				<div id="legend" class="" style="background-color: #26a2ff;color: #fff;">
+				<div id="legend" class="" style="background-color: #17b3a3;color: #fff;">
 					<legend class="" style="font-size: 18px;">请扫描库位条码</legend>
 				</div>
 				<div class="modal-body" style="padding: 1px 1px;">