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
277ec25890
commit
5469e79d69
7 changed files with 133 additions and 126 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java
  2. 11
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
  3. 2
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  4. 15
      src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
  5. 114
      src/main/resources/templates/pages/group/group-add_back.html
  6. 2
      src/test/java/com/dreamchaser/depository_manage/TestOther.java
  7. 114
      target/classes/templates/pages/group/group-add_back.html

1
src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java
View File

@ -57,7 +57,6 @@ public class GroupController {
public RestResponse addGroup(@RequestBody Map<String, Object> map, HttpServletRequest request) {
// 获取物料数量
Integer len = ObjectFormatUtil.toInteger(map.get("len"));
// 获取添加成功的数量
Integer integer = groupService.addGroup(map);
return CrudUtil.postHandle(len, integer);

11
src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
View File

@ -301,8 +301,8 @@ public class MaterialController {
}
List<PlaceP> placePList = new ArrayList<>();
List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString());
for (int i = 0; i < depositoryByAdminorg.size(); i++) {
List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(ObjectFormatUtil.toInteger(mid), depositoryByAdminorg.get(i).getId());
for (Depository depository : depositoryByAdminorg) {
List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(ObjectFormatUtil.toInteger(mid), depository.getId());
placePList.addAll(placeByMidAndDid);
}
Map<String, Object> param = new HashMap<>();
@ -320,10 +320,11 @@ public class MaterialController {
map.put("materialById", materialP);
} else {
materialById.setPrice(0.0);
materialById.setMaterialAndBarCodeList(materialByBarCodeByCondition);
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialById.getId());
materialById.setSplitInfoList(splitInfoByMid);
map.put("materialById", materialById);
MaterialP m = new MaterialP(materialById);
m.setSplitInfoList(splitInfoByMid);
m.setMaterialAndBarCodeList(materialByBarCodeByCondition);
map.put("materialById", m);
}
map.put("placeList", placePList);

2
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
View File

@ -687,7 +687,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (!flagForApproval) {
// 如果不需要审批
Integer result = updateInventoryInfoForApproval(map, quantity, materialById, placeById);
map.remove("applicationInId");
map.remove("id");
return result;
} else {
map.put("applicationInId", map.get("id"));

15
src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
View File

@ -892,10 +892,12 @@ public class GroupServiceImpl implements GroupService {
depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("applicationInId")));
} else {
// 如果需要将其添加到列表中待后续使用
recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId")));
depositoryIds.add(ObjectFormatUtil.toInteger(map.get("depositoryId")));
recordIds.add(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("applicationInId")));
depositoryIds.add(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("depositoryId")));
insertForApplicationInRecord.remove("applicationInId");
}
} else {
}
else {
insertForApplicationInRecord.put("price", String.valueOf(0));
insertForApplicationInRecord.put("unit", unit);
insertForApplicationInRecord.put("type", "in");
@ -905,13 +907,14 @@ public class GroupServiceImpl implements GroupService {
depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("applicationInId")));
} else {
// 如果需要将其添加到列表中待后续使用
recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId")));
depositoryIds.add(ObjectFormatUtil.toInteger(map.get("depositoryId")));
recordIds.add(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("applicationInId")));
depositoryIds.add(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("depositoryId")));
insertForApplicationInRecord.remove("applicationInId");
}
insertForApplicationInRecord.remove("applicationInId");
}
}
insertForApplicationInRecord.remove("toGroupId");
insertForApplicationInRecord.put("flagForGroup", 2);
insertForApplicationInRecord.put("quantity", quantityForGroup.toString());
insertForApplicationInRecord.put("mid", gid);

114
src/main/resources/templates/pages/group/group-add_back.html
View File

@ -70,7 +70,7 @@
</div>
<div class="layui-card" id="cardParent" style="box-shadow:none">
<fieldset class="table-search-fieldset">
<fieldset style="color: rgb(107, 107, 107); border-style: solid; border-color: rgb(230, 230, 230);border-image: initial;" >
<legend>组合明细</legend>
<div class="layui-card-body" id="cardItem">
<hr>
@ -353,7 +353,7 @@
// 获取当前高度
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
params.push(NewIdNumber);
$("#stepForm").css("height", height + 384 + 'px');
$("#stepForm").css("height", height + 339 + 'px');
$("#" + parentId).after(materialItem);
};
@ -366,7 +366,7 @@
// 获取祖父节点
var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height", height - 384 + 'px');
$("#stepForm").css("height", height - 339 + 'px');
params = remove(params, parentId);
reparent.removeChild(parent);
};
@ -667,65 +667,67 @@
var req = {};
req.code = code;
req.type = "in";
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
dataType: 'json',
data: (req),
contentType: "application/json;charset=utf-8",
success: function (d) {
var d = d.data;
if (d == null) {
layer.msg("仓库中暂无该物料");
materialName.value = "";
materialId.value = "";
obj.value = "";
$('#place' + objId).empty();
if(code !== "") {
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
dataType: 'json',
data: (req),
contentType: "application/json;charset=utf-8",
success: function (d) {
var d = d.data;
if (d == null) {
layer.msg("仓库中暂无该物料");
materialName.value = "";
materialId.value = "";
obj.value = "";
$('#place' + objId).empty();
} else {
materialName.value = d.mname;
materialId.value = d.mid;
var idNumber = materialId.name.split("mid")[1];
// 获取物料与条形码的对应关系
var materialAndBarCodeList = d["materialAndBarCodeList"];
var unit = $("#unit" + idNumber);
unit.empty();
$("#unit" + idNumber).append(new Option(d.baseUnit, "-1"));
var unitList = d["splitInfoList"];
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
if (materialAndBarCodeList.length > 0) {
// 如果有对应的条形码
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
var id = barCodeInput.id;
$("#" + id).remove();
$("#barCode" + idNumber).empty();
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
} else {
var barCodeSelect = `
<select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
</select>`;
$("#" + barCodeImg.id).before(barCodeSelect);
} else {
materialName.value = d.mname;
materialId.value = d.mid;
var idNumber = materialId.name.split("mid")[1];
// 获取物料与条形码的对应关系
var materialAndBarCodeList = d["materialAndBarCodeList"];
var unit = $("#unit" + idNumber);
unit.empty();
$("#unit" + idNumber).append(new Option(d.baseUnit, "-1"));
var unitList = d["splitInfoList"];
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
$.each(materialAndBarCodeList, function (index, item) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
form.render();
} else {
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
if (materialAndBarCodeList.length > 0) {
// 如果有对应的条形码
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
var id = barCodeInput.id;
$("#" + id).remove();
$("#barCode" + idNumber).empty();
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
} else {
var barCodeSelect = `
<select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
</select>`;
$("#" + barCodeImg.id).before(barCodeSelect);
}
form.render();
$.each(materialAndBarCodeList, function (index, item) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
form.render();
} else {
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
}
}
}
}
}
});
});
}
};
//用于实现物料名称搜索

