From ce7a6ff34365907ca3fa715622f8f05864ba5bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Fri, 16 Jul 2021 00:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=A1=E7=A0=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotItemController.java | 49 ++++++++++--------- .../datasource/vo/DepotHeadVo4InDetail.java | 10 ++++ .../vo/DepotHeadVo4InOutMCount.java | 10 ++++ .../vo/DepotItemStockWarningCount.java | 10 ++++ .../mapper_xml/DepotHeadMapperEx.xml | 28 ++++++----- .../mapper_xml/DepotItemMapperEx.xml | 20 +++++--- 6 files changed, 88 insertions(+), 39 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index f00ea84f6..a65517aef 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -282,6 +282,7 @@ public class DepotItemController { for (DepotItemVo4WithInfoEx diEx : dataList) { JSONObject item = new JSONObject(); Long mId = diEx.getMId(); + item.put("barCode", diEx.getBarCode()); item.put("materialName", diEx.getMName()); item.put("materialModel", diEx.getMModel()); item.put("materialStandard", diEx.getMStandard()); @@ -339,24 +340,25 @@ public class DepotItemController { List dataList = depotItemService.findByAll(StringUtil.toNull(materialParam), timeB, null, null); //存放数据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[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(); + String[] objs = new String[11]; + objs[0] = diEx.getBarCode(); + objs[1] = diEx.getMName(); + objs[2] = diEx.getMStandard(); + objs[3] = diEx.getMModel(); + objs[4] = diEx.getMaterialUnit(); + objs[5] = diEx.getPurchaseDecimal().toString(); + objs[6] = depotItemService.getStockByParam(depotId,mId,null,timeA,tenantId).toString(); + objs[7] = depotItemService.getInNumByParam(depotId,mId,timeA,timeB,tenantId).toString(); + objs[8] = depotItemService.getOutNumByParam(depotId,mId,timeA,timeB,tenantId).toString(); BigDecimal thisSum = depotItemService.getStockByParam(depotId,mId,null,timeB,tenantId); - objs[8] = thisSum.toString(); - objs[9] = thisSum.multiply(diEx.getPurchaseDecimal()).toString(); + objs[9] = thisSum.toString(); + objs[10] = thisSum.multiply(diEx.getPurchaseDecimal()).toString(); objects.add(objs); } } @@ -445,6 +447,7 @@ public class DepotItemController { BigDecimal OutSum = depotItemService.buyOrSale("出库", "采购退货", diEx.getMId(), monthTime, "number"); BigDecimal InSumPrice = depotItemService.buyOrSale("入库", "采购", diEx.getMId(), monthTime, "price"); BigDecimal OutSumPrice = depotItemService.buyOrSale("出库", "采购退货", diEx.getMId(), monthTime, "price"); + item.put("barCode", diEx.getBarCode()); item.put("materialName", diEx.getMName()); item.put("materialModel", diEx.getMModel()); item.put("materialStandard", diEx.getMStandard()); @@ -512,6 +515,7 @@ public class DepotItemController { BigDecimal InSumRetailPrice = depotItemService.buyOrSale("入库", "零售退货", diEx.getMId(), monthTime,"price"); BigDecimal InSumPrice = depotItemService.buyOrSale("入库", "销售退货", diEx.getMId(), monthTime,"price"); BigDecimal OutInSumPrice = (OutSumRetailPrice.add(OutSumPrice)).subtract(InSumRetailPrice.add(InSumPrice)); + item.put("barCode", diEx.getBarCode()); item.put("materialName", diEx.getMName()); item.put("materialModel", diEx.getMModel()); item.put("materialStandard", diEx.getMStandard()); @@ -618,7 +622,7 @@ public class DepotItemController { List dataList = depotItemService.findStockWarningCount(null, null, materialParam, depotId); //存放数据json数组 Long pid = depotId; - String[] names = {"名称", "规格", "型号", "扩展信息", "单位", "安全存量", "当前库存", "建议入库量"}; + String[] names = {"条码", "名称", "规格", "型号", "扩展信息", "单位", "安全存量", "当前库存", "建议入库量"}; String title = "库存预警报表"; List objects = new ArrayList(); if (null != dataList) { @@ -630,15 +634,16 @@ public class DepotItemController { diVI.setMOtherField3(diEx.getMOtherField3()); String materialOther = getOtherInfo(mpArr, diVI); String unitName = getUName(diEx.getMaterialUnit(), diEx.getUnitName()); - String[] objs = new String[8]; - objs[0] = diEx.getMName(); - objs[1] = diEx.getMStandard(); - objs[2] = diEx.getMModel(); - objs[3] = materialOther; - objs[4] = unitName; - objs[5] = diEx.getSafetystock() == null ? "0" : diEx.getSafetystock().toString(); - objs[6] = diEx.getCurrentNumber() == null ? "0" : diEx.getCurrentNumber().toString(); - objs[7] = diEx.getLinjieNumber() == null ? "0" : diEx.getLinjieNumber().toString(); + String[] objs = new String[9]; + objs[0] = diEx.getBarCode(); + objs[1] = diEx.getMName(); + objs[2] = diEx.getMStandard(); + objs[3] = diEx.getMModel(); + objs[4] = materialOther; + objs[5] = unitName; + objs[6] = diEx.getSafetystock() == null ? "0" : diEx.getSafetystock().toString(); + objs[7] = diEx.getCurrentNumber() == null ? "0" : diEx.getCurrentNumber().toString(); + objs[8] = diEx.getLinjieNumber() == null ? "0" : diEx.getLinjieNumber().toString(); objects.add(objs); } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java index 14cbec70e..9d3a8c5bd 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java @@ -8,6 +8,8 @@ public class DepotHeadVo4InDetail { private String Number; + private String barCode; + private String MName; private String Model; @@ -38,6 +40,14 @@ public class DepotHeadVo4InDetail { Number = number; } + public String getBarCode() { + return barCode; + } + + public void setBarCode(String barCode) { + this.barCode = barCode; + } + public String getMName() { return MName; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java index 3fcfc03b1..1f924f66c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java @@ -7,6 +7,8 @@ public class DepotHeadVo4InOutMCount { private Long MaterialId; + private String barCode; + private String mName; private String Model; @@ -29,6 +31,14 @@ public class DepotHeadVo4InOutMCount { MaterialId = materialId; } + public String getBarCode() { + return barCode; + } + + public void setBarCode(String barCode) { + this.barCode = barCode; + } + public String getmName() { return mName; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotItemStockWarningCount.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotItemStockWarningCount.java index 3dec4c546..0cdbaa83d 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotItemStockWarningCount.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotItemStockWarningCount.java @@ -7,6 +7,8 @@ public class DepotItemStockWarningCount { private Long MId; + private String barCode; + private String MName; private String MModel; @@ -43,6 +45,14 @@ public class DepotItemStockWarningCount { this.MId = MId; } + public String getBarCode() { + return barCode; + } + + public void setBarCode(String barCode) { + this.barCode = barCode; + } + public String getMName() { return MName; } diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 44155bb77..217f14bc0 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -10,6 +10,7 @@ + @@ -24,6 +25,7 @@ + @@ -170,11 +172,12 @@ select count(1) from - (select di.material_id, m.mName,m.Model,m.standard,m.categoryName from jsh_depot_head dh + (select di.material_id, m.mName,m.bar_code,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,standard,jsh_material_category.`Name` categoryName + INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, me.bar_code, Model,standard,jsh_material_category.`Name` categoryName from jsh_material + left join jsh_material_extend me on me.material_id=jsh_material.id and ifnull(me.delete_Flag,'0') !='1' LEFT JOIN jsh_material_category on jsh_material.category_id=jsh_material_category.Id and ifnull(jsh_material_category.delete_flag,'0') !='1' - where ifnull(jsh_material.delete_Flag,'0') !='1' + where me.default_flag=1 and ifnull(jsh_material.delete_Flag,'0') !='1' ) m on m.Id=di.material_id where dh.type=#{type} and dh.oper_time >=#{beginTime} and dh.oper_time <=#{endTime} and dh.organ_id = #{oId} @@ -291,7 +297,7 @@ - and (m.mName like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) + and (m.bar_code like #{bindKey} or m.mName like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) and ifnull(dh.delete_flag,'0') !='1' GROUP BY di.material_id,m.mName,m.Model,m.standard,m.categoryName) a diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 7891f202e..0808cd11e 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -37,6 +37,7 @@ + @@ -52,6 +53,7 @@ + @@ -168,7 +170,7 @@