diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 5ad46e0b..fdec5a10 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -1494,6 +1494,7 @@ public class DepositoryRecordController { } else { recordPById.setBalancePosterTime(""); recordPById.setBalancePoster(""); + recordPById.setBalancePosterPass("4"); //代表不存在该节点 } // 仓储中心负责人 String manager = recordPById.getDepositoryManager(); @@ -1512,7 +1513,7 @@ public class DepositoryRecordController { UserByPort user = PublicConfig.FindUserById(managerid, userKey, token); depositoryManagerNames.append(user.getName()); } - recordPById.setDepositoryName(depositoryManagerNames.toString()); + recordPById.setDepositoryManagerName(depositoryManagerNames.toString()); } recordPById.setBalancePosterName(balancePosterName.toString()); } 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 0f7a8406..b0ec848d 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 @@ -2538,7 +2538,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 将当前redis中存储的spno删除 redisPool.getRedisTemplateByDb(14).delete("wms_QyWxMessage_" + spNo); } - } else { + } + else { // 如果是前两个审批节点 //定义处理时间 diff --git a/src/main/resources/templates/pages/application/form-step-look_back.html b/src/main/resources/templates/pages/application/form-step-look_back.html index e2667634..e90c1b56 100644 --- a/src/main/resources/templates/pages/application/form-step-look_back.html +++ b/src/main/resources/templates/pages/application/form-step-look_back.html @@ -180,7 +180,7 @@
审批时间:" + departmentheadTime + "
"); - firstApprovalNodeState.append("审批意见:" + balancePosterMessage + "
"); - } - - if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") { - // 如果部门负责人已经审批过 - let newTimeLineNodeApprovalName = '审批时间:' + balancePosterNameTime + '
'; - let newTimeLineNodeApprovalMessage = '审批意见:' + balancePosterNameTime + '
'; + firstApprovalNodeState.after("审批意见:" + departmentheadMessage + "
"); + + // 声明用于depositoryManager节点是第几个节点(默认第二个审批节点) + let flagForBalancerNode = 2; + // 配置平衡岗节点(第二个节点) + if (balancePoster !== "" && departmentheadPass === "1") { + // 如果需要平衡岗且第一个节点审批完成 + if (balancePosterPass === "3") { + // 如果平衡岗未审批 + let approvalNodeForBalancerName = '审批时间:' + balancePosterNameTime + '
'; + let approvalNodeForBalancerMessage = '审批意见:' + balancePosterMessage + '
'; + let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode"); + let timeLineStartItemForStartIcon; + let timeLineStartItemForState; + if (balancePosterPass === "1") { + // 如果平衡岗审批通过 + timeLineStartItemForStartIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-ok"); + flagForBalancerNode = 3; // 为第三个节点 + timeLineStartItemForState = '审批状态:审批通过
'; + } else if (balancePosterPass === "2") { + // 如果平衡岗未审批通过 + timeLineStartItemForStartIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-close"); + flagForBalancerNode = -1; // 不展示 + timeLineStartItemForState = '审批状态:审批未通过
'; + } + let approvalNodeForBalancer = timeLineStartItemForStartIcon + approvalNodeForBalancerName + approvalNodeForBalancerTime + timeLineStartItemForState + approvalNodeForBalancerMessage + timeLineEndItem; + firstApprovalNode.after(approvalNodeForBalancer); + } - let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + newTimeLineNodeApprovalTime + newTimeLineNodeApprovalMessage + timeLineEndItem; - firstApprovalNode.append(newTimeLineNode); - } + } - if (depositoryManagerNameTime != null && depositoryManagerNameTime !== "0" && depositoryManagerNameTime !== "" && depositoryManagerPass !== "4") { - let newTimeLineNodeApprovalName = '审批时间:' + depositoryManagerNameTime + '
'; - let newTimeLineNodeApprovalMessage = '审批意见:' + depositoryManagerMessage + '
'; + // 配置仓储管理员节点(第三或第二个节点) + if (depositoryManagerPass !== "4" && departmentheadPass === "1" && flagForBalancerNode !== -1) { + + let timeLineStartItemForId; + if (flagForBalancerNode === 2) { + // 如果是第二个节点 + timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode"); + } else { + // 如果是第三个节点 + timeLineStartItemForId = timeLineStartItem.replace("placeholder", "thirdApprovalNode"); + } + // 如果可以查看该节点 + if (depositoryManagerPass === "3") { + // 如果平衡岗未审批 + let approvalNodeForBalancerName = '审批时间:' + depositoryManagerNameTime + '
'; + let approvalNodeForDepositoryManagerMessage = '审批意见:' + depositoryManagerMessage + '
'; + let timeLineStartItemForIcon; + let timeLineStartItemForState; + if (depositoryManagerPass === "1") { + // 如果审批通过 + timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-ok"); + timeLineStartItemForState = '审批状态:审批通过
'; + + } else if (depositoryManagerPass === "2") { + timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-close"); + timeLineStartItemForState = '审批状态:审批未通过
'; + } + let approvalNodeForBalancer = timeLineStartItemForIcon + approvalNodeForDepositoryManagerName + approvalNodeForDepositoryManagerTime + timeLineStartItemForState + approvalNodeForDepositoryManagerMessage + timeLineEndItem; + if (flagForBalancerNode === 2) { + // 如果是第二个节点 + firstApprovalNode.after(approvalNodeForBalancer); + } else { + // 如果是第三个节点 + $("#secondApprovalNode").after(approvalNodeForBalancer); + } + } + } - let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + newTimeLineNodeApprovalTime + newTimeLineNodeApprovalMessage + timeLineEndItem; - firstApprovalNode.append(newTimeLineNode); + // 配置出库人员节点 + if (departmentheadPass === "1" && (depositoryManagerPass === "4" || depositoryManagerPass === "1")) { + let completeOutUserName = record.completeOutUserName; + let completeOutTime = record.outTime; + let pass = record.pass; + let approvalNodeForCompleteOutUserName = '处理状态:出库完成
'; + let approvalNodeForCompleteOutTime = '出库时间:' + completeOutTime + '
'; + approvalCompleteOutNode = timeLineStartItem.replace("layui-icon-friends", "layui-icon-ok") + approvalNodeForCompleteOutUserName + approvalNodeForCompleteOutState + approvalNodeForCompleteOutTime + timeLineEndItem; + } else { + approvalCompleteOutNode = timeLineStartItem + approvalNodeForCompleteOutUserName + timeLineEndItem; + } + if (flagForBalancerNode === 2) { + if (depositoryManagerPass !== "4") { + + $("#secondApprovalNode").after(approvalCompleteOutNode); + } else { + firstApprovalNode.after(approvalCompleteOutNode); + } + } else if (flagForBalancerNode === 3) { + $("#thirdApprovalNode").after(approvalCompleteOutNode); + } + } } - - } }); - /* // 获取部门负责人节点审批时间 - let departmentheadTime = $("#departmentheadTime").text(); - // 获取仓储中心负责人节点审批时间 - let depositoryManagerNameTime = $("#depositoryManagerNameTime").text(); - // 获取仓储中心负责人节点审批结果 - let depositoryManagerPass = $("#depositoryManagerPass").val(); - // 获取平衡岗人员节点 - let balancePoster = $("#balancePosterName").text(); - // 获取平衡岗人员节点审批时间 - let balancePosterNameTime = $("#balancePosterNameTime").text(); - - if (departmentheadTime != null && departmentheadTime !== "" && departmentheadTime !== "0") { - // 如果部门负责人审批时间不为空 - $("#departmentheadTimeT").show(); - $("#departmentheadMessageT").show(); - - } - - if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") { - // 如果部门负责人已经审批过 - $("#depositoryManagerNameT").show(); - } else if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster !== "") { - $("#balancePosterNameT").show(); - } - - if (balancePosterNameTime != null && balancePosterNameTime !== "0" && balancePosterNameTime !== "") { - $("#depositoryManagerNameT").show(); - $("#balancePosterNameT").show(); - $("#balancePosterNameTimeT").show(); - $("#balancePosterMessageT").show(); - } - - if (depositoryManagerNameTime != null && depositoryManagerNameTime !== "0" && depositoryManagerNameTime !== "" && depositoryManagerPass !== "4") { - $("#depositoryManagerNameT").show(); - $("#depositoryManagerNameTimeT").show(); - $("#depositoryManagerNameMessageT").show(); - } -*/ - selectThisMinRecord = function (obj) { // console.log(obj) var minId = obj.value; @@ -380,9 +420,6 @@ window.open("/depositoryRecord/downloadOutRecord?id=" + id, "_self"); }; - $('body').on('click', '[data-refresh]', function () { - location.reload(); - }) }) diff --git a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java index 56e23829..ee46fc45 100644 --- a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java @@ -238,7 +238,7 @@ public class SomeTest { ApprovalInfo_Details finalApprovalInfo_details = approvalInfo_details; boolean finalFlagForFirst = flagForFirst; int finalFlagForDepository = flagForDepository; -// depositoryRecordService.reviewByQyWxApprovalOut(mainId, finalApprovalInfo_details, "2d3bcfcec0eb62f24aad5cce4f806ba3", spStatus, approvalInfo.getSpNo(), finalFlagForFirst, finalFlagForDepository); + depositoryRecordService.reviewByQyWxApprovalOut(mainId, finalApprovalInfo_details, "0a7ffa452096d330934052105a67794a", spStatus, approvalInfo.getSpNo(), finalFlagForFirst, finalFlagForDepository); } // 开启一个线程用于进行下步操作 @@ -252,7 +252,7 @@ public class SomeTest { ApprovalInfo approvalInfo = new ApprovalInfo(); approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF"); - approvalInfo.setSpNo("202306250006"); + approvalInfo.setSpNo("202307040036"); // 模拟第一个节点(部门负责人) @@ -275,7 +275,7 @@ public class SomeTest { List审批时间:" + departmentheadTime + "
"); - firstApprovalNodeState.append("审批意见:" + balancePosterMessage + "
"); - } - - if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") { - // 如果部门负责人已经审批过 - let newTimeLineNodeApprovalName = '审批时间:' + balancePosterNameTime + '
'; - let newTimeLineNodeApprovalMessage = '审批意见:' + balancePosterNameTime + '
'; + firstApprovalNodeState.after("审批意见:" + departmentheadMessage + "
"); + + // 声明用于depositoryManager节点是第几个节点(默认第二个审批节点) + let flagForBalancerNode = 2; + // 配置平衡岗节点(第二个节点) + if (balancePoster !== "" && departmentheadPass === "1") { + // 如果需要平衡岗且第一个节点审批完成 + if (balancePosterPass === "3") { + // 如果平衡岗未审批 + let approvalNodeForBalancerName = '审批时间:' + balancePosterNameTime + '
'; + let approvalNodeForBalancerMessage = '审批意见:' + balancePosterMessage + '
'; + let timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode"); + let timeLineStartItemForStartIcon; + let timeLineStartItemForState; + if (balancePosterPass === "1") { + // 如果平衡岗审批通过 + timeLineStartItemForStartIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-ok"); + flagForBalancerNode = 3; // 为第三个节点 + timeLineStartItemForState = '审批状态:审批通过
'; + } else if (balancePosterPass === "2") { + // 如果平衡岗未审批通过 + timeLineStartItemForStartIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-close"); + flagForBalancerNode = -1; // 不展示 + timeLineStartItemForState = '审批状态:审批未通过
'; + } + let approvalNodeForBalancer = timeLineStartItemForStartIcon + approvalNodeForBalancerName + approvalNodeForBalancerTime + timeLineStartItemForState + approvalNodeForBalancerMessage + timeLineEndItem; + firstApprovalNode.after(approvalNodeForBalancer); + } - let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + newTimeLineNodeApprovalTime + newTimeLineNodeApprovalMessage + timeLineEndItem; - firstApprovalNode.append(newTimeLineNode); - } + } - if (depositoryManagerNameTime != null && depositoryManagerNameTime !== "0" && depositoryManagerNameTime !== "" && depositoryManagerPass !== "4") { - let newTimeLineNodeApprovalName = '审批时间:' + depositoryManagerNameTime + '
'; - let newTimeLineNodeApprovalMessage = '审批意见:' + depositoryManagerMessage + '
'; + // 配置仓储管理员节点(第三或第二个节点) + if (depositoryManagerPass !== "4" && departmentheadPass === "1" && flagForBalancerNode !== -1) { + + let timeLineStartItemForId; + if (flagForBalancerNode === 2) { + // 如果是第二个节点 + timeLineStartItemForId = timeLineStartItem.replace("placeholder", "secondApprovalNode"); + } else { + // 如果是第三个节点 + timeLineStartItemForId = timeLineStartItem.replace("placeholder", "thirdApprovalNode"); + } + // 如果可以查看该节点 + if (depositoryManagerPass === "3") { + // 如果平衡岗未审批 + let approvalNodeForBalancerName = '审批时间:' + depositoryManagerNameTime + '
'; + let approvalNodeForDepositoryManagerMessage = '审批意见:' + depositoryManagerMessage + '
'; + let timeLineStartItemForIcon; + let timeLineStartItemForState; + if (depositoryManagerPass === "1") { + // 如果审批通过 + timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-ok"); + timeLineStartItemForState = '审批状态:审批通过
'; + + } else if (depositoryManagerPass === "2") { + timeLineStartItemForIcon = timeLineStartItemForId.replace("layui-icon-friends", "layui-icon-close"); + timeLineStartItemForState = '审批状态:审批未通过
'; + } + let approvalNodeForBalancer = timeLineStartItemForIcon + approvalNodeForDepositoryManagerName + approvalNodeForDepositoryManagerTime + timeLineStartItemForState + approvalNodeForDepositoryManagerMessage + timeLineEndItem; + if (flagForBalancerNode === 2) { + // 如果是第二个节点 + firstApprovalNode.after(approvalNodeForBalancer); + } else { + // 如果是第三个节点 + $("#secondApprovalNode").after(approvalNodeForBalancer); + } + } + } - let newTimeLineNode = timeLineStartItem + newTimeLineNodeApprovalName + newTimeLineNodeApprovalTime + newTimeLineNodeApprovalMessage + timeLineEndItem; - firstApprovalNode.append(newTimeLineNode); + // 配置出库人员节点 + if (departmentheadPass === "1" && (depositoryManagerPass === "4" || depositoryManagerPass === "1")) { + let completeOutUserName = record.completeOutUserName; + let completeOutTime = record.outTime; + let pass = record.pass; + let approvalNodeForCompleteOutUserName = '处理状态:出库完成
'; + let approvalNodeForCompleteOutTime = '出库时间:' + completeOutTime + '
'; + approvalCompleteOutNode = timeLineStartItem.replace("layui-icon-friends", "layui-icon-ok") + approvalNodeForCompleteOutUserName + approvalNodeForCompleteOutState + approvalNodeForCompleteOutTime + timeLineEndItem; + } else { + approvalCompleteOutNode = timeLineStartItem + approvalNodeForCompleteOutUserName + timeLineEndItem; + } + if (flagForBalancerNode === 2) { + if (depositoryManagerPass !== "4") { + + $("#secondApprovalNode").after(approvalCompleteOutNode); + } else { + firstApprovalNode.after(approvalCompleteOutNode); + } + } else if (flagForBalancerNode === 3) { + $("#thirdApprovalNode").after(approvalCompleteOutNode); + } + } } - - } }); - /* // 获取部门负责人节点审批时间 - let departmentheadTime = $("#departmentheadTime").text(); - // 获取仓储中心负责人节点审批时间 - let depositoryManagerNameTime = $("#depositoryManagerNameTime").text(); - // 获取仓储中心负责人节点审批结果 - let depositoryManagerPass = $("#depositoryManagerPass").val(); - // 获取平衡岗人员节点 - let balancePoster = $("#balancePosterName").text(); - // 获取平衡岗人员节点审批时间 - let balancePosterNameTime = $("#balancePosterNameTime").text(); - - if (departmentheadTime != null && departmentheadTime !== "" && departmentheadTime !== "0") { - // 如果部门负责人审批时间不为空 - $("#departmentheadTimeT").show(); - $("#departmentheadMessageT").show(); - - } - - if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster === "" && depositoryManagerPass !== "4") { - // 如果部门负责人已经审批过 - $("#depositoryManagerNameT").show(); - } else if (departmentheadTime !== "" && departmentheadTime !== "0" && balancePoster !== "") { - $("#balancePosterNameT").show(); - } - - if (balancePosterNameTime != null && balancePosterNameTime !== "0" && balancePosterNameTime !== "") { - $("#depositoryManagerNameT").show(); - $("#balancePosterNameT").show(); - $("#balancePosterNameTimeT").show(); - $("#balancePosterMessageT").show(); - } - - if (depositoryManagerNameTime != null && depositoryManagerNameTime !== "0" && depositoryManagerNameTime !== "" && depositoryManagerPass !== "4") { - $("#depositoryManagerNameT").show(); - $("#depositoryManagerNameTimeT").show(); - $("#depositoryManagerNameMessageT").show(); - } -*/ - selectThisMinRecord = function (obj) { // console.log(obj) var minId = obj.value; @@ -380,9 +420,6 @@ window.open("/depositoryRecord/downloadOutRecord?id=" + id, "_self"); }; - $('body').on('click', '[data-refresh]', function () { - location.reload(); - }) })