Browse Source

将入库相关处理抽离

lwx_dev
erdanergou 3 years ago
parent
commit
49b6af1257
  1. 4
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  2. 198
      src/main/resources/templates/pages/application/application-in.html
  3. 39
      src/main/resources/templates/pages/application/application-in_back.html
  4. 111
      src/main/resources/templates/pages/application/application-in_scanQrCode.html
  5. 186
      src/main/resources/templates/pages/application/application-out.html
  6. 53
      src/main/resources/templates/pages/application/application-out_back.html
  7. 71
      src/main/resources/templates/pages/application/application-out_scanQrCode.html
  8. 125
      src/main/resources/templates/pages/application/application-transfer.html
  9. 69
      src/main/resources/templates/pages/application/application-transfer_back.html
  10. 6
      src/test/java/com/dreamchaser/depository_manage/TestOther.java

4
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@ -107,7 +107,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Integer applicationIn(Map<String, Object> map) { public Integer applicationIn(Map<String, Object> map) {
Boolean flagForApproval = ObjectFormatUtil.toBoolean(map.get("flagForApproval")); Boolean flagForApproval = ObjectFormatUtil.toBoolean(map.get("flagForApproval"));
Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId"));
Depository depositoryRecordById = depositoryMapper.findDepositoryById(depositoryId); Depository depositoryRecordById = depositoryMapper.findDepositoryById(depositoryId);
Map<String, Object> temp = new HashMap<>(); Map<String, Object> temp = new HashMap<>();
@ -666,6 +665,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
Integer result = updateInventoryInfoForApproval(map, quantity, materialById, placeById); Integer result = updateInventoryInfoForApproval(map, quantity, materialById, placeById);
map.remove("applicationInId"); map.remove("applicationInId");
return result; return result;
}else{
map.put("applicationInId",map.get("id"));
map.remove("id");
} }
return integer; return integer;
} else { } else {

198
src/main/resources/templates/pages/application/application-in.html

@ -699,73 +699,76 @@
var req = {}; var req = {};
req.code = code; req.code = code;
req.type = "in"; req.type = "in";
$.ajax({ if(code !== ""){
url: "/material/findMatrialByCode", $.ajax({
type: "get", url: "/material/findMatrialByCode",
dataType: 'json', type: "get",
data: req, dataType: 'json',
contentType: "application/json;charset=utf-8", data: req,
success: function (d) { contentType: "application/json;charset=utf-8",
var d = d.data; success: function (d) {
var idNumber = materialId.name.split("mid")[1]; var d = d.data;
if (d == null) { var idNumber = materialId.name.split("mid")[1];
layer.msg("没有该编码,请确认是否输入正确"); if (d == null) {
materialName.value = ""; layer.msg("没有该编码,请确认是否输入正确");
materialId.value = ""; materialName.value = "";
obj.value = ""; materialId.value = "";
$("#barCode" + idNumber).empty(); obj.value = "";
$("#unit" + idNumber).empty(); $("#barCode" + idNumber).empty();
form.render(); $("#unit" + idNumber).empty();
form.render();
} else { } else {
materialName.value = d.mname; materialName.value = d.mname;
materialId.value = d.mid; materialId.value = d.mid;
// 获取物料与条形码的对应关系 // 获取物料与条形码的对应关系
var materialAndBarCodeList = d["materialAndBarCodeList"]; var materialAndBarCodeList = d["materialAndBarCodeList"];
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
}
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 barCodeImg = barCodeItem.childNodes[1].childNodes[3];
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
var id = barCodeInput.id;
$("#" + id).remove();
var barCode = $("#barCode" + idNumber); var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) { if (barCode.length > 0) {
barCode.empty(); barCode.empty();
} else { }
var barCodeSelect = ` var unit = $("#unit" + idNumber);
<select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `> unit.empty();
</select>`; $("#unit" + idNumber).append(new Option(d.baseUnit, "-1"));
$("#" + barCodeImg.id).before(barCodeSelect); 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(); form.render();
if (materialAndBarCodeList.length > 0) {
// 如果有对应的条形码
var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
var id = barCodeInput.id;
$("#" + id).remove();
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) { $.each(materialAndBarCodeList, function (index, item) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.bmcode));//往下拉菜单里添加元素 $("#barCode" + idNumber).append(new Option(item.bmcode, item.bmcode));//往下拉菜单里添加元素
}); });
form.render(); form.render();
} }
var shelfLife = d.shelfLife; var shelfLife = d.shelfLife;
if (shelfLife !== null && shelfLife !== undefined) { if (shelfLife !== null && shelfLife !== undefined) {
$("#" + "producedDateItem" + idNumber).show(); $("#" + "producedDateItem" + idNumber).show();
$("#" + "producedDate" + idNumber).attr("lay-verify", "required"); $("#" + "producedDate" + idNumber).attr("lay-verify", "required");
} else { } else {
$("#" + "producedDateItem" + idNumber).hide(); $("#" + "producedDateItem" + idNumber).hide();
}
} }
} }
} });
}); }
}; };
// 用于实现点击搜索按钮 // 用于实现点击搜索按钮
@ -1255,50 +1258,53 @@
// gname // gname
let gnameItem = gnameParent.childNodes[1].childNodes[1]; let gnameItem = gnameParent.childNodes[1].childNodes[1];
let req = {}; let req = {};
req.code = code; if(code !== ""){
$.ajax({ req.code = code;
url: "/group/findGroupByCodeForIn", $.ajax({
type: "post", url: "/group/findGroupByCodeForIn",
dataType: 'json', type: "post",
data: JSON.stringify(req), dataType: 'json',
contentType: "application/json;charset=utf-8", data: JSON.stringify(req),
success: function (d) { contentType: "application/json;charset=utf-8",
var data = d.data; success: function (d) {
if (data === null) { var data = d.data;
layer.msg(d.statusInfo.detail, { if (data === null) {
icon: 0, layer.msg(d.statusInfo.detail, {
time: 1500 icon: 0,
}, function () { time: 1500
obj.value = ''; }, function () {
gidItem.value = ''; obj.value = '';
gnameItem.value = ''; gidItem.value = '';
gnameItem.value = '';
let childNodes = parent.childNodes;
for (let i = 0; i < childNodes.length; i++) {
if (childNodes[i].className === "layui-collapse") {
childNodes[i].remove()
}
}
})
} else {
let childNodes = parent.childNodes; let childNodes = parent.childNodes;
for (let i = 0; i < childNodes.length; i++) { if (childNodes.length > 9) {
if (childNodes[i].className === "layui-collapse") { for (let i = 0; i < childNodes.length; i++) {
childNodes[i].remove() if (childNodes[i].className === "layui-collapse") {
childNodes[i].remove()
}
} }
} }
}) // 赋值给gname
} else { gnameItem.value = data[0].gname;
let childNodes = parent.childNodes; gidItem.value = data[0].gid;
if (childNodes.length > 9) { for (let i = 0; i < data.length; i++) {
for (let i = 0; i < childNodes.length; i++) { CoverpageForGroup(pid, data[i]);
if (childNodes[i].className === "layui-collapse") {
childNodes[i].remove()
}
} }
} element.init();
// 赋值给gname
gnameItem.value = data[0].gname;
gidItem.value = data[0].gid;
for (let i = 0; i < data.length; i++) {
CoverpageForGroup(pid, data[i]);
}
element.init();
}
} }
} });
}); }
}; };
// 用于实现点击搜索按钮(组合) // 用于实现点击搜索按钮(组合)

39
src/main/resources/templates/pages/application/application-in_back.html

@ -158,25 +158,28 @@
var req = {}; var req = {};
req.code = code; req.code = code;
req.type = "in"; req.type = "in";
$.ajax({ if(code !== ""){
url: "/material/findMatrialByCode", $.ajax({
type: "get", url: "/material/findMatrialByCode",
dataType: 'json', type: "get",
data:(req), dataType: 'json',
contentType: "application/json;charset=utf-8", data:(req),
success: function (d) { contentType: "application/json;charset=utf-8",
var d = d.data; success: function (d) {
if(d == null){ var d = d.data;
layer.msg("没有该编码,请确认是否输入正确"); if(d == null){
$("#openSonByMaterial").val(""); layer.msg("没有该编码,请确认是否输入正确");
$("#mid").val(""); $("#openSonByMaterial").val("");
$("#code").val(""); $("#mid").val("");
}else{ $("#code").val("");
$("#openSonByMaterial").val(d.mname); }else{
$("#mid").val(d.id); $("#openSonByMaterial").val(d.mname);
$("#mid").val(d.id);
}
} }
} });
}); }
}); });
$("#openSonByMaterial").blur(function () { $("#openSonByMaterial").blur(function () {

111
src/main/resources/templates/pages/application/application-in_scanQrCode.html

@ -611,66 +611,69 @@
var req = {}; var req = {};
req.code = code; req.code = code;
req.type = "in"; req.type = "in";
$.ajax({ if(code !== ""){
url: "/material/findMatrialByCode", $.ajax({
type: "get", url: "/material/findMatrialByCode",
dataType: 'json', type: "get",
data: req, dataType: 'json',
contentType: "application/json;charset=utf-8", data: req,
success: function (d) { contentType: "application/json;charset=utf-8",
var d = d.data; success: function (d) {
var idNumber = materialId.name.split("mid")[1]; var d = d.data;
if (d == null) { var idNumber = materialId.name.split("mid")[1];
layer.msg("没有该编码,请确认是否输入正确"); if (d == null) {
materialName.value = ""; layer.msg("没有该编码,请确认是否输入正确");
materialId.value = ""; materialName.value = "";
obj.value = ""; materialId.value = "";
$("#barCode" + idNumber).remove(); obj.value = "";
form.render(); $("#barCode" + idNumber).remove();
} else {
materialName.value = d.mname;
materialId.value = d.id;
// 获取物料与条形码的对应关系
var materialAndBarCodeList = d["materialAndBarCodeList"];
var splitInfoList = d["splitInfoList"];
let unit = $("#unit" + idNumber);
unit.empty();
unit.append(new Option(d.unit, "-1"));
$.each(splitInfoList, function (index, item) {
unit.append(new Option(item.newUnit, item.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);
}
form.render(); form.render();
} else {
$.each(materialAndBarCodeList, function (index, item) { materialName.value = d.mname;
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 materialId.value = d.id;
// 获取物料与条形码的对应关系
var materialAndBarCodeList = d["materialAndBarCodeList"];
var splitInfoList = d["splitInfoList"];
let unit = $("#unit" + idNumber);
unit.empty();
unit.append(new Option(d.unit, "-1"));
$.each(splitInfoList, function (index, item) {
unit.append(new Option(item.newUnit, item.newUnit));//往下拉菜单里添加元素
}); });
form.render(); form.render();
} else { if (materialAndBarCodeList.length > 0) {
var barCode = $("#barCode" + idNumber); // 如果有对应的条形码
if (barCode.length > 0) { var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
barCode.empty(); 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();
}
} }
} }
} }
} });
}); }
}; };
// 用于实现点击搜索按钮 // 用于实现点击搜索按钮

186
src/main/resources/templates/pages/application/application-out.html

@ -762,65 +762,68 @@
var req = {}; var req = {};
req.code = code; req.code = code;
req.type = "out"; req.type = "out";
$.ajax({ if(code !== ""){
url: "/material/findMatrialByCode", $.ajax({
type: "get", url: "/material/findMatrialByCode",
dataType: 'json', type: "get",
data: (req), dataType: 'json',
contentType: "application/json;charset=utf-8", data: (req),
success: function (d) { contentType: "application/json;charset=utf-8",
var d = d.data; success: function (d) {
if (d == null) { var d = d.data;
layer.msg("仓库中暂无该物料"); if (d == null) {
materialName.value = ""; layer.msg("仓库中暂无该物料");
materialId.value = ""; materialName.value = "";
obj.value = ""; materialId.value = "";
$('#place' + objId).empty(); obj.value = "";
$('#place' + objId).empty();
} else { } else {
materialName.value = d.mname; materialName.value = d.mname;
materialId.value = d.id; materialId.value = d.id;
var idNumber = materialId.name.split("mid")[1]; var idNumber = materialId.name.split("mid")[1];
// 获取物料与条形码的对应关系 // 获取物料与条形码的对应关系
var materialAndBarCodeList = d["materialAndBarCodeList"]; var materialAndBarCodeList = d["materialAndBarCodeList"];
var unit = $("#unit" + idNumber); var unit = $("#unit" + idNumber);
unit.empty(); unit.empty();
$("#unit" + idNumber).append(new Option(d.baseUnit, "-1")); $("#unit" + idNumber).append(new Option(d.baseUnit, "-1"));
var unitList = d["splitInfoList"]; var unitList = d["splitInfoList"];
for (let i = 0; i < unitList.length; i++) { for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); $("#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);
} }
form.render(); form.render();
$.each(materialAndBarCodeList, function (index, item) { if (materialAndBarCodeList.length > 0) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 // 如果有对应的条形码
}); var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
form.render(); var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
} else { var id = barCodeInput.id;
var barCode = $("#barCode" + idNumber); $("#" + id).remove();
if (barCode.length > 0) { $("#barCode" + idNumber).empty();
barCode.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();
}
} }
} }
} }
} });
}); }
}; };
// 用于实现通过编码查询组合 // 用于实现通过编码查询组合
@ -840,49 +843,52 @@
let gnameItem = gnameParent.childNodes[1].childNodes[1]; let gnameItem = gnameParent.childNodes[1].childNodes[1];
let req = {}; let req = {};
req.code = code; req.code = code;
$.ajax({ if(code !== ""){
url: "/group/findGroupByCode", $.ajax({
type: "post", url: "/group/findGroupByCode",
dataType: 'json', type: "post",
data: JSON.stringify(req), dataType: 'json',
contentType: "application/json;charset=utf-8", data: JSON.stringify(req),
success: function (d) { contentType: "application/json;charset=utf-8",
var data = d.data; success: function (d) {
if (data === null) { var data = d.data;
layer.msg(d.statusInfo.detail, { if (data === null) {
icon: 0, layer.msg(d.statusInfo.detail, {
time: 1500 icon: 0,
},function () { time: 1500
obj.value = ''; },function () {
gidItem.value = ''; obj.value = '';
gnameItem.value = ''; gidItem.value = '';
gnameItem.value = '';
let childNodes = parent.childNodes;
for (let i = 0; i < childNodes.length; i++) {
if (childNodes[i].className === "layui-collapse") {
childNodes[i].remove()
}
}
})
} else {
let childNodes = parent.childNodes; let childNodes = parent.childNodes;
for (let i = 0; i < childNodes.length; i++) { if (childNodes.length > 9) {
if (childNodes[i].className === "layui-collapse") { for (let i = 0; i < childNodes.length; i++) {
childNodes[i].remove() if (childNodes[i].className === "layui-collapse") {
childNodes[i].remove()
}
} }
} }
}) // 赋值给gname
} else { gnameItem.value = data[0].gname;
let childNodes = parent.childNodes; gidItem.value = data[0].gid;
if (childNodes.length > 9) { for (let i = 0; i < data.length; i++) {
for (let i = 0; i < childNodes.length; i++) { CoverpageForGroup(pid, data[i]);
if (childNodes[i].className === "layui-collapse") {
childNodes[i].remove()
}
} }
} element.init();
// 赋值给gname
gnameItem.value = data[0].gname;
gidItem.value = data[0].gid;
for (let i = 0; i < data.length; i++) {
CoverpageForGroup(pid, data[i]);
}
element.init();
}
} }
} });
}); }
}; };
// 用于实现点击搜索按钮 // 用于实现点击搜索按钮

53
src/main/resources/templates/pages/application/application-out_back.html

@ -156,32 +156,35 @@
var req = {}; var req = {};
req.code = code; req.code = code;
req.type = "out"; req.type = "out";
$.ajax({ if(code !== ""){
url: "/material/findMatrialByCode", $.ajax({
type: "get", url: "/material/findMatrialByCode",
dataType: 'json', type: "get",
data: (req), dataType: 'json',
contentType: "application/json;charset=utf-8", data: (req),
success: function (d) { contentType: "application/json;charset=utf-8",
var d = d.data; success: function (d) {
if (d == null) { var d = d.data;
layer.msg("没有该编码,请确认是否输入正确"); if (d == null) {
$("#mname").val(""); layer.msg("没有该编码,请确认是否输入正确");
$("#mid").val(""); $("#mname").val("");
} else { $("#mid").val("");
req.mid = d.id; } else {
let unitItem = $("#unit"); req.mid = d.id;
unitItem.empty(); let unitItem = $("#unit");
unitItem.append(new Option(d.baseUnit, "-1")); unitItem.empty();
$.each(d.splitInfoList, function (index, item) { unitItem.append(new Option(d.baseUnit, "-1"));
$("#unit").append(new Option(item.newUnit, item.newUnit)); $.each(d.splitInfoList, function (index, item) {
}); $("#unit").append(new Option(item.newUnit, item.newUnit));
$("#mname").val(d.mname); });
$("#mid").val(d.id); $("#mname").val(d.mname);
form.render(); $("#mid").val(d.id);
form.render();
}
} }
} })
}) }
}); });
$("#mname").blur(function () { $("#mname").blur(function () {

71
src/main/resources/templates/pages/application/application-out_scanQrCode.html

@ -448,42 +448,45 @@
var req = {}; var req = {};
req.code = code; req.code = code;
req.type = "out"; req.type = "out";
$.ajax({ if(code !== ""){
url: "/material/findMatrialByCode", $.ajax({
type: "get", url: "/material/findMatrialByCode",
dataType: 'json', type: "get",
data:(req), dataType: 'json',
contentType: "application/json;charset=utf-8", data:(req),
success: function (d) { contentType: "application/json;charset=utf-8",
var d = d.data; success: function (d) {
if(d == null){ var d = d.data;
layer.msg("没有该编码,请确认是否输入正确"); if(d == null){
materialName.value = ""; layer.msg("没有该编码,请确认是否输入正确");
materialId.value = ""; materialName.value = "";
obj.value = ""; materialId.value = "";
$('#place').empty(); obj.value = "";
}else{ $('#place').empty();
req.mid = d.id; }else{
$.ajax({ req.mid = d.id;
url: "/place/findPlaceByMid", $.ajax({
type: "post", url: "/place/findPlaceByMid",
dataType: 'json', type: "post",
data:JSON.stringify(req), dataType: 'json',
contentType: "application/json;charset=utf-8", data:JSON.stringify(req),
success:function (res) { contentType: "application/json;charset=utf-8",
$('#place').empty(); success:function (res) {
$.each(res.data, function (index, item) { $('#place').empty();
$('#place').append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素 $.each(res.data, function (index, item) {
}); $('#place').append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素
form.render(); });
materialName.value = d.mname; form.render();
materialId.value = d.id; materialName.value = d.mname;
} materialId.value = d.id;
}); }
});
}
} }
} });
}); }
}; };
// 用于实现点击搜索按钮 // 用于实现点击搜索按钮

125
src/main/resources/templates/pages/application/application-transfer.html

@ -610,78 +610,81 @@
var req = {}; var req = {};
req.code = code; req.code = code;
req.type = "out"; req.type = "out";
$.ajax({ if(code !== ""){
url: "/material/findMatrialByCode", $.ajax({
type: "get", url: "/material/findMatrialByCode",
dataType: 'json', type: "get",
data:req, dataType: 'json',
contentType: "application/json;charset=utf-8", data:req,
success: function (d) { contentType: "application/json;charset=utf-8",
var d = d.data; success: function (d) {
if(d == null){ var d = d.data;
layer.msg("没有该编码,请确认是否输入正确"); if(d == null){
materialName.value = ""; layer.msg("没有该编码,请确认是否输入正确");
materialId.value = ""; materialName.value = "";
obj.value = ""; materialId.value = "";
}else{ obj.value = "";
req.mid = d.id; }else{
$.ajax({ req.mid = d.id;
url: "/place/findPlaceByMid", $.ajax({
type: "post", url: "/place/findPlaceByMid",
dataType: 'json', type: "post",
data:JSON.stringify(req), dataType: 'json',
contentType: "application/json;charset=utf-8", data:JSON.stringify(req),
success:function (res) { contentType: "application/json;charset=utf-8",
var idNumber = materialId.name.split("mid")[1]; success:function (res) {
// 获取物料与条形码的对应关系 var idNumber = materialId.name.split("mid")[1];
var materialAndBarCodeList = d["materialAndBarCodeList"]; // 获取物料与条形码的对应关系
var barCode = $("#barCode" + idNumber); var materialAndBarCodeList = d["materialAndBarCodeList"];
if (barCode.length > 0) {
barCode.empty();
}
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();
var barCode = $("#barCode" + idNumber); var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) { if (barCode.length > 0) {
barCode.empty(); barCode.empty();
} else { }
var barCodeSelect = ` 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();
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
} else {
var barCodeSelect = `
<select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `> <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
</select>`; </select>`;
$("#" + barCodeImg.id).before(barCodeSelect); $("#" + barCodeImg.id).before(barCodeSelect);
}
form.render();
$.each(materialAndBarCodeList, function (index, item) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
form.render();
} }
form.render(); $('#place' + codeId).empty();
$.each(materialAndBarCodeList, function (index, item) { $.each(res.data, function (index, item) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 $('#place' + codeId).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
}); });
form.render(); form.render();
materialName.value = d.mname;
materialId.value = d.id;
} }
$('#place' + codeId).empty(); });
}
$.each(res.data, function (index, item) {
$('#place' + codeId).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
form.render();
materialName.value = d.mname;
materialId.value = d.id;
}
});
} }
} });
}); }
}; };
// 用于实现点击搜索按钮 // 用于实现点击搜索按钮

