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

完善订单明细导入中库存的计算逻辑

Browse Source
This commit is contained in:
季圣华
2023-05-23 23:29:21 +08:00
parent 9d7bab1aa0
commit 54b952dd4c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -1116,7 +1116,7 @@ public class DepotItemService {
return depotItemMapperEx.getCountByMaterialAndDepot(mId, depotId); return depotItemMapperEx.getCountByMaterialAndDepot(mId, depotId);
} }
public JSONObject parseMapByExcelData(String barCodes, List<Map<String, String>> detailList, String prefixNo) { public JSONObject parseMapByExcelData(String barCodes, List<Map<String, String>> detailList, String prefixNo) throws Exception {
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
JSONArray arr = new JSONArray(); JSONArray arr = new JSONArray();
List<MaterialVo4Unit> list = depotItemMapperEx.getBillItemByParam(barCodes); List<MaterialVo4Unit> list = depotItemMapperEx.getBillItemByParam(barCodes);
@@ -1142,7 +1142,12 @@ public class DepotItemService {
if(StringUtil.isNotEmpty(m.getSku())) { if(StringUtil.isNotEmpty(m.getSku())) {
item.put("sku", m.getSku()); item.put("sku", m.getSku());
} }
BigDecimal stock = depotItemMapperEx.getCurrentStockByParam(null, m.getId()); BigDecimal stock = BigDecimal.ZERO;
if(StringUtil.isNotEmpty(m.getSku())){
stock = getSkuStockByParam(null, m.getMeId(),null,null);
} else {
stock = depotItemMapperEx.getCurrentStockByParam(null, m.getId());
}
item.put("stock", stock); item.put("stock", stock);
item.put("unit", m.getCommodityUnit()); item.put("unit", m.getCommodityUnit());
BigDecimal operNumber = BigDecimal.ZERO; BigDecimal operNumber = BigDecimal.ZERO;