From ed32ab54678ceafeed48fb48ba2c60661e10a2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 30 Jul 2020 23:46:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BA=8F=E5=88=97=E5=8F=B7?= =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/datasource/mappers/MaterialCategoryMapperEx.java | 2 +- .../jsh/erp/datasource/mappers/SerialNumberMapperEx.java | 6 +++--- .../service/materialCategory/MaterialCategoryService.java | 2 +- .../jsh/erp/service/serialNumber/SerialNumberService.java | 8 ++++---- .../resources/mapper_xml/MaterialCategoryMapperEx.xml | 3 +++ 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java index 80787581..063b3634 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java @@ -34,7 +34,7 @@ public interface MaterialCategoryMapperEx { int editMaterialCategory(MaterialCategory mc); - List getMaterialCategoryBySerialNo(@Param("serialNo") String serialNo); + List getMaterialCategoryBySerialNo(@Param("serialNo") String serialNo, @Param("id") Long id); List getMaterialCategoryListByCategoryIds(@Param("parentIds") String[] categoryIds); } diff --git a/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java index d934ec7c..bdd085f4 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java @@ -45,17 +45,17 @@ public interface SerialNumberMapperEx { /** * 查询符合条件的序列号数量 * */ - int countSerialNumberByMaterialIdAndDepotheadId(@Param("materialId")Long materialId, @Param("depotheadId")Long depotheadId, @Param("isSell")String isSell); + int countSerialNumberByMaterialIdAndDepotheadId(@Param("materialId")Long materialId, @Param("depotHeadId")Long depotHeadId, @Param("isSell")String isSell); /** * 卖出： update jsh_serial_number set is_Sell='1' ,depothead_Id='depotheadId' where 1=1 and material_Id='materialId' * and is_Sell !='1' and delete_Flag !='1' {limit 0，count} * */ - int sellSerialNumber(@Param("materialId")Long materialId, @Param("depotheadId")Long depotheadId,@Param("count")Integer count, @Param("updateTime") Date updateTime,@Param("updater") Long updater); + int sellSerialNumber(@Param("materialId")Long materialId, @Param("depotHeadId")Long depotHeadId,@Param("count")Integer count, @Param("updateTime") Date updateTime,@Param("updater") Long updater); /** * 赎回：update jsh_serial_number set is_Sell='0' where 1=1 and material_Id='materialId' * and depothead_Id='depotheadId' and is_Sell ！='0' and delete_Flag !='1' {limit 0，count} * */ - int cancelSerialNumber(@Param("materialId")Long materialId, @Param("depotheadId")Long depotheadId, @Param("count")Integer count, @Param("updateTime") Date updateTime,@Param("updater") Long updater); + int cancelSerialNumber(@Param("materialId")Long materialId, @Param("depotHeadId")Long depotHeadId, @Param("count")Integer count, @Param("updateTime") Date updateTime,@Param("updater") Long updater); /** * 批量添加序列号 * */ diff --git a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java index 2ce4540a..8a332196 100644 --- a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java +++ b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java @@ -320,7 +320,7 @@ public class MaterialCategoryService { //根据商品类别编号查询商品类别 List mList=null; try{ - mList= materialCategoryMapperEx.getMaterialCategoryBySerialNo(mc.getSerialNo()); + mList= materialCategoryMapperEx.getMaterialCategoryBySerialNo(mc.getSerialNo(), mc.getId()); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java index 1dbfddb8..15720830 100644 --- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java +++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java @@ -428,10 +428,10 @@ public class SerialNumberService { * @return com.jsh.erp.datasource.entities.SerialNumberEx */ @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int sellSerialNumber(Long materialId, Long depotheadId,int count,User user) throws Exception{ + public int sellSerialNumber(Long materialId, Long depotHeadId,int count,User user) throws Exception{ int result=0; try{ - result = serialNumberMapperEx.sellSerialNumber(materialId,depotheadId,count,new Date(),user==null?null:user.getId()); + result = serialNumberMapperEx.sellSerialNumber(materialId,depotHeadId,count,new Date(),user==null?null:user.getId()); }catch(Exception e){ JshException.writeFail(logger, e); } @@ -450,10 +450,10 @@ public class SerialNumberService { * @return com.jsh.erp.datasource.entities.SerialNumberEx */ @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int cancelSerialNumber(Long materialId, Long depotheadId,int count,User user) throws Exception{ + public int cancelSerialNumber(Long materialId, Long depotHeadId,int count,User user) throws Exception{ int result=0; try{ - result = serialNumberMapperEx.cancelSerialNumber(materialId,depotheadId,count,new Date(),user==null?null:user.getId()); + result = serialNumberMapperEx.cancelSerialNumber(materialId,depotHeadId,count,new Date(),user==null?null:user.getId()); }catch(Exception e){ JshException.writeFail(logger, e); } diff --git a/src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml b/src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml index 275a98fc..83a8258b 100644 --- a/src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml @@ -105,6 +105,9 @@ FROM jsh_material_category where 1=1 and serial_no=#{serialNo} + + and id!=#{id} + and ifnull(status,'0') !='2'