From 6b2d2faa7c8d74d161a48d647ca39c2c2c9071a9 Mon Sep 17 00:00:00 2001 From: zuowenwen Date: Fri, 22 Oct 2021 13:18:17 +0800 Subject: [PATCH] =?UTF-8?q?zww-=E5=BA=93=E4=BD=8D=20=E5=8F=8A=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gaotao/modules/purchaseorder/entity/PRDetail.java | 2 ++ .../service/impl/AuthorizationHistServiceImpl.java | 5 +++++ src/main/resources/mapper/purchaseorder/PRDetailMapper.xml | 1 + src/main/resources/templates/pda/toolBorrowingReturn.ftl | 2 +- src/main/resources/templates/pda/toolMoveLibrary.ftl | 2 +- src/main/resources/templates/pda/toolRepairReturn.ftl | 2 +- src/main/resources/templates/pda/toolWarehousing.ftl | 2 +- 7 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gaotao/modules/purchaseorder/entity/PRDetail.java b/src/main/java/com/gaotao/modules/purchaseorder/entity/PRDetail.java index cd18295..1cd9fca 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/entity/PRDetail.java +++ b/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; } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/purchaseorder/service/impl/AuthorizationHistServiceImpl.java b/src/main/java/com/gaotao/modules/purchaseorder/service/impl/AuthorizationHistServiceImpl.java index f39be2b..bd03f06 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/service/impl/AuthorizationHistServiceImpl.java +++ b/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"); diff --git a/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml b/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml index 69de48a..1463dbc 100644 --- a/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml +++ b/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} diff --git a/src/main/resources/templates/pda/toolBorrowingReturn.ftl b/src/main/resources/templates/pda/toolBorrowingReturn.ftl index f162ecf..31bd460 100644 --- a/src/main/resources/templates/pda/toolBorrowingReturn.ftl +++ b/src/main/resources/templates/pda/toolBorrowingReturn.ftl @@ -154,7 +154,7 @@