From 54b952dd4c2ca1969c00e5e5ee80a71e139fdb57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 23 May 2023 23:29:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=A2=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=AF=BC=E5=85=A5=E4=B8=AD=E5=BA=93=E5=AD=98=E7=9A=84?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/service/depotItem/DepotItemService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index a1c27129..d9aa803e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -1116,7 +1116,7 @@ public class DepotItemService { return depotItemMapperEx.getCountByMaterialAndDepot(mId, depotId); } - public JSONObject parseMapByExcelData(String barCodes, List> detailList, String prefixNo) { + public JSONObject parseMapByExcelData(String barCodes, List> detailList, String prefixNo) throws Exception { JSONObject map = new JSONObject(); JSONArray arr = new JSONArray(); List list = depotItemMapperEx.getBillItemByParam(barCodes); @@ -1142,7 +1142,12 @@ public class DepotItemService { if(StringUtil.isNotEmpty(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("unit", m.getCommodityUnit()); BigDecimal operNumber = BigDecimal.ZERO;