From f90aa299aa9965381f3c024432cf45c85568302f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sat, 12 Oct 2019 15:03:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84=E5=BA=93=E5=AD=98=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/entities/MaterialVo4Unit.java | 6 +-- .../datasource/mappers/DepotItemMapperEx.java | 17 ++------ .../service/depotItem/DepotItemService.java | 14 ------ .../erp/service/material/MaterialService.java | 5 +-- .../mapper_xml/DepotItemMapperEx.xml | 43 +++++++++---------- 5 files changed, 30 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java b/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java index e52028cb..95bea4ac 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java +++ b/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java @@ -10,7 +10,7 @@ public class MaterialVo4Unit extends Material{ private String materialOther; - private Long stock; + private BigDecimal stock; public String getUnitName() { return unitName; @@ -36,11 +36,11 @@ public class MaterialVo4Unit extends Material{ this.materialOther = materialOther; } - public Long getStock() { + public BigDecimal getStock() { return stock; } - public void setStock(Long stock) { + public void setStock(BigDecimal stock) { this.stock = stock; } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java index 12997d77..19ec08bf 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java @@ -36,12 +36,6 @@ public interface DepotItemMapperEx { Long findDetailByTypeAndMaterialIdCounts( @Param("mId") Long mId); - Long findByTypeAndMaterialIdIn( - @Param("mId") Long mId); - - Long findByTypeAndMaterialIdOut( - @Param("mId") Long mId); - List getDetailList( @Param("headerId") Long headerId); @@ -77,12 +71,10 @@ public interface DepotItemMapperEx { @Param("tenantId") Long tenantId); /** - * create by: cjl - * description: - * 通过单据主表id查询所有单据子表数据 - * create time: 2019/1/24 16:56 - * @Param: depotheadId - * @return java.util.List + * 通过单据主表id查询所有单据子表数据 + * @param depotheadId + * @param enableSerialNumber + * @return */ List findDepotItemListBydepotheadId(@Param("depotheadId")Long depotheadId, @Param("enableSerialNumber")String enableSerialNumber); @@ -103,7 +95,6 @@ public interface DepotItemMapperEx { List getDepotItemListListByMaterialIds(@Param("materialIds") String[] materialIds); - List findStockWarningCount(@Param("offset") Integer offset, @Param("rows") Integer rows, @Param("pid") Integer pid); diff --git a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index c5ae239e..1980be81 100644 --- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -215,20 +215,6 @@ public class DepotItemService { return result; } - public Long findByTypeAndMaterialId(String type, Long mId) throws Exception{ - Long result = 0l; - try{ - if(type.equals(TYPE)) { - result= depotItemMapperEx.findByTypeAndMaterialIdIn(mId); - } else { - result= depotItemMapperEx.findByTypeAndMaterialIdOut(mId); - } - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; - } - public List getDetailList(Long headerId)throws Exception { List list =null; try{ diff --git a/src/main/java/com/jsh/erp/service/material/MaterialService.java b/src/main/java/com/jsh/erp/service/material/MaterialService.java index 4dc9df06..fb90474e 100644 --- a/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -100,9 +100,8 @@ public class MaterialService { } } m.setMaterialOther(materialOther); - Long InSum = depotItemService.findByTypeAndMaterialId("入库", m.getId()); - Long OutSum = depotItemService.findByTypeAndMaterialId("出库", m.getId()); - m.setStock(InSum - OutSum); + Long tenantId = m.getTenantId(); + m.setStock(depotItemService.getStockByParam(null,m.getId(),null,null,tenantId)); resList.add(m); } } diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 0e48c137..a5e7af1c 100644 --- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -40,6 +40,7 @@ + @@ -76,6 +77,7 @@ limit #{offset},#{rows} + select dh.Number,concat(dh.SubType,dh.Type) as newType, - case when type='入库' then ifnull(di.BasicNumber,0) when type='出库' then 0-di.BasicNumber else 0 end as b_num, + case + when type='入库' then ifnull(di.BasicNumber,0) + when type='出库' then 0-di.BasicNumber + when dh.SubType='组装单' and di.MType='组合件' then ifnull(di.BasicNumber,0) + when dh.SubType='组装单' and di.MType='普通子件' then 0-di.BasicNumber + when dh.SubType='拆卸单' and di.MType='普通子件' then ifnull(di.BasicNumber,0) + when dh.SubType='拆卸单' and di.MType='组合件' then 0-di.BasicNumber + else 0 + end + as b_num, date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1' - where dh.type!='其它' - and dh.SubType!='调拨' + where ((dh.type!='其它' and dh.SubType!='调拨') + or (dh.type='其它' and dh.SubType='组装单') + or (dh.type='其它' and dh.SubType='拆卸单')) and di.MaterialId =${mId} and ifnull(dh.delete_Flag,'0') !='1' ORDER BY oTime desc @@ -108,6 +120,7 @@ limit #{offset},#{rows} + - - - - + delete from jsh_depotitem where 1=1 @@ -264,6 +261,7 @@ ) + update jsh_depotitem set delete_Flag='1' @@ -275,6 +273,7 @@ ) + update jsh_depotitem set delete_Flag='1' @@ -285,6 +284,7 @@ ) + + - -