From d0f56f8413d79f466d1d7f84a4e2279835336057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 25 Dec 2020 22:26:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E7=9A=84?=
=?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
erp_web/pages/materials/material.html | 10 +++--
.../pages/template/init_depot_show_list.html | 4 +-
.../jsh/erp/controller/DepotController.java | 10 ++---
.../jsh/erp/datasource/entities/DepotEx.java | 4 +-
.../erp/service/material/MaterialService.java | 40 ++++++++++---------
5 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index ca37c300..8acc923f 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -434,7 +434,8 @@
{
title: '库存', field: 'stock', width: 70, formatter: function (value, rec) {
var str = '';
- str += '' + rec.stock + '';
+ str += '' + rec.stock + '';
return str;
}
},
@@ -643,8 +644,9 @@
}
}
- function findStockList(mId) {
- $('#materialDetailListDlg').dialog('open').dialog('setTitle', '
查看库存及明细');
+ function findStockList(mId, barCode, name) {
+ var titleInfo = " " + name + "[" + barCode + "]库存及明细";
+ $('#materialDetailListDlg').dialog('open').dialog('setTitle', '' + titleInfo);
$(".window-mask").css({width: webW, height: webH});
initDepotList(mId, "show"); //加载仓库及库存数量
initMaterialDetailData(mId);
@@ -1321,7 +1323,7 @@
} else if(type == "show"){
$.ajax({
type: "get",
- url: "../../../pages/template/init_depot_show_list.html?888",
+ url: "../../../pages/template/init_depot_show_list.html?555",
async: false,
success: function (tem) {
if (tem) {
diff --git a/erp_web/pages/template/init_depot_show_list.html b/erp_web/pages/template/init_depot_show_list.html
index 26ebe3e8..5d8cd4f7 100644
--- a/erp_web/pages/template/init_depot_show_list.html
+++ b/erp_web/pages/template/init_depot_show_list.html
@@ -9,8 +9,8 @@
{{name}}
|
- {{stock}} |
- {{allStock}} |
+ {{initStock}} |
+ {{currentStock}} |
{{/depotList}}
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/controller/DepotController.java b/src/main/java/com/jsh/erp/controller/DepotController.java
index b461b957..985aef26 100644
--- a/src/main/java/com/jsh/erp/controller/DepotController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotController.java
@@ -198,13 +198,13 @@ public class DepotController {
for(Depot depot: list) {
DepotEx de = new DepotEx();
if(mId!=0) {
- BigDecimal stock = materialService.getInitStock(mId, depot.getId());
+ BigDecimal initStock = materialService.getInitStock(mId, depot.getId());
BigDecimal currentStock = materialService.getCurrentStock(mId, depot.getId());
- de.setStock(stock);
- de.setAllStock(stock.add(currentStock));
+ de.setInitStock(initStock);
+ de.setCurrentStock(currentStock);
} else {
- de.setStock(BigDecimal.ZERO);
- de.setAllStock(BigDecimal.ZERO);
+ de.setInitStock(BigDecimal.ZERO);
+ de.setCurrentStock(BigDecimal.ZERO);
}
de.setId(depot.getId());
de.setName(depot.getName());
diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotEx.java b/src/main/java/com/jsh/erp/datasource/entities/DepotEx.java
index 2ede10ec..42f4ab56 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/DepotEx.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/DepotEx.java
@@ -15,8 +15,8 @@ public class DepotEx extends Depot{
//负责人名字
private String principalName;
- private BigDecimal stock;
+ private BigDecimal initStock;
- private BigDecimal allStock;
+ private BigDecimal currentStock;
}
diff --git a/src/main/java/com/jsh/erp/service/material/MaterialService.java b/src/main/java/com/jsh/erp/service/material/MaterialService.java
index ab95606f..77451ce9 100644
--- a/src/main/java/com/jsh/erp/service/material/MaterialService.java
+++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java
@@ -742,25 +742,7 @@ public class MaterialService {
}
/**
- * 根据商品和仓库获取初始库存
- * @param materialId
- * @param depotId
- * @return
- */
- public BigDecimal getInitStock(Long materialId, Long depotId) {
- BigDecimal stock = BigDecimal.ZERO;
- MaterialInitialStockExample example = new MaterialInitialStockExample();
- example.createCriteria().andMaterialIdEqualTo(materialId).andDepotIdEqualTo(depotId)
- .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
- List list = materialInitialStockMapper.selectByExample(example);
- if(list!=null && list.size()>0) {
- stock = list.get(0).getNumber();
- }
- return stock;
- }
-
- /**
- * 根据商品获取初始库存
+ * 根据商品获取初始库存，仓库为空的时候查全部库存
* @param materialId
* @return
*/
@@ -785,6 +767,24 @@ public class MaterialService {
return stock;
}
+ /**
+ * 根据商品和仓库获取初始库存
+ * @param materialId
+ * @param depotId
+ * @return
+ */
+ public BigDecimal getInitStock(Long materialId, Long depotId) {
+ BigDecimal stock = BigDecimal.ZERO;
+ MaterialInitialStockExample example = new MaterialInitialStockExample();
+ example.createCriteria().andMaterialIdEqualTo(materialId).andDepotIdEqualTo(depotId)
+ .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+ List list = materialInitialStockMapper.selectByExample(example);
+ if(list!=null && list.size()>0) {
+ stock = list.get(0).getNumber();
+ }
+ return stock;
+ }
+
/**
* 根据商品和仓库获取当前库存
* @param materialId
@@ -799,6 +799,8 @@ public class MaterialService {
List list = materialCurrentStockMapper.selectByExample(example);
if(list!=null && list.size()>0) {
stock = list.get(0).getCurrentNumber();
+ } else {
+ stock = getInitStock(materialId,depotId);
}
return stock;
}