diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 3f6bd0fe..9669cc23 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1454,6 +1454,18 @@ public class PageController { placeCode = placeById.getCode(); } Integer flagForGroup = applicationInRecordPById.getFlagForGroup(); + if(Integer.compare(applicationInRecordPById.getAirapproverPass(),4) != 0){ + String[] airapproverId = applicationInRecordPById.getAirapproverId().split(","); + StringBuilder airapproverName = new StringBuilder(); + for (String approverId:airapproverId + ) { + if(!"".equals(approverId)){ + UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(approverId), userToken); + airapproverName.append(userByPort.getName()).append(","); + } + } + applicationInRecordPById.setAirapproverName(airapproverName.toString()); + } mv.addObject("record", applicationInRecordPById); mv.addObject("placeCode", placeCode); if (Integer.compare(flagForGroup, 2) != 0) { diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index 3780fd6c..86f0a930 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -65,8 +65,13 @@ - + + + + + + @@ -141,7 +146,7 @@ - airid,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId + airid,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId,airapproverPass,airapproverTime,airapproverId,airstate,airapproverMessage @@ -878,7 +883,7 @@ - insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup,placeId) + insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup,placeId,approverPass,approverTime,approverId,state,approverMessage) values( #{id}, #{mid}, @@ -891,7 +896,12 @@ #{applyRemark}, #{unit}, #{flagForGroup}, - #{placeId} + #{placeId}, + #{approverPass}, + #{approverTime}, + #{approverId}, + #{state}, + #{approverMessage} ) diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java index 94e87078..0c1f1daf 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java @@ -106,4 +106,30 @@ public class ApplicationInRecordP { */ private Integer placeId; + /** + * 1通过2驳回3待审批4无需审批 + */ + private Integer airapproverPass; + /** + * 审批时间 + */ + private String airapproverTime; + /** + * 审批人id + */ + private String airapproverId; + /** + * 审批人姓名 + */ + private String airapproverName; + /** + * 状态 + */ + private String airstate; + + /** + * 审批意见 + */ + private String airapproverMessage; + } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index a178c7cc..31fefe2f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -106,6 +106,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { @Override @Transactional(rollbackFor = Exception.class) public Integer applicationIn(Map map) { + // 获取当前入库是否需要审批 Boolean flagForApproval = ObjectFormatUtil.toBoolean(map.get("flagForApproval")); Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); Depository depositoryRecordById = depositoryMapper.findDepositoryById(depositoryId); @@ -149,7 +150,20 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取当前入库物料id Integer newMid = 0; if(!flagForApproval){ + // 如果不需要审批 newMid = updateOrInsertInventory(map,materialByCondition,quantity,mid,depositoryId,producedDate); + map.put("approverPass",4); + map.put("state","已入库"); + }else{ + // 如果需要审批 + List depositoryListForIn = roleService.findRoleAndDepositoryByDepositoryIdForIn(depositoryId); + map.put("approverPass",3); + StringBuilder approverId = new StringBuilder(); + for (RoleAndDepository roleAndDepository : depositoryListForIn) { + approverId.append(roleAndDepository.getUserId()).append(","); + } + map.put("approverId",approverId.toString()); + map.put("state","待审核"); } // 将新入库的物料id记录下来 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java index b7cde32a..f2a2c86d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java @@ -95,7 +95,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { if (roleAndDepositoryByCondition.size() > 0) { flagForApproval = true; } - + map.put("flagForApproval",flagForApproval); // 用于存储最终计算结果 Integer result = 0; @@ -168,6 +168,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { map.remove("applicationInId"); }else if("in".equals(type)){ // 如果是入库且需要审批 + result = depositoryRecordService.applicationIn(map); map.put("applicationInId",map.get("id")); map.remove("id"); diff --git a/src/main/resources/templates/pages/application/form-step-look.html b/src/main/resources/templates/pages/application/form-step-look.html index e0b575b5..24c20816 100644 --- a/src/main/resources/templates/pages/application/form-step-look.html +++ b/src/main/resources/templates/pages/application/form-step-look.html @@ -71,6 +71,24 @@ 申请备注 2016-11-28 + + 状态 + 2016-11-28 + 2016-11-28 + + + 审批人 + 2016-11-28 + + + 审批时间 + 2016-11-28 + + + 审批意见 + 2016-11-28 + + @@ -85,6 +103,20 @@ \ No newline at end of file diff --git a/src/main/resources/templates/pages/depository/table-in.html b/src/main/resources/templates/pages/depository/table-in.html index 21753e47..687526d7 100644 --- a/src/main/resources/templates/pages/depository/table-in.html +++ b/src/main/resources/templates/pages/depository/table-in.html @@ -167,6 +167,7 @@ {field: 'applicantName', width: 200, title: '提交人'}, {field: 'applicantTime', width: 200, title: '提交时间', sort: true}, {field: 'applyRemark', width: 200, title: '备注'}, + {field: 'airstate', width: 200, title: '状态'}, {title: '操作', minWidth: 150, toolbar: '#currentTableBar', align: "center"} ] ],