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
3600611eb8
commit
ece0f781f5
4 changed files with 354 additions and 289 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. 54
      src/main/resources/static/js/stockTaking/stockTakingForLocationCard.js
  2. 1
      src/main/resources/static/js/stockTaking/stockTakingForLocationTable.js
  3. 294
      src/main/resources/templates/pages/stockTaking/stockTaking.html
  4. 294
      target/classes/templates/pages/stockTaking/stockTaking.html

54
src/main/resources/static/js/stockTaking/stockTakingForLocationCard.js
View File

@ -824,24 +824,40 @@ layui.use(['form', 'step', 'flow', 'laydate', 'inputTag'], function () {
}; };
form.on('select()', function (data) {
changeSelectValueForProducedDate = function(obj){ var id = data.elem.id; //得到select原始DOM对象id
let req = {}; var req = {};
var id = obj.id; if (id.includes("producedDate")) {
var idNumber = id.split('producedDate')[1]; // 得到当前id对应数字 var idNumber = id.split('producedDate')[1]; // 得到当前id对应数字
req.mid = $("#" + "midForLocation" + idNumber).val(); req.mid = $("#" + "mid" + idNumber).val();
req.producedDate = obj.value; req.producedDate = data.value;
$.ajax({ $.ajax({
url: "/material/findQuantityByProducedDate", url: "/material/findQuantityByProducedDate",
type: "post", type: "post",
dataType: 'json', dataType: 'json',
data: JSON.stringify(req), data: JSON.stringify(req),
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
success: function (d) { success: function (d) {
$("#" + "oldInventory" + idNumber).val(d.data) $("#" + "oldInventory" + idNumber).val(d.data)
} }
}); });
}; }
else if (id.includes("unit")) {
let idNumber = id.split("unit")[1]; // 得到当前id对应数字
req.mid = $("#" + "midForLocation" + idNumber).val();
req.unit = data.value;
req.placeId = $("#placeId").val();
$.ajax({
url: "/material/findQuantityByUnit",
type: "post",
dataType: 'json',
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (d) {
$("#" + "oldInventory" + idNumber).val(d.data)
}
});
}
});
}); });

1
src/main/resources/static/js/stockTaking/stockTakingForLocationTable.js
View File

@ -313,6 +313,7 @@ layui.use(['form', 'step', 'flow', 'table', 'inputTag'], function () {
placeId = nowPlaceId; placeId = nowPlaceId;
updateTableShowForLocation(); updateTableShowForLocation();
} }
$("#locationCard")[0].reset();
} }
}); });

294
src/main/resources/templates/pages/stockTaking/stockTaking.html
View File

