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

优化商品条码查询获取商品信息接口

Browse Source
This commit is contained in:
季圣华
2021-10-09 00:04:44 +08:00
parent 39e9eeae05
commit d5bb4616a3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,13 +491,16 @@ public class MaterialController {
Boolean isDefault = depotObj.getBoolean("isDefault"); Boolean isDefault = depotObj.getBoolean("isDefault");
if(isDefault) { if(isDefault) {
Long depotId = depotObj.getLong("id"); Long depotId = depotObj.getLong("id");
mvo.setDepotId(depotId); if(!"CGDD".equals(prefixNo) && !"XSDD".equals(prefixNo) ) {
//除订单之外的单据才有仓库
mvo.setDepotId(depotId);
}
//库存 //库存
BigDecimal stock; BigDecimal stock;
if(StringUtil.isNotEmpty(mvo.getSku())){ if(StringUtil.isNotEmpty(mvo.getSku())){
stock = depotItemService.getSkuStockByParam(depotId,mvo.getMeId(),null,null); stock = depotItemService.getSkuStockByParam(mvo.getDepotId(),mvo.getMeId(),null,null);
} else { } else {
stock = depotItemService.getStockByParam(depotId,mvo.getId(),null,null); stock = depotItemService.getStockByParam(mvo.getDepotId(),mvo.getId(),null,null);
if (mvo.getUnitId()!=null){ if (mvo.getUnitId()!=null){
Unit unit = unitService.getUnit(mvo.getUnitId()); Unit unit = unitService.getUnit(mvo.getUnitId());
if(mvo.getCommodityUnit().equals(unit.getOtherUnit())) { if(mvo.getCommodityUnit().equals(unit.getOtherUnit())) {