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

优化根据条码查询商品信息接口，增加仓库参数

Browse Source
This commit is contained in:
季圣华
2021-11-23 00:09:28 +08:00
parent c1cfeadf17
commit 985396ba8a
1 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -494,6 +494,7 @@ public class MaterialController {
@GetMapping(value = "/getMaterialByBarCode") @GetMapping(value = "/getMaterialByBarCode")
@ApiOperation(value = "根据条码查询商品信息") @ApiOperation(value = "根据条码查询商品信息")
public BaseResponseInfo getMaterialByBarCode(@RequestParam("barCode") String barCode, public BaseResponseInfo getMaterialByBarCode(@RequestParam("barCode") String barCode,
@RequestParam(value = "depotId", required = false) Long depotId,
@RequestParam("mpList") String mpList, @RequestParam("mpList") String mpList,
@RequestParam(required = false, value = "prefixNo") String prefixNo, @RequestParam(required = false, value = "prefixNo") String prefixNo,
HttpServletRequest request) throws Exception { HttpServletRequest request) throws Exception {
@@ -519,48 +520,38 @@ public class MaterialController {
} }
} }
mvo.setMaterialOther(expand); mvo.setMaterialOther(expand);
if("LSCK".equals(prefixNo) || "LSTH".equals(prefixNo)) { if ("LSCK".equals(prefixNo) || "LSTH".equals(prefixNo)) {
//零售价 //零售价
mvo.setBillPrice(mvo.getCommodityDecimal()); mvo.setBillPrice(mvo.getCommodityDecimal());
} else if("CGDD".equals(prefixNo) || "CGRK".equals(prefixNo) || "CGTH".equals(prefixNo) } else if ("CGDD".equals(prefixNo) || "CGRK".equals(prefixNo) || "CGTH".equals(prefixNo)
|| "QTRK".equals(prefixNo) || "DBCK".equals(prefixNo) || "ZZD".equals(prefixNo) || "CXD".equals(prefixNo) || "QTRK".equals(prefixNo) || "DBCK".equals(prefixNo) || "ZZD".equals(prefixNo) || "CXD".equals(prefixNo)
|| "PDLR".equals(prefixNo) || "PDFP".equals(prefixNo) ) { || "PDLR".equals(prefixNo) || "PDFP".equals(prefixNo)) {
//采购价 //采购价
mvo.setBillPrice(mvo.getPurchaseDecimal()); mvo.setBillPrice(mvo.getPurchaseDecimal());
} else if("XSDD".equals(prefixNo) || "XSCK".equals(prefixNo) || "XSTH".equals(prefixNo) || "QTCK".equals(prefixNo)) { } else if ("XSDD".equals(prefixNo) || "XSCK".equals(prefixNo) || "XSTH".equals(prefixNo) || "QTCK".equals(prefixNo)) {
//销售价 //销售价
mvo.setBillPrice(mvo.getWholesaleDecimal()); mvo.setBillPrice(mvo.getWholesaleDecimal());
} }
//仓库id //仓库id
if (depotId == null) {
JSONArray depotArr = depotService.findDepotByCurrentUser(); JSONArray depotArr = depotService.findDepotByCurrentUser();
for(Object obj: depotArr){ for (Object obj : depotArr) {
JSONObject depotObj = JSONObject.parseObject(obj.toString()); JSONObject depotObj = JSONObject.parseObject(obj.toString());
if(depotObj.get("isDefault")!=null) { if (depotObj.get("isDefault") != null) {
Boolean isDefault = depotObj.getBoolean("isDefault"); Boolean isDefault = depotObj.getBoolean("isDefault");
if(isDefault) { if (isDefault) {
Long depotId = depotObj.getLong("id"); Long id = depotObj.getLong("id");
if(!"CGDD".equals(prefixNo) && !"XSDD".equals(prefixNo) ) { if (!"CGDD".equals(prefixNo) && !"XSDD".equals(prefixNo)) {
//除订单之外的单据才有仓库 //除订单之外的单据才有仓库
mvo.setDepotId(depotId); mvo.setDepotId(id);
}
getStockByMaterialInfo(mvo);
}
}
} }
//库存
BigDecimal stock;
if(StringUtil.isNotEmpty(mvo.getSku())){
stock = depotItemService.getSkuStockByParam(mvo.getDepotId(),mvo.getMeId(),null,null);
} else { } else {
stock = depotItemService.getStockByParam(mvo.getDepotId(),mvo.getId(),null,null); mvo.setDepotId(depotId);
if (mvo.getUnitId()!=null){ getStockByMaterialInfo(mvo);
Unit unit = unitService.getUnit(mvo.getUnitId());
if(mvo.getCommodityUnit().equals(unit.getOtherUnit())) {
if(unit.getRatio()!=0) {
stock = stock.divide(BigDecimal.valueOf(unit.getRatio()),2,BigDecimal.ROUND_HALF_UP);
}
}
}
}
mvo.setStock(stock);
}
}
} }
} }
} }
@@ -574,6 +565,29 @@ public class MaterialController {
return res; return res;
} }
/**
* 根据商品信息获取库存，进行赋值
* @param mvo
* @throws Exception
*/
private void getStockByMaterialInfo(MaterialVo4Unit mvo) throws Exception {
BigDecimal stock;
if (StringUtil.isNotEmpty(mvo.getSku())) {
stock = depotItemService.getSkuStockByParam(mvo.getDepotId(), mvo.getMeId(), null, null);
} else {
stock = depotItemService.getStockByParam(mvo.getDepotId(), mvo.getId(), null, null);
if (mvo.getUnitId() != null) {
Unit unit = unitService.getUnit(mvo.getUnitId());
if (mvo.getCommodityUnit().equals(unit.getOtherUnit())) {
if (unit.getRatio() != 0) {
stock = stock.divide(BigDecimal.valueOf(unit.getRatio()), 2, BigDecimal.ROUND_HALF_UP);
}
}
}
}
mvo.setStock(stock);
}
/** /**
* 商品库存查询 * 商品库存查询
* @param currentPage * @param currentPage