From d23f1f411709800146a2a2789a13863047dd34dc 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, 18 Feb 2020 23:26:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9D=A1=E7=A0=81=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E8=B6=85=E9=95=BF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/pages/materials/material.html | 9 +++ .../mappers/MaterialExtendMapperEx.java | 2 + .../MaterialExtend/MaterialExtendService.java | 58 ------------------- .../erp/service/material/MaterialService.java | 16 ++--- .../mapper_xml/MaterialExtendMapperEx.xml | 12 ++++ .../resources/mapper_xml/MaterialMapperEx.xml | 2 + 6 files changed, 34 insertions(+), 65 deletions(-) diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html index c74bd15c..038c4fdb 100644 --- a/erp_web/pages/materials/material.html +++ b/erp_web/pages/materials/material.html @@ -1606,6 +1606,7 @@ function CheckData() { var row = $('#materialExtendData').datagrid('getRows'); var totalRowNum = ""; + var totalBarCodeOverNum = ""; for (var i = 0; i < row.length; i++) { if (row[i].BarCode == "") { totalRowNum += (i + 1) + "、"; @@ -1613,12 +1614,20 @@ if (row[i].CommodityUnit == "") { totalRowNum += (i + 1) + "、"; } + if (row[i].BarCode.length > 15) { + totalBarCodeOverNum += (i + 1) + "、"; + } } if (totalRowNum != "") { var totalRowNum = totalRowNum.substring(0, totalRowNum.length - 1); $.messager.alert('提示',"第" + totalRowNum + "行数据填写不完整！",'info'); return false; } + if (totalBarCodeOverNum != "") { + var totalBarCodeOverNum = totalBarCodeOverNum.substring(0, totalBarCodeOverNum.length - 1); + $.messager.alert('提示',"第" + totalBarCodeOverNum + "行条码长度超过15位！",'info'); + return false; + } return true; } diff --git a/src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java index 94fdd4ce..9eb1db01 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java @@ -20,4 +20,6 @@ public interface MaterialExtendMapperEx { @Param("syncNum") Long syncNum); List getListByMId(@Param("ids") Long ids[]); + + int batchDeleteMaterialExtendByMIds(@Param("ids") String ids[]); } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/service/MaterialExtend/MaterialExtendService.java b/src/main/java/com/jsh/erp/service/MaterialExtend/MaterialExtendService.java index 3ff3a255..90616f9d 100644 --- a/src/main/java/com/jsh/erp/service/MaterialExtend/MaterialExtendService.java +++ b/src/main/java/com/jsh/erp/service/MaterialExtend/MaterialExtendService.java @@ -268,62 +268,4 @@ public class MaterialExtendService { } return list; } - - /** - * 根据条码更新零售价 - * @param retailPrice - * @param barCode - */ - public int updateRetailPriceByCode(BigDecimal retailPrice,String barCode) { - int result=0; - try{ - MaterialExtend materialExtend = new MaterialExtend(); - materialExtend.setCommodityDecimal(retailPrice); - MaterialExtendExample example = new MaterialExtendExample(); - example.createCriteria().andBarCodeEqualTo(barCode); - result = materialExtendMapper.updateByExampleSelective(materialExtend, example); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; - } - - /** - * 根据条码更新进价 - * @param purchasePrice - * @param barCode - */ - public int updatePurchasePriceByCode(BigDecimal purchasePrice,String barCode) { - int result=0; - try{ - MaterialExtend materialExtend = new MaterialExtend(); - materialExtend.setPurchaseDecimal(purchasePrice); - MaterialExtendExample example = new MaterialExtendExample(); - example.createCriteria().andBarCodeEqualTo(barCode); - result = materialExtendMapper.updateByExampleSelective(materialExtend, example); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; - } - - /** - * 根据条码更新进价 - * @param barCode - * @param barCode - */ - public MaterialExtend getMaterialExtendByBarCode(String barCode) { - MaterialExtend me = new MaterialExtend(); - try{ - MaterialExtendExample example = new MaterialExtendExample(); - example.createCriteria().andBarCodeEqualTo(barCode); - List list = materialExtendMapper.selectByExample(example); - if(list!=null && list.size()>0) { - me = list.get(0); - } - }catch(Exception e){ - JshException.readFail(logger, e); - } - return me; - } } 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 06c63eb4..86e51d9c 100644 --- a/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.datasource.entities.*; -import com.jsh.erp.datasource.mappers.DepotItemMapperEx; -import com.jsh.erp.datasource.mappers.MaterialMapper; -import com.jsh.erp.datasource.mappers.MaterialMapperEx; -import com.jsh.erp.datasource.mappers.MaterialStockMapper; +import com.jsh.erp.datasource.mappers.*; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.JshException; import com.jsh.erp.service.MaterialExtend.MaterialExtendService; @@ -45,6 +42,8 @@ public class MaterialService { @Resource private MaterialMapperEx materialMapperEx; @Resource + private MaterialExtendMapperEx materialExtendMapperEx; + @Resource private LogService logService; @Resource private UserService userService; @@ -603,13 +602,16 @@ public class MaterialService { ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); User userInfo=userService.getCurrentUser(); String [] idArray=ids.split(","); - int result =0; try{ - result= materialMapperEx.batchDeleteMaterialByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray); + //逻辑删除商品 + materialMapperEx.batchDeleteMaterialByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray); + //逻辑删除商品价格扩展 + materialExtendMapperEx.batchDeleteMaterialExtendByMIds(idArray); + return 1; }catch(Exception e){ JshException.writeFail(logger, e); + return 0; } - return result; } /** * create by: qiankunpingtai diff --git a/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml b/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml index bef5ab06..8a483eec 100644 --- a/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialExtendMapperEx.xml @@ -53,4 +53,16 @@ ) + + + update jsh_material_extend + set delete_Flag='1' + where 1=1 + and ifnull(delete_Flag,'0') !='1' + and material_id in ( + + #{id} + + ) + \ No newline at end of file diff --git a/src/main/resources/mapper_xml/MaterialMapperEx.xml b/src/main/resources/mapper_xml/MaterialMapperEx.xml index e8c4e97d..a5722dee 100644 --- a/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -219,6 +219,8 @@