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
79459182fa
commit
77b4465bb5
5 changed files with 82 additions and 267 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. 9
      src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
  2. 39
      src/main/resources/templates/pages/material/material-out.html
  3. 131
      src/main/resources/templates/pages/stockTaking/stockTaking.html
  4. 39
      target/classes/templates/pages/material/material-out.html
  5. 131
      target/classes/templates/pages/stockTaking/stockTaking.html

9
src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
View File

@ -266,7 +266,14 @@ public class MaterialServiceImpl implements MaterialService {
state = map.get("state"); state = map.get("state");
} }
map.put("state", state); map.put("state", state);
return materialMapper.findMaterialByCondition(map); List<Material> materialByCondition = materialMapper.findMaterialByCondition(map);
for (Material material:materialByCondition
) {
if(material.getPrice() != null){
material.setPrice(material.getPrice() / 100);
}
}
return materialByCondition;
} }
/** /**

39
src/main/resources/templates/pages/material/material-out.html
View File

@ -15,6 +15,7 @@
<div class="layuimini-container"> <div class="layuimini-container">
<div class="layuimini-main"> <div class="layuimini-main">
<input style="display:none;" id="nowDay" th:value="${nowDay}"> <input style="display:none;" id="nowDay" th:value="${nowDay}">
<input style="display:none;" id="display" th:value="${display}">
<fieldset class="table-search-fieldset" > <fieldset class="table-search-fieldset" >
<legend>搜索信息</legend> <legend>搜索信息</legend>
@ -130,6 +131,24 @@
}); });
}); });
let cols = [
{type: "checkbox", width: 50},
{field: 'code', width: 150, title: '存货编码', sort: true},
{field: 'mname', width: 120, title: '物料名称', sort: false},
{field: 'typeName', width: 150, title: '物料种类'},
{field: 'version', width: 200, title: '规格型号', sort: false},
{field: 'unit', width: 150, title: '计量单位'},
{field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
{field: 'texture', width: 100, title: '材质'},
{field: 'brand', width: 150, title: '品牌'},
{field: 'shelfLife', width: 150, title: '保质期'},
{field: 'productionPlace', width: 150, title: '产地'},
{field: 'remark', width: 150, title: '备注'},
];
let flagForRelod = true;
table.render({ table.render({
elem: "#currentTableId", elem: "#currentTableId",
@ -166,21 +185,35 @@
{field: 'mname', width: 120, title: '物料名称', sort: false}, {field: 'mname', width: 120, title: '物料名称', sort: false},
{field: 'typeName', width: 150, title: '物料种类'}, {field: 'typeName', width: 150, title: '物料种类'},
{field: 'version', width: 200, title: '规格型号', sort: false}, {field: 'version', width: 200, title: '规格型号', sort: false},
{field: 'texture', width: 100, title: '材质'},
{field: 'unit', width: 150, title: '计量单位'}, {field: 'unit', width: 150, title: '计量单位'},
{field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
{field: 'texture', width: 100, title: '材质'},
{field: 'brand', width: 150, title: '品牌'}, {field: 'brand', width: 150, title: '品牌'},
{field: 'shelfLife', width: 150, title: '保质期'}, {field: 'shelfLife', width: 150, title: '保质期'},
{field: 'productionPlace', width: 150, title: '产地'}, {field: 'productionPlace', width: 150, title: '产地'},
{field: 'remark', width: 150, title: '备注'}, {field: 'remark', width: 150, title: '备注'},
{field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"}
] ]
], ],
limits: [10, 15, 20, 25, 50,100], limits: [10, 15, 20, 25, 50,100],
limit: 10, limit: 10,
page: true, page: true,
skin: 'line', skin: 'line',
done: function (res, curr, count) {
let display = $("#display").val();
if("inline-block" === display){
if(flagForRelod){
flagForRelod = false;
let col = {field: 'price', width: 150, title: '物料单价'};
cols.splice(6,0,col);
table.reload('currentTableId',{cols:[cols]});
}
}
}
}); });

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

@ -98,136 +98,7 @@
</div> </div>
</div> </div>
<fieldset class="table-search-fieldset"> <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
<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="openSonByMaterial"
onblur="selectMaterialByName(this)"
lay-verify="required"/>
<i class="layui-icon layui-icon-search" style="display: inline"
id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name="mid" class="layui-input" id="mid"
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="code" name="code" type="text" placeholder="请填写入物料编码"
value=""
onblur="selectCode(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 class="layui-form-item">
<label class="layui-form-label" style="height: 40px;">条形编码:</label>
<div class="layui-input-block" style="margin: 0px;">
<div class="inputdiv">
<select id="barCode" name="barCode"
style="border-style: none">
</select>
<img src="/static/images/search.ico" height="16" width="16"
id="barCodeImg"
style="margin-top: 10px"
onclick="scanBarCodeForTaking(this)">
</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>
</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>
</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>
</div>
<div class="layui-form-item">
<label class="layui-form-label">计量单位:</label>
<div class="layui-input-block">
<select id="unit" name="unit"></select>
</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">
</select>
</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>
</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>
</div>
<div class="layui-form-item">
<label class="layui-form-label">盘点结果:</label>
<div class="layui-input-block">
<select name="takingResult" id="result">
</select>
</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>
</div>
<i class="layui-icon layui-icon-addition" style="display: inline"
onclick="addItem(this)"></i>
</div>
</fieldset>
<!-- 提交按钮--> <!-- 提交按钮-->
<div class="layui-form-item" style="margin-top: 10px;"> <div class="layui-form-item" style="margin-top: 10px;">

39
target/classes/templates/pages/material/material-out.html
View File

@ -15,6 +15,7 @@
<div class="layuimini-container"> <div class="layuimini-container">
<div class="layuimini-main"> <div class="layuimini-main">
<input style="display:none;" id="nowDay" th:value="${nowDay}"> <input style="display:none;" id="nowDay" th:value="${nowDay}">
<input style="display:none;" id="display" th:value="${display}">
<fieldset class="table-search-fieldset" > <fieldset class="table-search-fieldset" >
<legend>搜索信息</legend> <legend>搜索信息</legend>
@ -130,6 +131,24 @@
}); });
}); });
let cols = [
{type: "checkbox", width: 50},
{field: 'code', width: 150, title: '存货编码', sort: true},
{field: 'mname', width: 120, title: '物料名称', sort: false},
{field: 'typeName', width: 150, title: '物料种类'},
{field: 'version', width: 200, title: '规格型号', sort: false},
{field: 'unit', width: 150, title: '计量单位'},
{field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
{field: 'texture', width: 100, title: '材质'},
{field: 'brand', width: 150, title: '品牌'},
{field: 'shelfLife', width: 150, title: '保质期'},
{field: 'productionPlace', width: 150, title: '产地'},
{field: 'remark', width: 150, title: '备注'},
];
let flagForRelod = true;
table.render({ table.render({
elem: "#currentTableId", elem: "#currentTableId",
@ -166,21 +185,35 @@
{field: 'mname', width: 120, title: '物料名称', sort: false}, {field: 'mname', width: 120, title: '物料名称', sort: false},
{field: 'typeName', width: 150, title: '物料种类'}, {field: 'typeName', width: 150, title: '物料种类'},
{field: 'version', width: 200, title: '规格型号', sort: false}, {field: 'version', width: 200, title: '规格型号', sort: false},
{field: 'texture', width: 100, title: '材质'},
{field: 'unit', width: 150, title: '计量单位'}, {field: 'unit', width: 150, title: '计量单位'},
{field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
{field: 'texture', width: 100, title: '材质'},
{field: 'brand', width: 150, title: '品牌'}, {field: 'brand', width: 150, title: '品牌'},
{field: 'shelfLife', width: 150, title: '保质期'}, {field: 'shelfLife', width: 150, title: '保质期'},
{field: 'productionPlace', width: 150, title: '产地'}, {field: 'productionPlace', width: 150, title: '产地'},
{field: 'remark', width: 150, title: '备注'}, {field: 'remark', width: 150, title: '备注'},
{field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"}
] ]
], ],
limits: [10, 15, 20, 25, 50,100], limits: [10, 15, 20, 25, 50,100],
limit: 10, limit: 10,
page: true, page: true,
skin: 'line', skin: 'line',
done: function (res, curr, count) {
let display = $("#display").val();
if("inline-block" === display){
if(flagForRelod){
flagForRelod = false;
let col = {field: 'price', width: 150, title: '物料单价'};
cols.splice(6,0,col);
table.reload('currentTableId',{cols:[cols]});
}
}
}
}); });

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

@ -98,136 +98,7 @@
</div> </div>
</div> </div>
<fieldset class="table-search-fieldset"> <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
<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="openSonByMaterial"
onblur="selectMaterialByName(this)"
lay-verify="required"/>
<i class="layui-icon layui-icon-search" style="display: inline"
id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name="mid" class="layui-input" id="mid"
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="code" name="code" type="text" placeholder="请填写入物料编码"
value=""
onblur="selectCode(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 class="layui-form-item">
<label class="layui-form-label" style="height: 40px;">条形编码:</label>
<div class="layui-input-block" style="margin: 0px;">
<div class="inputdiv">
<select id="barCode" name="barCode"
style="border-style: none">
</select>
<img src="/static/images/search.ico" height="16" width="16"
id="barCodeImg"
style="margin-top: 10px"
onclick="scanBarCodeForTaking(this)">
</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>
</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>
</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>
</div>
<div class="layui-form-item">
<label class="layui-form-label">计量单位:</label>
<div class="layui-input-block">
<select id="unit" name="unit"></select>
</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">
</select>
</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>
</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>
</div>
<div class="layui-form-item">
<label class="layui-form-label">盘点结果:</label>
<div class="layui-input-block">
<select name="takingResult" id="result">
</select>
</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>
</div>
<i class="layui-icon layui-icon-addition" style="display: inline"
onclick="addItem(this)"></i>
</div>
</fieldset>
<!-- 提交按钮--> <!-- 提交按钮-->
<div class="layui-form-item" style="margin-top: 10px;"> <div class="layui-form-item" style="margin-top: 10px;">

Write Preview
Loading…
Cancel
Save