2
src/test/java/com/dreamchaser/depository_manage/TestOther.java
View File

@ -44,7 +44,7 @@ public class TestOther {
@Test
public void Test() throws IOException {
String spNo = "202302220012";
String spNo = "202302220024";
String mainId = (String) redisTemplate.opsForHash().get(spNo, "mainId");
ApprovalInfo_Details finalApprovalInfo_details = new ApprovalInfo_Details();
ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();

114
target/classes/templates/pages/group/group-add_back.html
View File

@ -70,7 +70,7 @@
</div>
<div class="layui-card" id="cardParent" style="box-shadow:none">
<fieldset class="table-search-fieldset">
<fieldset style="color: rgb(107, 107, 107); border-style: solid; border-color: rgb(230, 230, 230);border-image: initial;" >
<legend>组合明细</legend>
<div class="layui-card-body" id="cardItem">
<hr>
@ -353,7 +353,7 @@
// 获取当前高度
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
params.push(NewIdNumber);
$("#stepForm").css("height", height + 384 + 'px');
$("#stepForm").css("height", height + 339 + 'px');
$("#" + parentId).after(materialItem);
};
@ -366,7 +366,7 @@
// 获取祖父节点
var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height", height - 384 + 'px');
$("#stepForm").css("height", height - 339 + 'px');
params = remove(params, parentId);
reparent.removeChild(parent);
};
@ -667,65 +667,67 @@
var req = {};
req.code = code;
req.type = "in";
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
dataType: 'json',
data: (req),
contentType: "application/json;charset=utf-8",
success: function (d) {
var d = d.data;
if (d == null) {
layer.msg("仓库中暂无该物料");
materialName.value = "";
materialId.value = "";
obj.value = "";
$('#place' + objId).empty();
if(code !== "") {
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
dataType: 'json',
data: (req),
contentType: "application/json;charset=utf-8",
success: function (d) {
var d = d.data;
if (d == null) {
layer.msg("仓库中暂无该物料");
materialName.value = "";
materialId.value = "";
obj.value = "";
$('#place' + objId).empty();
} else {
materialName.value = d.mname;
materialId.value = d.mid;
var idNumber = materialId.name.split("mid")[1];
// 获取物料与条形码的对应关系
var materialAndBarCodeList = d["materialAndBarCodeList"];
var unit = $("#unit" + idNumber);
unit.empty();
$("#unit" + idNumber).append(new Option(d.baseUnit, "-1"));
var unitList = d["splitInfoList"];
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
if (materialAndBarCodeList.length > 0) {
// 如果有对应的条形码
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
var id = barCodeInput.id;
$("#" + id).remove();
$("#barCode" + idNumber).empty();
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
} else {
var barCodeSelect = `
<select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
</select>`;
$("#" + barCodeImg.id).before(barCodeSelect);
} else {
materialName.value = d.mname;
materialId.value = d.mid;
var idNumber = materialId.name.split("mid")[1];
// 获取物料与条形码的对应关系
var materialAndBarCodeList = d["materialAndBarCodeList"];
var unit = $("#unit" + idNumber);
unit.empty();
$("#unit" + idNumber).append(new Option(d.baseUnit, "-1"));
var unitList = d["splitInfoList"];
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
$.each(materialAndBarCodeList, function (index, item) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
form.render();
} else {
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
if (materialAndBarCodeList.length > 0) {
// 如果有对应的条形码
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
var id = barCodeInput.id;
$("#" + id).remove();
$("#barCode" + idNumber).empty();
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
} else {
var barCodeSelect = `
<select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
</select>`;
$("#" + barCodeImg.id).before(barCodeSelect);
}
form.render();
$.each(materialAndBarCodeList, function (index, item) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
form.render();
} else {
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
}
}
}
}
}
});
});
}
};
//用于实现物料名称搜索

Write Preview
Loading…
Cancel
Save