From 3f2a592efa1f6b17c2650c083ef663b290eecd24 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, 26 Dec 2020 00:20:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=8A=A5=E8=A1=A8=E9=87=8C=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=84=E6=A0=BC=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/pages/manage/organization.html | 2 - erp_web/pages/reports/buy_in_report.html | 1 + erp_web/pages/reports/in_detail.html | 5 +- erp_web/pages/reports/in_material_count.html | 7 +- .../pages/reports/in_out_stock_report.html | 3 +- erp_web/pages/reports/out_detail.html | 5 +- erp_web/pages/reports/out_material_count.html | 7 +- erp_web/pages/reports/sale_out_report.html | 1 + .../pages/reports/stock_warning_report.html | 1 + .../erp/controller/DepotItemController.java | 76 +++++++------------ .../datasource/vo/DepotHeadVo4InDetail.java | 10 +++ .../vo/DepotHeadVo4InOutMCount.java | 10 +++ .../vo/DepotItemStockWarningCount.java | 11 ++- .../erp/exception/GlobalExceptionHandler.java | 2 - .../erp/service/account/AccountService.java | 2 - .../accountHead/AccountHeadService.java | 2 - .../jsh/erp/service/depot/DepotService.java | 2 - .../service/depotItem/DepotItemService.java | 1 - .../service/inOutItem/InOutItemService.java | 2 - .../erp/service/material/MaterialService.java | 2 - .../MaterialCategoryService.java | 2 - .../com/jsh/erp/service/msg/MsgService.java | 2 - .../jsh/erp/service/person/PersonService.java | 2 - .../com/jsh/erp/service/role/RoleService.java | 2 - .../serialNumber/SerialNumberService.java | 2 - .../erp/service/supplier/SupplierService.java | 2 - .../com/jsh/erp/service/unit/UnitService.java | 2 - .../com/jsh/erp/service/user/UserService.java | 2 - .../mapper_xml/DepotHeadMapperEx.xml | 17 +++-- .../mapper_xml/DepotItemMapperEx.xml | 5 +- 30 files changed, 89 insertions(+), 101 deletions(-) diff --git a/erp_web/pages/manage/organization.html b/erp_web/pages/manage/organization.html index ac400bfb..85b9ab02 100644 --- a/erp_web/pages/manage/organization.html +++ b/erp_web/pages/manage/organization.html @@ -271,8 +271,6 @@ /** * create by: qiankunpingtai * create time: 2019/3/21 14:56 - * website：https://qiankunpingtai.cn - * description: * 提交时需要对表格内容进行校验，校验通过后提交后台处理 */ var isValid = $("#organizationFM").form('validate'); diff --git a/erp_web/pages/reports/buy_in_report.html b/erp_web/pages/reports/buy_in_report.html index 0d2e774f..9365d6bb 100644 --- a/erp_web/pages/reports/buy_in_report.html +++ b/erp_web/pages/reports/buy_in_report.html @@ -132,6 +132,7 @@ pageList: [10, 50, 100], columns: [[ {title: '名称', field: 'MaterialName', width: 160}, + {title: '规格', field: 'MaterialStandard', width: 80}, {title: '型号', field: 'MaterialModel', width: 80}, {title: '扩展信息', field: 'MaterialOther', width: 150}, {title: '单位', field: 'MaterialUnit', width: 80, diff --git a/erp_web/pages/reports/in_detail.html b/erp_web/pages/reports/in_detail.html index 7cd84626..0df0c29a 100644 --- a/erp_web/pages/reports/in_detail.html +++ b/erp_web/pages/reports/in_detail.html @@ -191,8 +191,9 @@ return '' + row.number + ''; } }, - {title: '商品名称', field: 'mname', width: 120}, - {title: '商品型号', field: 'model', width: 100}, + {title: '名称', field: 'mname', width: 120}, + {title: '规格', field: 'standard', width: 100}, + {title: '型号', field: 'model', width: 100}, {title: '单价', field: 'unitPrice', width: 60}, {title: '入库数量', field: 'operNumber', width: 80}, {title: '金额', field: 'allPrice', width: 60}, diff --git a/erp_web/pages/reports/in_material_count.html b/erp_web/pages/reports/in_material_count.html index 1557f690..1a5f5f9c 100644 --- a/erp_web/pages/reports/in_material_count.html +++ b/erp_web/pages/reports/in_material_count.html @@ -183,9 +183,10 @@ pageSize: 10, pageList: [10, 50, 100], columns: [[ - {title: '商品名称', field: 'mName', width: 150}, - {title: '商品型号', field: 'model', width: 150}, - {title: '商品类型', field: 'categoryName', width: 120}, + {title: '名称', field: 'mName', width: 150}, + {title: '规格', field: 'standard', width: 100}, + {title: '型号', field: 'model', width: 100}, + {title: '类型', field: 'categoryName', width: 120}, {title: '入库数量', field: 'numSum', width: 120}, {title: '入库金额', field: 'priceSum', width: 120} ]], diff --git a/erp_web/pages/reports/in_out_stock_report.html b/erp_web/pages/reports/in_out_stock_report.html index 29688863..29d9c373 100644 --- a/erp_web/pages/reports/in_out_stock_report.html +++ b/erp_web/pages/reports/in_out_stock_report.html @@ -235,6 +235,7 @@ pageList: [10, 50, 100], columns: [[ {title: '名称', field: 'MaterialName', width: 160}, + {title: '规格', field: 'MaterialStandard', width: 80}, {title: '型号', field: 'MaterialModel', width: 80}, {title: '扩展信息', field: 'MaterialOther', width: 120}, {title: '单位', field: 'unitName', width: 80}, @@ -370,7 +371,7 @@ if (count.lastIndexOf('.') > -1) { count = count.substring(0, count.lastIndexOf('.') + 3); } - $("#tablePanel .total-count").text("本月合计金额:" + count + "元");//本月合计金额 + $("#tablePanel .total-count").text("本月合计金额：" + count + "元");//本月合计金额 } } }, diff --git a/erp_web/pages/reports/out_detail.html b/erp_web/pages/reports/out_detail.html index 6cf585bb..9a9544a3 100644 --- a/erp_web/pages/reports/out_detail.html +++ b/erp_web/pages/reports/out_detail.html @@ -191,8 +191,9 @@ return '' + row.number + ''; } }, - {title: '商品名称', field: 'mname', width: 120}, - {title: '商品型号', field: 'model', width: 100}, + {title: '名称', field: 'mname', width: 120}, + {title: '规格', field: 'standard', width: 100}, + {title: '型号', field: 'model', width: 100}, {title: '单价', field: 'unitPrice', width: 60}, {title: '出库数量', field: 'operNumber', width: 80}, {title: '金额', field: 'allPrice', width: 60}, diff --git a/erp_web/pages/reports/out_material_count.html b/erp_web/pages/reports/out_material_count.html index e39aba85..1f2f34eb 100644 --- a/erp_web/pages/reports/out_material_count.html +++ b/erp_web/pages/reports/out_material_count.html @@ -183,9 +183,10 @@ pageSize: 10, pageList: [10, 50, 100], columns: [[ - {title: '商品名称', field: 'mName', width: 150}, - {title: '商品型号', field: 'model', width: 150}, - {title: '商品类型', field: 'categoryName', width: 120}, + {title: '名称', field: 'mName', width: 150}, + {title: '规格', field: 'standard', width: 100}, + {title: '型号', field: 'model', width: 100}, + {title: '类型', field: 'categoryName', width: 120}, {title: '出库数量', field: 'numSum', width: 120}, {title: '出库金额', field: 'priceSum', width: 120} ]], diff --git a/erp_web/pages/reports/sale_out_report.html b/erp_web/pages/reports/sale_out_report.html index 01994b02..972006f3 100644 --- a/erp_web/pages/reports/sale_out_report.html +++ b/erp_web/pages/reports/sale_out_report.html @@ -136,6 +136,7 @@ pageList: [10, 50, 100], columns: [[ {title: '名称', field: 'MaterialName', width: 160}, + {title: '规格', field: 'MaterialStandard', width: 80}, {title: '型号', field: 'MaterialModel', width: 80}, {title: '扩展信息', field: 'MaterialOther', width: 150}, {title: '单位', field: 'MaterialUnit', width: 80, diff --git a/erp_web/pages/reports/stock_warning_report.html b/erp_web/pages/reports/stock_warning_report.html index 04360252..88c01f23 100644 --- a/erp_web/pages/reports/stock_warning_report.html +++ b/erp_web/pages/reports/stock_warning_report.html @@ -203,6 +203,7 @@ pageList: [10, 50, 100], columns: [[ {title: '名称', field: 'materialName', width: 160}, + {title: '规格', field: 'materialStandard', width: 80}, {title: '型号', field: 'materialModel', width: 80}, {title: '扩展信息', field: 'materialOther', width: 150}, {title: '单位', field: 'materialUnit', width: 80}, diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java index a6760639..c3a381f5 100644 --- a/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -265,6 +265,7 @@ public class DepotItemController { Long mId = diEx.getMId(); item.put("MaterialName", diEx.getMName()); item.put("MaterialModel", diEx.getMModel()); + item.put("MaterialStandard", diEx.getMStandard()); //扩展信息 String materialOther = getOtherInfo(mpArr, diEx); item.put("MaterialOther", materialOther); @@ -326,23 +327,24 @@ public class DepotItemController { List dataList = depotItemService.findByAll(StringUtil.toNull(name), StringUtil.toNull(model), timeB, (currentPage-1)*pageSize, pageSize); //存放数据json数组 - String[] names = {"名称", "型号", "单位", "单价", "上月结存数量", "入库数量", "出库数量", "本月结存数量", "结存金额"}; + String[] names = {"名称", "规格", "型号", "单位", "单价", "上月结存数量", "入库数量", "出库数量", "本月结存数量", "结存金额"}; String title = "库存报表"; List objects = new ArrayList(); if (null != dataList) { for (DepotItemVo4WithInfoEx diEx : dataList) { Long mId = diEx.getMId(); - String[] objs = new String[9]; - objs[0] = diEx.getMName().toString(); - objs[1] = diEx.getMModel().toString(); - objs[2] = diEx.getMaterialUnit().toString(); - objs[3] = diEx.getPurchaseDecimal().toString(); - objs[4] = depotItemService.getStockByParam(depotId,mId,null,timeA,tenantId).toString(); - objs[5] = depotItemService.getInNumByParam(depotId,mId,timeA,timeB,tenantId).toString(); - objs[6] = depotItemService.getOutNumByParam(depotId,mId,timeA,timeB,tenantId).toString(); + String[] objs = new String[10]; + objs[0] = diEx.getMName(); + objs[1] = diEx.getMStandard(); + objs[2] = diEx.getMModel(); + objs[3] = diEx.getMaterialUnit(); + objs[4] = diEx.getPurchaseDecimal().toString(); + objs[5] = depotItemService.getStockByParam(depotId,mId,null,timeA,tenantId).toString(); + objs[6] = depotItemService.getInNumByParam(depotId,mId,timeA,timeB,tenantId).toString(); + objs[7] = depotItemService.getOutNumByParam(depotId,mId,timeA,timeB,tenantId).toString(); BigDecimal thisSum = depotItemService.getStockByParam(depotId,mId,null,timeB,tenantId); - objs[7] = thisSum.toString(); - objs[8] = thisSum.multiply(diEx.getPurchaseDecimal()).toString(); + objs[8] = thisSum.toString(); + objs[9] = thisSum.multiply(diEx.getPurchaseDecimal()).toString(); objects.add(objs); } } @@ -434,6 +436,7 @@ public class DepotItemController { BigDecimal OutSumPrice = depotItemService.buyOrSale("出库", "采购退货", diEx.getMId(), monthTime, "price"); item.put("MaterialName", diEx.getMName()); item.put("MaterialModel", diEx.getMModel()); + item.put("MaterialStandard", diEx.getMStandard()); //扩展信息 String materialOther = getOtherInfo(mpArr, diEx); item.put("MaterialOther", materialOther); @@ -502,6 +505,7 @@ public class DepotItemController { BigDecimal OutInSumPrice = (OutSumRetailPrice.add(OutSumPrice)).subtract(InSumRetailPrice.add(InSumPrice)); item.put("MaterialName", diEx.getMName()); item.put("MaterialModel", diEx.getMModel()); + item.put("MaterialStandard", diEx.getMStandard()); //扩展信息 String materialOther = getOtherInfo(mpArr, diEx); item.put("MaterialOther", materialOther); @@ -543,34 +547,8 @@ public class DepotItemController { return unitName; } - /** - * 获取单价 - * @param presetPriceOne - * @param priceStrategy - * @return - */ - public BigDecimal getUnitPrice(BigDecimal presetPriceOne, String priceStrategy) { - BigDecimal unitPrice = BigDecimal.ZERO; - if(presetPriceOne != null) { - DecimalFormat df = new DecimalFormat("#.00"); - unitPrice = new BigDecimal(df.format(presetPriceOne)); - } else { - JSONArray priceArr = JSONArray.parseArray(priceStrategy); - if(priceArr!=null && priceArr.get(0)!=null) { - JSONObject priceObj = JSONObject.parseObject(priceArr.get(0).toString()); - BigDecimal basicPresetPriceOne = priceObj.getJSONObject("basic").getBigDecimal("PresetPriceOne"); - if(basicPresetPriceOne!=null) { - unitPrice = basicPresetPriceOne; - } - } - } - return unitPrice; - } - /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 批量删除单据明细信息 * create time: 2019/3/29 11:15 * @Param: ids @@ -600,7 +578,6 @@ public class DepotItemController { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); try { - List resList = new ArrayList(); List list = depotItemService.findStockWarningCount((currentPage-1)*pageSize, pageSize,pid); int total = depotItemService.findStockWarningCountTotal(pid); map.put("total", total); @@ -635,21 +612,22 @@ public class DepotItemController { List dataList = depotItemService.findStockWarningCount((currentPage - 1) * pageSize, pageSize, projectId); //存放数据json数组 Integer pid = projectId; - String[] names = {"名称", "型号", "扩展信息", "单位", "入库数量", "出库数量", "库存数量", "安全库存量", "临界库存量"}; + String[] names = {"名称", "规格", "型号", "扩展信息", "单位", "入库数量", "出库数量", "库存数量", "安全库存量", "临界库存量"}; String title = "库存预警报表"; List objects = new ArrayList(); if (null != dataList) { for (DepotItemStockWarningCount diEx : dataList) { - String[] objs = new String[9]; - objs[0] = diEx.getMaterialName().toString(); - objs[1] = diEx.getMaterialModel().toString(); - objs[2] = diEx.getMaterialOther().toString(); - objs[3] = diEx.getMaterialUnit().toString(); - objs[4] = diEx.getBasicInNumber().toString(); - objs[5] = diEx.getBasicOutNumber() == null ? "0" : diEx.getBasicOutNumber().toString(); - objs[6] = diEx.getBasicNumber() == null ? "0" : diEx.getBasicNumber().toString(); - objs[7] = diEx.getSafetystock() == null ? "0" : diEx.getSafetystock().toString(); - objs[8] = diEx.getBasicLinjieNumber() == null ? "0" : diEx.getBasicLinjieNumber().toString(); + String[] objs = new String[10]; + objs[0] = diEx.getMaterialName(); + objs[1] = diEx.getMaterialStandard(); + objs[2] = diEx.getMaterialModel(); + objs[3] = diEx.getMaterialOther(); + objs[4] = diEx.getMaterialUnit(); + objs[5] = diEx.getBasicInNumber().toString(); + objs[6] = diEx.getBasicOutNumber() == null ? "0" : diEx.getBasicOutNumber().toString(); + objs[7] = diEx.getBasicNumber() == null ? "0" : diEx.getBasicNumber().toString(); + objs[8] = diEx.getSafetystock() == null ? "0" : diEx.getSafetystock().toString(); + objs[9] = diEx.getBasicLinjieNumber() == null ? "0" : diEx.getBasicLinjieNumber().toString(); objects.add(objs); } } diff --git a/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java b/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java index 5832e405..14cbec70 100644 --- a/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java +++ b/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java @@ -12,6 +12,8 @@ public class DepotHeadVo4InDetail { private String Model; + private String standard; + private BigDecimal UnitPrice; private BigDecimal OperNumber; @@ -52,6 +54,14 @@ public class DepotHeadVo4InDetail { Model = model; } + public String getStandard() { + return standard; + } + + public void setStandard(String standard) { + this.standard = standard; + } + public BigDecimal getUnitPrice() { return UnitPrice; } diff --git a/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java b/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java index 8b603179..3fcfc03b 100644 --- a/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java +++ b/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java @@ -11,6 +11,8 @@ public class DepotHeadVo4InOutMCount { private String Model; + private String standard; + private String categoryName; private BigDecimal numSum; @@ -43,6 +45,14 @@ public class DepotHeadVo4InOutMCount { Model = model; } + public String getStandard() { + return standard; + } + + public void setStandard(String standard) { + this.standard = standard; + } + public String getCategoryName() { return categoryName; } diff --git a/src/main/java/com/jsh/erp/datasource/vo/DepotItemStockWarningCount.java b/src/main/java/com/jsh/erp/datasource/vo/DepotItemStockWarningCount.java index db709e1b..2ef4ec01 100644 --- a/src/main/java/com/jsh/erp/datasource/vo/DepotItemStockWarningCount.java +++ b/src/main/java/com/jsh/erp/datasource/vo/DepotItemStockWarningCount.java @@ -5,11 +5,12 @@ import java.math.BigDecimal; public class DepotItemStockWarningCount { - private String MaterialName; private String MaterialModel; + private String MaterialStandard; + private String categoryName; private String MaterialOther; @@ -43,6 +44,14 @@ public class DepotItemStockWarningCount { MaterialModel = materialModel; } + public String getMaterialStandard() { + return MaterialStandard; + } + + public void setMaterialStandard(String materialStandard) { + MaterialStandard = materialStandard; + } + public String getCategoryName() { return categoryName; } diff --git a/src/main/java/com/jsh/erp/exception/GlobalExceptionHandler.java b/src/main/java/com/jsh/erp/exception/GlobalExceptionHandler.java index a699dc0b..c369cfd8 100644 --- a/src/main/java/com/jsh/erp/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/jsh/erp/exception/GlobalExceptionHandler.java @@ -38,8 +38,6 @@ public class GlobalExceptionHandler { /** * create by: qiankunpingtai * create time: 2019/4/18 17:41 - * website：https://qiankunpingtai.cn - * description: * 这里输出完整的堆栈信息，否则有些异常完全不知道哪里出错了。 */ log.error("Global Exception Occured => url : {}", request.getRequestURL(), e); diff --git a/src/main/java/com/jsh/erp/service/account/AccountService.java b/src/main/java/com/jsh/erp/service/account/AccountService.java index 3743af96..e574cac6 100644 --- a/src/main/java/com/jsh/erp/service/account/AccountService.java +++ b/src/main/java/com/jsh/erp/service/account/AccountService.java @@ -475,8 +475,6 @@ public class AccountService { } /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 正常删除，要考虑数据完整性，进行完整性校验 * create time: 2019/4/10 10:31 * @Param: ids diff --git a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java index 2a6d255a..43f01285 100644 --- a/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java +++ b/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java @@ -331,8 +331,6 @@ public class AccountHeadService { } /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 正常删除，要考虑数据完整性，进行完整性校验 * create time: 2019/4/10 15:49 * @Param: ids diff --git a/src/main/java/com/jsh/erp/service/depot/DepotService.java b/src/main/java/com/jsh/erp/service/depot/DepotService.java index 7c37b16f..14deecbb 100644 --- a/src/main/java/com/jsh/erp/service/depot/DepotService.java +++ b/src/main/java/com/jsh/erp/service/depot/DepotService.java @@ -229,8 +229,6 @@ public class DepotService { } /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 正常删除，要考虑数据完整性，进行完整性校验 * create time: 2019/4/10 16:52 * @Param: ids 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 6824ff00..b0016bbf 100644 --- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -441,7 +441,6 @@ public class DepotItemService { @Transactional(value = "transactionManager", rollbackFor = Exception.class) public List findStockWarningCount(int offset, Integer rows, Integer pid) { - List list = null; try{ list =depotItemMapperEx.findStockWarningCount( offset, rows, pid); diff --git a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java index d46b8b77..9c41f091 100644 --- a/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java +++ b/src/main/java/com/jsh/erp/service/inOutItem/InOutItemService.java @@ -205,8 +205,6 @@ public class InOutItemService { } /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 正常删除，要考虑数据完整性，进行完整性校验 * create time: 2019/4/10 16:23 * @Param: ids 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 77451ce9..ec0aac8c 100644 --- a/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -680,8 +680,6 @@ public class MaterialService { } /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 正常删除，要考虑数据完整性，进行完整性校验 * create time: 2019/4/10 18:00 * @Param: ids 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 8a332196..2300f2f0 100644 --- a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java +++ b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java @@ -350,8 +350,6 @@ public class MaterialCategoryService { /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 正常删除，要考虑数据完整性，进行完整性校验 * create time: 2019/4/11 9:26 * @Param: ids diff --git a/src/main/java/com/jsh/erp/service/msg/MsgService.java b/src/main/java/com/jsh/erp/service/msg/MsgService.java index efd5553e..afd9ef58 100644 --- a/src/main/java/com/jsh/erp/service/msg/MsgService.java +++ b/src/main/java/com/jsh/erp/service/msg/MsgService.java @@ -182,8 +182,6 @@ public class MsgService { /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 逻辑删除角色信息 * create time: 2019/3/28 15:44 * @Param: ids diff --git a/src/main/java/com/jsh/erp/service/person/PersonService.java b/src/main/java/com/jsh/erp/service/person/PersonService.java index 1105b647..3121cb3c 100644 --- a/src/main/java/com/jsh/erp/service/person/PersonService.java +++ b/src/main/java/com/jsh/erp/service/person/PersonService.java @@ -224,8 +224,6 @@ public class PersonService { } /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 正常删除，要考虑数据完整性，进行完整性校验 * create time: 2019/4/10 15:14 * @Param: ids diff --git a/src/main/java/com/jsh/erp/service/role/RoleService.java b/src/main/java/com/jsh/erp/service/role/RoleService.java index 29b961da..48b797e0 100644 --- a/src/main/java/com/jsh/erp/service/role/RoleService.java +++ b/src/main/java/com/jsh/erp/service/role/RoleService.java @@ -177,8 +177,6 @@ public class RoleService { } /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 逻辑删除角色信息 * create time: 2019/3/28 15:44 * @Param: ids 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 15720830..51f81908 100644 --- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java +++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java @@ -515,8 +515,6 @@ public class SerialNumberService { } /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 逻辑删除序列号信息 * create time: 2019/3/27 17:43 * @Param: ids diff --git a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java index ae409f85..57db027e 100644 --- a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java +++ b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java @@ -379,8 +379,6 @@ public class SupplierService { } /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: *正常删除，要考虑数据完整性，进行完整性校验 * create time: 2019/4/10 14:48 * @Param: ids diff --git a/src/main/java/com/jsh/erp/service/unit/UnitService.java b/src/main/java/com/jsh/erp/service/unit/UnitService.java index c65ec3c3..4f27e6c8 100644 --- a/src/main/java/com/jsh/erp/service/unit/UnitService.java +++ b/src/main/java/com/jsh/erp/service/unit/UnitService.java @@ -188,8 +188,6 @@ public class UnitService { /** * create by: qiankunpingtai - * website：https://qiankunpingtai.cn - * description: * 正常删除，要考虑数据完整性，进行完整性校验 * create time: 2019/4/11 10:20 * @Param: ids diff --git a/src/main/java/com/jsh/erp/service/user/UserService.java b/src/main/java/com/jsh/erp/service/user/UserService.java index 4634d786..5633a586 100644 --- a/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/src/main/java/com/jsh/erp/service/user/UserService.java @@ -450,8 +450,6 @@ public class UserService { /** * create by: qiankunpingtai * create time: 2019/4/9 18:00 - * website：https://qiankunpingtai.cn - * description: * 多次创建事务，事物之间无法协同，应该在入口处创建一个事务以做协调 */ if(BusinessConstants.DEFAULT_MANAGER.equals(ue.getLoginName())) { diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 23ec1c19..36dc164f 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -12,6 +12,7 @@ + @@ -25,6 +26,7 @@ + @@ -136,7 +138,7 @@ select count(1) from - (select di.material_id, m.mName,m.Model,m.categoryName from jsh_depot_head dh + (select di.material_id, m.mName,m.Model,m.standard,m.categoryName from jsh_depot_head dh INNER JOIN jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1' - INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_material_category.`Name` categoryName + INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,standard,jsh_material_category.`Name` categoryName from jsh_material LEFT JOIN jsh_material_category on jsh_material.category_id=jsh_material_category.Id and ifnull(jsh_material_category.status,'0') !='2' where ifnull(jsh_material.delete_Flag,'0') !='1' @@ -264,7 +265,7 @@ and di.depot_id in (${dids}) and ifnull(dh.delete_flag,'0') !='1' - GROUP BY di.material_id,m.mName,m.Model,m.categoryName) a + GROUP BY di.material_id,m.mName,m.Model,m.standard,m.categoryName) a