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
Split 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 () {
};
changeSelectValueForProducedDate = function(obj){
let req = {};
var id = obj.id;
var idNumber = id.split('producedDate')[1]; // 得到当前id对应数字
req.mid = $("#" + "midForLocation" + idNumber).val();
req.producedDate = obj.value;
$.ajax({
url: "/material/findQuantityByProducedDate",
type: "post",
dataType: 'json',
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (d) {
$("#" + "oldInventory" + idNumber).val(d.data)
}
});
};
form.on('select()', function (data) {
var id = data.elem.id; //得到select原始DOM对象id
var req = {};
if (id.includes("producedDate")) {
var idNumber = id.split('producedDate')[1]; // 得到当前id对应数字
req.mid = $("#" + "mid" + idNumber).val();
req.producedDate = data.value;
$.ajax({
url: "/material/findQuantityByProducedDate",
type: "post",
dataType: 'json',
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (d) {
$("#" + "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;
updateTableShowForLocation();
}
$("#locationCard")[0].reset();
}
});

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

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

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

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

Write Preview
Loading…
Cancel
Save