From 9307855a39db5e9a93af0a3a37a7ba780a381bf2 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Tue, 17 Dec 2024 23:44:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=BA=93=E5=AD=98=E7=9A=84=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/entities/MaterialVo4Unit.java | 13 ++++++++++++ .../mappers/MaterialCurrentStockMapperEx.java | 1 - .../mappers/MaterialInitialStockMapperEx.java | 3 +++ .../erp/service/material/MaterialService.java | 21 +++++++++++++++++++ .../MaterialInitialStockMapperEx.xml | 12 +++++++++++ 5 files changed, 49 insertions(+), 1 deletion(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java index 31a7b1ec3..a737ebd7c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java @@ -51,6 +51,11 @@ public class MaterialVo4Unit extends Material{ */ private String bigUnitStock; + /** + * 换算为大单位的初始库存 + */ + private String bigUnitInitialStock; + private String imgSmall; private String imgLarge; @@ -246,4 +251,12 @@ public class MaterialVo4Unit extends Material{ public void setImgLarge(String imgLarge) { this.imgLarge = imgLarge; } + + public String getBigUnitInitialStock() { + return bigUnitInitialStock; + } + + public void setBigUnitInitialStock(String bigUnitInitialStock) { + this.bigUnitInitialStock = bigUnitInitialStock; + } } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java index 74a8d2dca..3d1de2cc4 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java @@ -1,7 +1,6 @@ package com.jsh.erp.datasource.mappers; import com.jsh.erp.datasource.entities.MaterialCurrentStock; -import com.jsh.erp.datasource.entities.MaterialCurrentStockExample; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialInitialStockMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialInitialStockMapperEx.java index 9dbce84f1..63dbf206f 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialInitialStockMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialInitialStockMapperEx.java @@ -11,6 +11,9 @@ public interface MaterialInitialStockMapperEx { int batchInsert(List list); + List getInitialStockMapByIdList( + @Param("materialIdList") List materialIdList); + List getListExceptZero(); void batchDeleteByDepots(@Param("ids") String ids[]); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java index 9f86875eb..6a5177b86 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -138,6 +138,7 @@ public class MaterialService { list= materialMapperEx.selectByConditionMaterial(materialParam, standard, model, color, brand, mfrs, materialOther, weight, expiryNum, enableSerialNumber, enableBatchNumber, position, enabled, remark, idList, mpList, offset, rows); if (null != list && list.size()>0) { + Map initialStockMap = getInitialStockMapByMaterialList(list); Map currentStockMap = getCurrentStockMapByMaterialList(list); for (MaterialVo4Unit m : list) { if(fileUploadType == 2) { @@ -145,6 +146,8 @@ public class MaterialService { m.setImgLarge("large"); } m.setMaterialOther(getMaterialOtherByParam(mpArr, m)); + m.setInitialStock(initialStockMap.get(m.getId())!=null? initialStockMap.get(m.getId()): BigDecimal.ZERO); + m.setBigUnitInitialStock(getBigUnitStock(m.getInitialStock(), m.getUnitId())); m.setStock(currentStockMap.get(m.getId())!=null? currentStockMap.get(m.getId()): BigDecimal.ZERO); m.setBigUnitStock(getBigUnitStock(m.getStock(), m.getUnitId())); resList.add(m); @@ -1267,6 +1270,24 @@ public class MaterialService { return stock; } + /** + * 根据商品列表获取初始库存Map + * @param list + * @return + */ + public Map getInitialStockMapByMaterialList(List list) { + Map map = new HashMap<>(); + List materialIdList = new ArrayList<>(); + for(MaterialVo4Unit materialVo4Unit: list) { + materialIdList.add(materialVo4Unit.getId()); + } + List mcsList = materialInitialStockMapperEx.getInitialStockMapByIdList(materialIdList); + for(MaterialInitialStock materialInitialStock: mcsList) { + map.put(materialInitialStock.getMaterialId(), materialInitialStock.getNumber()); + } + return map; + } + /** * 根据商品列表获取当前库存Map * @param list diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml index f708accf2..8b80b06fe 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml @@ -10,6 +10,18 @@ + + +