69
src/main/resources/templates/pages/application/application-transfer_back.html

@ -330,40 +330,43 @@
var req = {}; var req = {};
req.code = code; req.code = code;
req.type = "out"; req.type = "out";
$.ajax({ if(code !== ""){
url: "/material/findMatrialByCode", $.ajax({
type: "get", url: "/material/findMatrialByCode",
dataType: 'json', type: "get",
data:req, dataType: 'json',
contentType: "application/json;charset=utf-8", data:req,
success: function (d) { contentType: "application/json;charset=utf-8",
var d = d.data; success: function (d) {
if(d == null){ var d = d.data;
layer.msg("没有该编码,请确认是否输入正确"); if(d == null){
materialName.value = ""; layer.msg("没有该编码,请确认是否输入正确");
materialId.value = ""; materialName.value = "";
obj.value = ""; materialId.value = "";
}else{ obj.value = "";
req.mid = d.id; }else{
$.ajax({ req.mid = d.id;
url: "/place/findPlaceByMid", $.ajax({
type: "post", url: "/place/findPlaceByMid",
dataType: 'json', type: "post",
data:JSON.stringify(req), dataType: 'json',
contentType: "application/json;charset=utf-8", data:JSON.stringify(req),
success:function (res) { contentType: "application/json;charset=utf-8",
$('#place'+id).empty(); success:function (res) {
$.each(res.data, function (index, item) { $('#place'+id).empty();
$('#place'+id).append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素 $.each(res.data, function (index, item) {
}); $('#place'+id).append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素
form.render(); });
materialName.value = d.mname; form.render();
materialId.value = d.id; materialName.value = d.mname;
} materialId.value = d.id;
}); }
});
}
} }
} });
}); }
}; };
// 用于实现点击搜索按钮 // 用于实现点击搜索按钮

6
src/test/java/com/dreamchaser/depository_manage/TestOther.java

@ -31,7 +31,11 @@ public class TestOther {
@Test @Test
public void Test() throws IOException { public void Test() throws IOException {
System.out.println(ObjectFormatUtil.toBoolean("true")); Map<String,Object> map = new HashMap<>();
Boolean flag = true;
map.put("flag",flag);
Boolean flag1 = ObjectFormatUtil.toBoolean(map.get("flag"));
System.out.println(flag1);
} }

Loading…
Cancel
Save