pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改一般用户组合出库功能

lwx_dev
erdanergou 3 years ago
parent
0a252b6c0b
commit
93163bfa8b
2 changed files with 96 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 91
      src/main/resources/templates/pages/applicationForStorageCenter/applicationOutForGroup.html
  2. 19
      src/test/java/com/dreamchaser/depository_manage/SomeTest.java

91
src/main/resources/templates/pages/applicationForStorageCenter/applicationOutForGroup.html
View File

@ -43,16 +43,13 @@
.lay-step { .lay-step {
display: none; display: none;
} }
.layui-form-select .layui-input {
border-style: none;
}
</style> </style>
<div class="layuimini-container"> <div class="layuimini-container">
<div class="layuimini-main"> <div class="layuimini-main">
<div class="layui-fluid"> <div class="layui-fluid">
<input id="gidList" type="text" style="display:none;" th:value="${gidList}"> <input id="gidList" type="text" style="display:none;" th:value="${gidList}">
<input id="display" type="text" style="display:none;" th:value="${display}">
<div class="layui-carousel" id="stepForm2" lay-filter="stepForm2" style="margin: 0 auto;"> <div class="layui-carousel" id="stepForm2" lay-filter="stepForm2" style="margin: 0 auto;">
<div carousel-item style="overflow: inherit"> <div carousel-item style="overflow: inherit">
<div> <div>
@ -195,6 +192,7 @@
element = layui.element, element = layui.element,
step = layui.step; step = layui.step;
let depositoryDisplay = $("#display").val();
// 用于分步表单加载 // 用于分步表单加载
step.render({ step.render({
elem: '#stepForm2', elem: '#stepForm2',
@ -230,6 +228,20 @@
}); });
}; };
// 监听下拉选择框
form.on('select()', function (data) {
let id = data.elem.id;
let idNum = id.split('showDepositoryForGroup')[1];
let elem = {};
elem.id = "quantityForGroup" + idNum;
groupQuantityIsTrue(elem)
});
$("#openCompanyAdminorgForGroup").on('click', selectPost); $("#openCompanyAdminorgForGroup").on('click', selectPost);
@ -352,8 +364,21 @@
var data = d.data; var data = d.data;
CoverPageForGroup(i, data[0]); CoverPageForGroup(i, data[0]);
form.render(); form.render();
let satisfyDepositoryList = data[0].satisfyDepositoryList;
for (let j = 0; j < data.length; j++) { for (let j = 0; j < data.length; j++) {
CoverpageForGroupInfo(i, data[j]); CoverpageForGroupInfo(i, data[j]);
form.render();
let num = j;
if (num === 0) {
num = '';
}
$("#showDepositoryForGroup" + num).empty();
if (satisfyDepositoryList !== null) {
for (let k = 0; k < satisfyDepositoryList.length; k++) {
$("#showDepositoryForGroup" + num).append(new Option(satisfyDepositoryList[k].dname, satisfyDepositoryList[k].id));
}
}
form.render();
} }
element.init(); element.init();
form.render(); form.render();
@ -478,6 +503,15 @@
required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/> required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/>
</div> </div>
</div> </div>
<div class="layui-form-item" id=` + "depositoryIdForGroup" + num + `
style="display:` + depositoryDisplay + `">
<label class="layui-form-label">仓库:</label>
<div class="layui-input-block">
<select name=` + "depositoryId" + num + ` id=` + "showDepositoryForGroup" + num + `>
</select>
</div>
</div>
<i class="layui-icon layui-icon-addition" style="display: inline" id=` + "addItemForGroup" + num + ` <i class="layui-icon layui-icon-addition" style="display: inline" id=` + "addItemForGroup" + num + `
onclick="addItemForGroup(this)"></i> onclick="addItemForGroup(this)"></i>
@ -545,6 +579,15 @@
required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/> required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/>
</div> </div>
</div> </div>
<div class="layui-form-item" id=` + "depositoryIdForGroup" + NewIdNumber + `
style="display:` + depositoryDisplay + `">
<label class="layui-form-label">仓库:</label>
<div class="layui-input-block">
<select name=` + "depositoryId" + NewIdNumber + ` id=` + "showDepositoryForGroup" + NewIdNumber + `>
</select>
</div>
</div>
<i class="layui-icon layui-icon-addition" style="display: inline" id=` + "addItemForGroup" + NewIdNumber + ` <i class="layui-icon layui-icon-addition" style="display: inline" id=` + "addItemForGroup" + NewIdNumber + `
onclick="addItemForGroup(this)"></i> onclick="addItemForGroup(this)"></i>
@ -613,6 +656,17 @@
// 赋值给gname // 赋值给gname
gnameItem.value = data[0].gname; gnameItem.value = data[0].gname;
gidItem.value = data[0].gid; 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++) { for (let i = 0; i < data.length; i++) {
CoverpageForGroupInfo(pid, data[i]); CoverpageForGroupInfo(pid, data[i]);
} }
@ -705,6 +759,17 @@
} }
// 赋值给gname // 赋值给gname
gcodeItem.value = data[0].gcode; 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++) { for (let i = 0; i < data.length; i++) {
CoverpageForGroupInfo(pid, data[i]); CoverpageForGroupInfo(pid, data[i]);
} }
@ -797,6 +862,17 @@
// 赋值给gname // 赋值给gname
gidItem.value = data[0].gid; gidItem.value = data[0].gid;
gcodeItem.value = data[0].gcode; 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++) { for (let i = 0; i < data.length; i++) {
CoverpageForGroupInfo(pid, data[i]); CoverpageForGroupInfo(pid, data[i]);
} }
@ -833,6 +909,9 @@
var req = {}; var req = {};
req.gid = gid; req.gid = gid;
req.quantity = val; 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}); let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/group/groupQuantityIsTrue", url: "/group/groupQuantityIsTrue",
@ -846,10 +925,10 @@
if (!flag) { // 如果当前数目不合适 if (!flag) { // 如果当前数目不合适
layer.msg("当前组合中" + res.statusInfo.message + "的库存数量不足", { layer.msg("当前组合中" + res.statusInfo.message + "的库存数量不足", {
icon: 0, icon: 0,
time: 500 time: 1000
}, function () { }, function () {
$("#quantityForGroup" + id).val("");
layer.close(loading2); layer.close(loading2);
$("#quantityForGroup" + id).val("");
}); });
} else { } else {

19
src/test/java/com/dreamchaser/depository_manage/SomeTest.java
View File

@ -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 approvalInfo = new ApprovalInfo();
approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF"); approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF");
approvalInfo.setSpNo("202305310019"); approvalInfo.setSpNo("202306010011");
List<ApprovalInfo_SpRecord> spRecord_list = new ArrayList<>(); List<ApprovalInfo_SpRecord> spRecord_list = new ArrayList<>();
@ -228,7 +231,7 @@ public class SomeTest {
List<ApprovalInfo_Details> approvalInfo_Details2 = new ArrayList<>(); List<ApprovalInfo_Details> approvalInfo_Details2 = new ArrayList<>();
ApprovalInfo_Details ad2 = new ApprovalInfo_Details(); ApprovalInfo_Details ad2 = new ApprovalInfo_Details();
ad2.setSpStatus("2"); ad2.setSpStatus("2");
ad2.setSpTime("1685517793000"); ad2.setSpTime("1685517891000");
ApprovalInfo_Details_Approver approver2 = new ApprovalInfo_Details_Approver(); ApprovalInfo_Details_Approver approver2 = new ApprovalInfo_Details_Approver();
approver2.setUserId("XinPing"); approver2.setUserId("XinPing");
ad2.setApprover(approver2); ad2.setApprover(approver2);
@ -237,11 +240,11 @@ public class SomeTest {
ApprovalInfo_SpRecord asr3 = new ApprovalInfo_SpRecord(); ApprovalInfo_SpRecord asr3 = new ApprovalInfo_SpRecord();
asr3.setSpStatus("2"); asr3.setSpStatus("1");
List<ApprovalInfo_Details> approvalInfo_Details3 = new ArrayList<>(); List<ApprovalInfo_Details> approvalInfo_Details3 = new ArrayList<>();
ApprovalInfo_Details ad3 = new ApprovalInfo_Details(); ApprovalInfo_Details ad3 = new ApprovalInfo_Details();
ad3.setSpStatus("2"); ad3.setSpStatus("1");
ad3.setSpTime("1685517794000"); ad3.setSpTime("0");
ApprovalInfo_Details_Approver approver3 = new ApprovalInfo_Details_Approver(); ApprovalInfo_Details_Approver approver3 = new ApprovalInfo_Details_Approver();
approver3.setUserId("PangFuZhen"); approver3.setUserId("PangFuZhen");
ad3.setApprover(approver3); ad3.setApprover(approver3);
@ -251,7 +254,7 @@ public class SomeTest {
spRecord_list.add(asr1); spRecord_list.add(asr1);
spRecord_list.add(asr2); spRecord_list.add(asr2);
// spRecord_list.add(asr3); spRecord_list.add(asr3);
approvalInfo.setSpRecord(spRecord_list); approvalInfo.setSpRecord(spRecord_list);
approvalInfo.setStatuChangeEvent("2"); approvalInfo.setStatuChangeEvent("2");

Write Preview
Loading…
Cancel
Save