Skip to content
GitLab
Commit feb85c60 authored by 季圣华's avatar 季圣华
Browse files

优化商品的库存明细

parent c22f9262
Hide whitespace changes
Inline Side-by-side
erp_web/pages/materials/material.html
View file @ feb85c60
......@@ -66,9 +66,16 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="materialDetailListDlg" class="easyui-dialog" style="width:900px;height:500px;padding:10px 20px" closed="true"
<div id="materialDetailListDlg" class="easyui-dialog" style="padding:10px 20px" fit="true" closed="true"
modal="true" collapsible="false" closable="true">
<table id="materialTableData" style="top:50px;border-bottom-color:#FFFFFF"></table>
<div id="cc" class="easyui-layout" data-options="fit:true">
<div data-options="region:'west',title:'库存详情'" style="width:400px;">
<div id="initDepotShow"></div>
</div>
<div data-options="region:'center',title:'出入库明细'">
<table id="materialTableData" style="top:50px;border-bottom-color:#FFFFFF" data-options="fit:true"></table>
</div>
</div>
</div>
<div id="materialDlg" class="easyui-dialog" style="padding:10px 20px" fit="true"
......@@ -431,7 +438,7 @@
{
title: '库存', field: 'stock', width: 70, formatter: function (value, rec) {
var str = '';
str += '<span title="查看出入库明细" class="n-link" onclick="findStockList(' + rec.id + ');">' + rec.stock + '</span>';
str += '<span title="查看库存及明细" class="n-link" onclick="findStockList(' + rec.id + ');">' + rec.stock + '</span>';
return str;
}
},
......@@ -518,7 +525,7 @@
//初始化表格数据
function initMaterialDetailData(mId) {
$('#materialTableData').datagrid({
height: 435,
height: heightInfo,
nowrap: false,
rownumbers: false,
//动画效果
......@@ -641,8 +648,9 @@
}
function findStockList(mId) {
$('#materialDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;查看出入库明细');
$('#materialDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;查看库存及明细');
$(".window-mask").css({width: webW, height: webH});
initDepotList(mId, "show"); //加载仓库及库存数量
initMaterialDetailData(mId);
getMaterialInOutList(mId, 1, initPageSize);
ininMaterialDetailPager(mId);
......@@ -988,7 +996,7 @@
oldManyUnit = "";
materialID = 0;
url = '/material/add';
initDepotList(materialID); //加载仓库列表页面
initDepotList(materialID, "edit"); //加载仓库列表页面
}
//商品价格扩展
......@@ -1288,10 +1296,10 @@
//选中基本资料tab
$("#materialFM #tt .tabs li").first().click();
url = '/material/update?id=' + rowsdata.id;
initDepotList(rowsdata.id); //加载仓库列表页面
initDepotList(rowsdata.id, "edit"); //加载仓库列表页面
}
function initDepotList(mId) {
function initDepotList(mId, type) {
$.ajax({
type: "get",
url: "/depot/getAllListWithStock?mId=" + mId,
......@@ -1301,18 +1309,33 @@
if (res && res.code == 200) {
var json = {};
json.depotList = res.data;
$.ajax({
type: "get",
url: "../../../pages/template/init_depot_list.html?2121",
async: false,
success: function (tem) {
if (tem) {
var template = Handlebars.compile(tem);
var htmlValue = template(json);
$("#initDepot").html(htmlValue);
if(type == "edit"){
$.ajax({
type: "get",
url: "../../../pages/template/init_depot_list.html?2121",
async: false,
success: function (tem) {
if (tem) {
var template = Handlebars.compile(tem);
var htmlValue = template(json);
$("#initDepot").html(htmlValue);
}
}
}
});
});
} else if(type == "show"){
$.ajax({
type: "get",
url: "../../../pages/template/init_depot_show_list.html?888",
async: false,
success: function (tem) {
if (tem) {
var template = Handlebars.compile(tem);
var htmlValue = template(json);
$("#initDepotShow").html(htmlValue);
}
}
});
}
}
}
});
......@@ -1585,7 +1608,7 @@
if(!unit) {
//此时为多单位
if (meList.length<2){
$.messager.alert('提示',"多单位商品的条码数量应该大于2！",'warning');
$.messager.alert('提示',"多单位的商品条码行数至少要有两行，请再新增一行条码信息！",'warning');
return;
}
}
......
erp_web/pages/template/init_depot_show_list.html 0 → 100644
View file @ feb85c60
<table>
{{#depotList}}
<tr>
<td style="width:130px;height:30px;line-height:30px;padding:8px;float:left;" title="{{name}}">
<p style="width:110px;overflow: hidden;white-space:nowrap;text-overflow: ellipsis;">{{name}}</p>
</td>
<td style="width:120px;height:30px;line-height:30px;padding:8px;float:left;">初始库存：{{stock}}</td>
<td style="width:120px;height:30px;line-height:30px;padding:8px;float:left;">总计库存：{{allStock}}</td>
</tr>
{{/depotList}}
</table>
\ No newline at end of file
src/main/java/com/jsh/erp/controller/DepotController.java
View file @ feb85c60
......@@ -199,9 +199,12 @@ public class DepotController {
DepotEx de = new DepotEx();
if(mId!=0) {
BigDecimal stock = materialService.getInitStock(mId, depot.getId());
BigDecimal currentStock = materialService.getCurrentStock(mId, depot.getId());
de.setStock(stock);
de.setAllStock(stock.add(currentStock));
} else {
de.setStock(BigDecimal.ZERO);
de.setAllStock(BigDecimal.ZERO);
}
de.setId(depot.getId());
de.setName(depot.getName());
......
src/main/java/com/jsh/erp/datasource/entities/DepotEx.java
View file @ feb85c60
......@@ -17,4 +17,6 @@ public class DepotEx extends Depot{
private BigDecimal stock;
private BigDecimal allStock;
}
src/main/java/com/jsh/erp/service/material/MaterialService.java
View file @ feb85c60
......@@ -60,6 +60,8 @@ public class MaterialService {
@Resource
private MaterialInitialStockMapper materialInitialStockMapper;
@Resource
private MaterialCurrentStockMapper materialCurrentStockMapper;
@Resource
private DepotService depotService;
@Resource
private MaterialExtendService materialExtendService;
......@@ -704,7 +706,7 @@ public class MaterialService {
}
/**
* 根据产品和仓库获取初始库存
* 根据商品和仓库获取初始库存
* @param materialId
* @param depotId
* @return
......@@ -722,7 +724,7 @@ public class MaterialService {
}
/**
* 根据产品获取初始库存
* 根据商品获取初始库存
* @param materialId
* @return
*/
......@@ -747,6 +749,24 @@ public class MaterialService {
return stock;
}
/**
* 根据商品和仓库获取当前库存
* @param materialId
* @param depotId
* @return
*/
public BigDecimal getCurrentStock(Long materialId, Long depotId) {
BigDecimal stock = BigDecimal.ZERO;
MaterialCurrentStockExample example = new MaterialCurrentStockExample();
example.createCriteria().andMaterialIdEqualTo(materialId).andDepotIdEqualTo(depotId)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<MaterialCurrentStock> list = materialCurrentStockMapper.selectByExample(example);
if(list!=null && list.size()>0) {
stock = list.get(0).getCurrentNumber();
}
return stock;
}
public List<MaterialVo4Unit> getMaterialByMeId(Long meId) {
List<MaterialVo4Unit> result = new ArrayList<MaterialVo4Unit>();
try{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment