From 93163bfa8b2253600932bf3e559fa10135c5f63c Mon Sep 17 00:00:00 2001 From: erdanergou Date: Thu, 1 Jun 2023 14:04:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E8=88=AC=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=84=E5=90=88=E5=87=BA=E5=BA=93=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationOutForGroup.html | 91 +++++++++++++++++-- .../depository_manage/SomeTest.java | 19 ++-- 2 files changed, 96 insertions(+), 14 deletions(-) diff --git a/src/main/resources/templates/pages/applicationForStorageCenter/applicationOutForGroup.html b/src/main/resources/templates/pages/applicationForStorageCenter/applicationOutForGroup.html index 5bedb14a..0136d18a 100644 --- a/src/main/resources/templates/pages/applicationForStorageCenter/applicationOutForGroup.html +++ b/src/main/resources/templates/pages/applicationForStorageCenter/applicationOutForGroup.html @@ -43,16 +43,13 @@ .lay-step { display: none; } - - .layui-form-select .layui-input { - border-style: none; - }
+
+
+ +
+ +
+
@@ -613,6 +656,17 @@ // 赋值给gname gnameItem.value = data[0].gname; gidItem.value = data[0].gid; + let satisfyDepositoryList = data[0].satisfyDepositoryList; + if (depositoryDisplay !== "none") { + var idNumber = gidItem.name.split("gid")[1]; + $("#showDepositoryForGroup" + idNumber).empty(); + if (satisfyDepositoryList !== null) { + for (let i = 0; i < satisfyDepositoryList.length; i++) { + $("#showDepositoryForGroup" + idNumber).append(new Option(satisfyDepositoryList[i].dname, satisfyDepositoryList[i].id)); + } + } + form.render(); + } for (let i = 0; i < data.length; i++) { CoverpageForGroupInfo(pid, data[i]); } @@ -705,6 +759,17 @@ } // 赋值给gname gcodeItem.value = data[0].gcode; + let satisfyDepositoryList = data[0].satisfyDepositoryList; + if (depositoryDisplay !== "none") { + var idNumber = gidItem.name.split("gid")[1]; + $("#showDepositoryForGroup" + idNumber).empty(); + if (satisfyDepositoryList !== null) { + for (let i = 0; i < satisfyDepositoryList.length; i++) { + $("#showDepositoryForGroup" + idNumber).append(new Option(satisfyDepositoryList[i].dname, satisfyDepositoryList[i].id)); + } + } + form.render(); + } for (let i = 0; i < data.length; i++) { CoverpageForGroupInfo(pid, data[i]); } @@ -797,6 +862,17 @@ // 赋值给gname gidItem.value = data[0].gid; gcodeItem.value = data[0].gcode; + let satisfyDepositoryList = data[0].satisfyDepositoryList; + if (depositoryDisplay !== "none") { + var idNumber = gidItem.name.split("gid")[1]; + $("#showDepositoryForGroup" + idNumber).empty(); + if (satisfyDepositoryList !== null) { + for (let i = 0; i < satisfyDepositoryList.length; i++) { + $("#showDepositoryForGroup" + idNumber).append(new Option(satisfyDepositoryList[i].dname, satisfyDepositoryList[i].id)); + } + } + form.render(); + } for (let i = 0; i < data.length; i++) { CoverpageForGroupInfo(pid, data[i]); } @@ -833,6 +909,9 @@ var req = {}; req.gid = gid; req.quantity = val; + if (depositoryDisplay !== "none") { + req.depositoryId = $("#showDepositoryForGroup" + id).val(); + } let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/group/groupQuantityIsTrue", @@ -846,10 +925,10 @@ if (!flag) { // 如果当前数目不合适 layer.msg("当前组合中" + res.statusInfo.message + "的库存数量不足", { icon: 0, - time: 500 + time: 1000 }, function () { - $("#quantityForGroup" + id).val(""); layer.close(loading2); + $("#quantityForGroup" + id).val(""); }); } else { diff --git a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java index cce81c63..4eac4f37 100644 --- a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java @@ -192,12 +192,15 @@ 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); + } // 开启一个线程用于进行下步操作 } - System.out.println("flagForDepository: " + flagForDepository); - System.out.println("flagForFirst: " + flagForFirst); } @@ -206,7 +209,7 @@ public class SomeTest { ApprovalInfo approvalInfo = new ApprovalInfo(); approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF"); - approvalInfo.setSpNo("202305310019"); + approvalInfo.setSpNo("202306010011"); List spRecord_list = new ArrayList<>(); @@ -228,7 +231,7 @@ public class SomeTest { List approvalInfo_Details2 = new ArrayList<>(); ApprovalInfo_Details ad2 = new ApprovalInfo_Details(); ad2.setSpStatus("2"); - ad2.setSpTime("1685517793000"); + ad2.setSpTime("1685517891000"); ApprovalInfo_Details_Approver approver2 = new ApprovalInfo_Details_Approver(); approver2.setUserId("XinPing"); ad2.setApprover(approver2); @@ -237,11 +240,11 @@ public class SomeTest { ApprovalInfo_SpRecord asr3 = new ApprovalInfo_SpRecord(); - asr3.setSpStatus("2"); + asr3.setSpStatus("1"); List approvalInfo_Details3 = new ArrayList<>(); ApprovalInfo_Details ad3 = new ApprovalInfo_Details(); - ad3.setSpStatus("2"); - ad3.setSpTime("1685517794000"); + ad3.setSpStatus("1"); + ad3.setSpTime("0"); ApprovalInfo_Details_Approver approver3 = new ApprovalInfo_Details_Approver(); approver3.setUserId("PangFuZhen"); ad3.setApprover(approver3); @@ -251,7 +254,7 @@ public class SomeTest { spRecord_list.add(asr1); spRecord_list.add(asr2); -// spRecord_list.add(asr3); + spRecord_list.add(asr3); approvalInfo.setSpRecord(spRecord_list); approvalInfo.setStatuChangeEvent("2");