@ -35,10 +35,6 @@
.layui-form-select { .layui-form-select {
width: 100%; width: 100%;
height: 38px; height: 38px;
line-height: 1.3;
border-width: 1px;
border-style: solid;
background-color: #fff;
} }
@ -242,133 +238,163 @@
</div> </div>
</div> </div>
<div class="layui-tab-item"> <div class="layui-tab-item">
<form class="layui-form"> <form class="layui-form" id="locationCard">
<fieldset class="table-search-fieldset"> <fieldset class="table-search-fieldset">
<legend>盘点明细</legend> <legend>盘点明细</legend>
<div class="layui-card-body" id="InventoryDetails" style="padding-right: 0px"> <div class="layui-card-body" id="InventoryDetails"
<hr> style="padding-right: 0px">
<i class="layui-icon layui-icon-subtraction" style="display: inline" <hr>
onclick="deleteItem(this)"></i> <i class="layui-icon layui-icon-subtraction"
<div class="layui-form-item"> style="display: inline"
<label class="layui-form-label" style="height: 40px;">物料名称:</label> onclick="deleteItem(this)"></i>
<div class="layui-form-item">
<div class="layui-input-block" style="margin: 0px;"> <label class="layui-form-label"
<div class="inputdiv"> style="height: 40px;">物料名称:</label>
<input type="text" placeholder="请选择物料"
class="layui-input fairy-tag-input" <div class="layui-input-block" style="margin: 0px;">
style="border-style: none" <div class="inputdiv">
id="openSonByMaterialForLocation" <input type="text" placeholder="请选择物料"
onblur="selectMaterialByNameForLocation(this)" class="layui-input fairy-tag-input"
style="border-style: none"
id="openSonByMaterialForLocation"
onblur="selectMaterialByNameForLocation(this)"
lay-verify="required"/>
<i class="layui-icon layui-icon-search"
style="display: inline"
id="selectMaterialForLocation"
onclick="selectMaterialForLocation(this)"></i>
</div>
<input type="text" name="mid"
class="layui-input" id="midForLocation"
style="display: none"
lay-verify="required"/> lay-verify="required"/>
<i class="layui-icon layui-icon-search" style="display: inline"
id="selectMaterialForLocation" onclick="selectMaterialForLocation(this)"></i>
</div> </div>
<input type="text" name="mid" class="layui-input" id="midForLocation"
style="display: none" lay-verify="required"/>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label"
<label class="layui-form-label" style="height: 40px;">物料编码:</label> style="height: 40px;">物料编码:</label>
<div class="layui-input-block" style="margin: 0px;"> <div class="layui-input-block" style="margin: 0px;">
<div class="inputdiv"> <div class="inputdiv">
<input id="codeForLocation" name="code" type="text" placeholder="请填写入物料编码" <input id="codeForLocation" name="code"
value="" type="text" placeholder="请填写入物料编码"
onblur="selectCodeForLocation(this)" value=""
class="layui-input" lay-verify="required" onblur="selectCodeForLocation(this)"
style="border-style: none"> class="layui-input"
<img src="/static/images/search.ico" height="16" width="16" lay-verify="required"
style="margin-top: 10px" style="border-style: none">
onclick="scanMaterialCodeForTaking(this)"> <img src="/static/images/search.ico"
height="16" width="16"
style="margin-top: 10px"
onclick="scanMaterialCodeForTaking(this)">
</div>
</div> </div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">物料类型：</label>
<label class="layui-form-label">物料类型：</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="text" placeholder="请选择物料类型"
<input type="text" placeholder="请选择物料类型" class="layui-input" class="layui-input"
id="openSonByMateralType" readonly id="openSonByMateralType" readonly
lay-verify="required"/> lay-verify="required"/>
<input type="text" id="materialTypeId" name="typeId" <input type="text" id="materialTypeId"
placeholder="请选择物料类型" class="layui-input" name="typeId"
style="display: none" lay-verify="required"/> placeholder="请选择物料类型" class="layui-input"
style="display: none"
lay-verify="required"/>
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">材质:</label>
<label class="layui-form-label">材质:</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="text" placeholder="请填写材质名称"
<input type="text" placeholder="请填写材质名称" class="layui-input" readonly class="layui-input" readonly
name="texture"/> name="texture"/>
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">规格型号:</label>
<label class="layui-form-label">规格型号:</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="text" placeholder="请填写规格型号"
<input type="text" placeholder="请填写规格型号" class="layui-input" readonly class="layui-input" readonly
name="version"/> name="version"/>
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">计量单位:</label>
<label class="layui-form-label">计量单位:</label> <div class="layui-input-block">
<div class="layui-input-block"> <select id="unit"
<select id="unit" onchange="changeSelectValueForUnit(this)" class="layui-form-select" name="unit"></select> onchange="changeSelectValueForUnit(this)"
class="layui-form-select"
name="unit"></select>
</div>
</div> </div>
</div> <div class="layui-form-item" style="display: none"
<div class="layui-form-item" style="display: none" id="producedDateItem"> id="producedDateItem">
<label class="layui-form-label">生产日期:</label> <label class="layui-form-label">生产日期:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<!-- <input type="text" name="producedDate" id="producedDate" placeholder="请填写生产日期" onclick="selectDate(this)"--> <!-- <input type="text" name="producedDate" id="producedDate" placeholder="请填写生产日期" onclick="selectDate(this)"-->
<!-- autocomplete="off" class="layui-input">--> <!-- autocomplete="off" class="layui-input">-->
<select name="producedDate" id="producedDate" onchange="changeSelectValueForProducedDate(this)" class="layui-form-select"> <select name="producedDate" id="producedDate"
onchange="changeSelectValueForProducedDate(this)"
</select> class="layui-form-select">
</select>
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">库存数量:</label>
<label class="layui-form-label">库存数量:</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="number" class="layui-input"
<input type="number" class="layui-input" readonly id="oldInventory" readonly id="oldInventory"
name="oldInventory" lay-verify="required"/> name="oldInventory"
lay-verify="required"/>
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">盘点数量:</label>
<label class="layui-form-label">盘点数量:</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="number" class="layui-input"
<input type="number" class="layui-input" onblur="calculate(this)" onblur="calculate(this)"
name="newInventory" lay-verify="required"/> name="newInventory"
lay-verify="required"/>
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">盘点结果:</label>
<label class="layui-form-label">盘点结果:</label> <div class="layui-input-block">
<div class="layui-input-block"> <select name="takingResult" id="result"
<select name="takingResult" id="result" class="layui-form-select"> class="layui-form-select">
</select> </select>
</div>
</div> </div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">盈亏数量:</label> <label class="layui-form-label">盈亏数量:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="number" class="layui-input" readonly <input type="number" class="layui-input"
id="Inventory_number" readonly
name="inventory" lay-verify="required"/> id="Inventory_number"
name="inventory" lay-verify="required"/>
</div>
</div> </div>
<i class="layui-icon layui-icon-addition"
style="display: inline"
onclick="addItem(this)"></i>
</div> </div>
<i class="layui-icon layui-icon-addition" style="display: inline" <div class="layui-form-item" style="margin-top: 10px;">
onclick="addItem(this)"></i> <div class="layui-input-block">
</div> <button type="button"
<div class="layui-form-item" style="margin-top: 10px;"> class="layui-btn layui-btn-normal layui-btn-lg"
<div class="layui-input-block"> lay-submit
<button type="button" class="layui-btn layui-btn-normal layui-btn-lg" lay-filter="formStep3">
lay-submit &emsp;提交&emsp;
lay-filter="formStep3"> </button>
&emsp;提交&emsp; </div>
</button>
</div> </div>
</div> </fieldset>
</fieldset>
</form> </form>
</div> </div>
</div> </div>
@ -453,7 +479,6 @@
}); });
// 用于提交盘点情况 // 用于提交盘点情况
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; data = data.field;
@ -499,28 +524,27 @@
data = data.field; data = data.field;
data.params = params; data.params = params;
data.departmentManagerId = departmentManagerIdForLocation; data.departmentManagerId = departmentManagerIdForLocation;
console.log(data) $.ajax({
/* $.ajax({ url: "/stockTaking/addStockTakingRecord",
url: "/stockTaking/addStockTakingRecord", type: 'post',
type: 'post', dataType: 'json',
dataType: 'json', contentType: "application/json;charset=utf-8",
contentType: "application/json;charset=utf-8", data: JSON.stringify(data),
data: JSON.stringify(data), beforeSend: function () {
beforeSend: function () { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); },
}, success: function (data) {
success: function (data) { layer.msg("申请提交成功", {
layer.msg("申请提交成功", { icon: 6,//成功的表情
icon: 6,//成功的表情 time: 500 //1秒关闭（如果不配置，默认是3秒）
time: 500 //1秒关闭（如果不配置，默认是3秒） }, function () {
}, function () { step.next('#stepForm');
step.next('#stepForm'); });
}); },
}, complete: function () {
complete: function () { layer.close(this.layerIndex);
layer.close(this.layerIndex); }
} });
});*/
}); });
$('.pre').click(function () { $('.pre').click(function () {

294
target/classes/templates/pages/stockTaking/stockTaking.html
View File

@ -35,10 +35,6 @@
.layui-form-select { .layui-form-select {
width: 100%; width: 100%;
height: 38px; height: 38px;
line-height: 1.3;
border-width: 1px;
border-style: solid;
background-color: #fff;
} }
@ -242,133 +238,163 @@
</div> </div>
</div> </div>
<div class="layui-tab-item"> <div class="layui-tab-item">
<form class="layui-form"> <form class="layui-form" id="locationCard">
<fieldset class="table-search-fieldset"> <fieldset class="table-search-fieldset">
<legend>盘点明细</legend> <legend>盘点明细</legend>
<div class="layui-card-body" id="InventoryDetails" style="padding-right: 0px"> <div class="layui-card-body" id="InventoryDetails"
<hr> style="padding-right: 0px">
<i class="layui-icon layui-icon-subtraction" style="display: inline" <hr>
onclick="deleteItem(this)"></i> <i class="layui-icon layui-icon-subtraction"
<div class="layui-form-item"> style="display: inline"
<label class="layui-form-label" style="height: 40px;">物料名称:</label> onclick="deleteItem(this)"></i>
<div class="layui-form-item">
<div class="layui-input-block" style="margin: 0px;"> <label class="layui-form-label"
<div class="inputdiv"> style="height: 40px;">物料名称:</label>
<input type="text" placeholder="请选择物料"
class="layui-input fairy-tag-input" <div class="layui-input-block" style="margin: 0px;">
style="border-style: none" <div class="inputdiv">
id="openSonByMaterialForLocation" <input type="text" placeholder="请选择物料"
onblur="selectMaterialByNameForLocation(this)" class="layui-input fairy-tag-input"
style="border-style: none"
id="openSonByMaterialForLocation"
onblur="selectMaterialByNameForLocation(this)"
lay-verify="required"/>
<i class="layui-icon layui-icon-search"
style="display: inline"
id="selectMaterialForLocation"
onclick="selectMaterialForLocation(this)"></i>
</div>
<input type="text" name="mid"
class="layui-input" id="midForLocation"
style="display: none"
lay-verify="required"/> lay-verify="required"/>
<i class="layui-icon layui-icon-search" style="display: inline"
id="selectMaterialForLocation" onclick="selectMaterialForLocation(this)"></i>
</div> </div>
<input type="text" name="mid" class="layui-input" id="midForLocation"
style="display: none" lay-verify="required"/>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label"
<label class="layui-form-label" style="height: 40px;">物料编码:</label> style="height: 40px;">物料编码:</label>
<div class="layui-input-block" style="margin: 0px;"> <div class="layui-input-block" style="margin: 0px;">
<div class="inputdiv"> <div class="inputdiv">
<input id="codeForLocation" name="code" type="text" placeholder="请填写入物料编码" <input id="codeForLocation" name="code"
value="" type="text" placeholder="请填写入物料编码"
onblur="selectCodeForLocation(this)" value=""
class="layui-input" lay-verify="required" onblur="selectCodeForLocation(this)"
style="border-style: none"> class="layui-input"
<img src="/static/images/search.ico" height="16" width="16" lay-verify="required"
style="margin-top: 10px" style="border-style: none">
onclick="scanMaterialCodeForTaking(this)"> <img src="/static/images/search.ico"
height="16" width="16"
style="margin-top: 10px"
onclick="scanMaterialCodeForTaking(this)">
</div>
</div> </div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">物料类型：</label>
<label class="layui-form-label">物料类型：</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="text" placeholder="请选择物料类型"
<input type="text" placeholder="请选择物料类型" class="layui-input" class="layui-input"
id="openSonByMateralType" readonly id="openSonByMateralType" readonly
lay-verify="required"/> lay-verify="required"/>
<input type="text" id="materialTypeId" name="typeId" <input type="text" id="materialTypeId"
placeholder="请选择物料类型" class="layui-input" name="typeId"
style="display: none" lay-verify="required"/> placeholder="请选择物料类型" class="layui-input"
style="display: none"
lay-verify="required"/>
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">材质:</label>
<label class="layui-form-label">材质:</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="text" placeholder="请填写材质名称"
<input type="text" placeholder="请填写材质名称" class="layui-input" readonly class="layui-input" readonly
name="texture"/> name="texture"/>
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">规格型号:</label>
<label class="layui-form-label">规格型号:</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="text" placeholder="请填写规格型号"
<input type="text" placeholder="请填写规格型号" class="layui-input" readonly class="layui-input" readonly
name="version"/> name="version"/>
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">计量单位:</label>
<label class="layui-form-label">计量单位:</label> <div class="layui-input-block">
<div class="layui-input-block"> <select id="unit"
<select id="unit" onchange="changeSelectValueForUnit(this)" class="layui-form-select" name="unit"></select> onchange="changeSelectValueForUnit(this)"
class="layui-form-select"
name="unit"></select>
</div>
</div> </div>
</div> <div class="layui-form-item" style="display: none"
<div class="layui-form-item" style="display: none" id="producedDateItem"> id="producedDateItem">
<label class="layui-form-label">生产日期:</label> <label class="layui-form-label">生产日期:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<!-- <input type="text" name="producedDate" id="producedDate" placeholder="请填写生产日期" onclick="selectDate(this)"--> <!-- <input type="text" name="producedDate" id="producedDate" placeholder="请填写生产日期" onclick="selectDate(this)"-->
<!-- autocomplete="off" class="layui-input">--> <!-- autocomplete="off" class="layui-input">-->
<select name="producedDate" id="producedDate" onchange="changeSelectValueForProducedDate(this)" class="layui-form-select"> <select name="producedDate" id="producedDate"
onchange="changeSelectValueForProducedDate(this)"
</select> class="layui-form-select">
</select>
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">库存数量:</label>
<label class="layui-form-label">库存数量:</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="number" class="layui-input"
<input type="number" class="layui-input" readonly id="oldInventory" readonly id="oldInventory"
name="oldInventory" lay-verify="required"/> name="oldInventory"
lay-verify="required"/>
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">盘点数量:</label>
<label class="layui-form-label">盘点数量:</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="number" class="layui-input"
<input type="number" class="layui-input" onblur="calculate(this)" onblur="calculate(this)"
name="newInventory" lay-verify="required"/> name="newInventory"
lay-verify="required"/>
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">盘点结果:</label>
<label class="layui-form-label">盘点结果:</label> <div class="layui-input-block">
<div class="layui-input-block"> <select name="takingResult" id="result"
<select name="takingResult" id="result" class="layui-form-select"> class="layui-form-select">
</select> </select>
</div>
</div> </div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">盈亏数量:</label> <label class="layui-form-label">盈亏数量:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="number" class="layui-input" readonly <input type="number" class="layui-input"
id="Inventory_number" readonly
name="inventory" lay-verify="required"/> id="Inventory_number"
name="inventory" lay-verify="required"/>
</div>
</div> </div>
<i class="layui-icon layui-icon-addition"
style="display: inline"
onclick="addItem(this)"></i>
</div> </div>
<i class="layui-icon layui-icon-addition" style="display: inline" <div class="layui-form-item" style="margin-top: 10px;">
onclick="addItem(this)"></i> <div class="layui-input-block">
</div> <button type="button"
<div class="layui-form-item" style="margin-top: 10px;"> class="layui-btn layui-btn-normal layui-btn-lg"
<div class="layui-input-block"> lay-submit
<button type="button" class="layui-btn layui-btn-normal layui-btn-lg" lay-filter="formStep3">
lay-submit &emsp;提交&emsp;
lay-filter="formStep3"> </button>
&emsp;提交&emsp; </div>
</button>
</div> </div>
</div> </fieldset>
</fieldset>
</form> </form>
</div> </div>
</div> </div>
@ -453,7 +479,6 @@
}); });
// 用于提交盘点情况 // 用于提交盘点情况
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; data = data.field;
@ -499,28 +524,27 @@
data = data.field; data = data.field;
data.params = params; data.params = params;
data.departmentManagerId = departmentManagerIdForLocation; data.departmentManagerId = departmentManagerIdForLocation;
console.log(data) $.ajax({
/* $.ajax({ url: "/stockTaking/addStockTakingRecord",
url: "/stockTaking/addStockTakingRecord", type: 'post',
type: 'post', dataType: 'json',
dataType: 'json', contentType: "application/json;charset=utf-8",
contentType: "application/json;charset=utf-8", data: JSON.stringify(data),
data: JSON.stringify(data), beforeSend: function () {
beforeSend: function () { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); },
}, success: function (data) {
success: function (data) { layer.msg("申请提交成功", {
layer.msg("申请提交成功", { icon: 6,//成功的表情
icon: 6,//成功的表情 time: 500 //1秒关闭（如果不配置，默认是3秒）
time: 500 //1秒关闭（如果不配置，默认是3秒） }, function () {
}, function () { step.next('#stepForm');
step.next('#stepForm'); });
}); },
}, complete: function () {
complete: function () { layer.close(this.layerIndex);
layer.close(this.layerIndex); }
} });
});*/
}); });
$('.pre').click(function () { $('.pre').click(function () {

Write Preview
Loading…
Cancel
Save