purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化商品的sku库存

Browse Source
This commit is contained in:
季圣华
2021-09-22 00:18:42 +08:00
parent 69e4034457
commit efb1e828e0
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -123,9 +123,8 @@ public class DepotItemController {
List<MaterialVo4Unit> list = materialService.getMaterialByBarCode(barCode);
if(list!=null && list.size()>0) {
MaterialVo4Unit materialVo4Unit = list.get(0);
BigDecimal skuStock = depotItemService.getSkuStockByParam(depotId,materialVo4Unit.getMeId(),null,null);
if(skuStock.compareTo(BigDecimal.ZERO)!=0){
stock = skuStock;
if(StringUtil.isNotEmpty(materialVo4Unit.getSku())){
stock = depotItemService.getSkuStockByParam(depotId,materialVo4Unit.getMeId(),null,null);
} else {
stock = depotItemService.getStockByParam(depotId,materialVo4Unit.getId(),null,null);
String commodityUnit = materialVo4Unit.getCommodityUnit();
@@ -179,9 +178,8 @@ public class DepotItemController {
item.put("materialOther", getOtherInfo(mpArr, diEx));
Integer ratio = diEx.getRatio();
BigDecimal stock;
BigDecimal skuStock = depotItemService.getSkuStockByParam(diEx.getDepotId(),diEx.getMaterialExtendId(),null,null);
if(skuStock.compareTo(BigDecimal.ZERO)!=0){
stock = skuStock;
if(StringUtil.isNotEmpty(diEx.getSku())){
stock = depotItemService.getSkuStockByParam(diEx.getDepotId(),diEx.getMaterialExtendId(),null,null);
} else {
stock = depotItemService.getStockByParam(diEx.getDepotId(),diEx.getMaterialId(),null,null);
if(ratio!=null){

10
jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -200,9 +200,8 @@ public class MaterialController {
item.put("unit", material.getCommodityUnit() + ratio);
item.put("sku", material.getSku());
BigDecimal stock;
BigDecimal skuStock = depotItemService.getSkuStockByParam(depotId,material.getMeId(),null,null);
if(skuStock.compareTo(BigDecimal.ZERO)!=0){
stock = skuStock;
if(StringUtil.isNotEmpty(material.getSku())){
stock = depotItemService.getSkuStockByParam(depotId,material.getMeId(),null,null);
} else {
stock = depotItemService.getStockByParam(depotId,material.getId(),null,null);
if (material.getUnitId()!=null){
@@ -493,9 +492,8 @@ public class MaterialController {
mvo.setDepotId(depotId);
//库存
BigDecimal stock;
BigDecimal skuStock = depotItemService.getSkuStockByParam(depotId,mvo.getMeId(),null,null);
if(skuStock.compareTo(BigDecimal.ZERO)!=0){
stock = skuStock;
if(StringUtil.isNotEmpty(mvo.getSku())){
stock = depotItemService.getSkuStockByParam(depotId,mvo.getMeId(),null,null);
} else {
stock = depotItemService.getStockByParam(depotId,mvo.getId(),null,null);
if (mvo.getUnitId()!=null){