From 8795c9358c6231f836ad8bb91d34d169f34086c6 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Wed, 9 Oct 2024 00:48:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8A=A5=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=93=81=E7=89=8C=E5=92=8C=E5=88=B6=E9=80=A0=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotItemController.java | 23 +++++++++----- .../erp/controller/MaterialController.java | 9 +++--- .../datasource/mappers/DepotItemMapperEx.java | 4 +-- .../datasource/vo/DepotHeadVo4InDetail.java | 30 +++++++++++++++++++ .../vo/DepotHeadVo4InOutMCount.java | 30 +++++++++++++++++++ .../vo/DepotItemStockWarningCount.java | 10 +++++++ .../service/depotItem/DepotItemService.java | 8 ++--- .../mapper_xml/DepotHeadMapperEx.xml | 13 ++++++-- .../mapper_xml/DepotItemMapperEx.xml | 13 ++++---- 9 files changed, 114 insertions(+), 26 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 8f7524d7..8371a251 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 @@ -512,10 +512,12 @@ public class DepotItemController { item.put("materialName", diEx.getMName()); item.put("materialModel", diEx.getMModel()); item.put("materialStandard", diEx.getMStandard()); + item.put("materialColor", diEx.getMColor()); + item.put("materialMfrs", diEx.getMMfrs()); + item.put("materialBrand", diEx.getBrand()); //扩展信息 String materialOther = depotItemService.getOtherInfo(mpArr, diEx); item.put("materialOther", materialOther); - item.put("materialColor", diEx.getMColor()); item.put("unitId", diEx.getUnitId()); item.put("unitName", null!=diEx.getUnitId() ? diEx.getMaterialUnit()+"[多单位]" : diEx.getMaterialUnit()); BigDecimal prevSum = depotItemService.getStockByParamWithDepotList(depotList,mId,null,beginTime); @@ -672,10 +674,10 @@ public class DepotItemController { String [] organArray = null; List depotList = depotService.parseDepotList(depotId); Boolean forceFlag = systemConfigService.getForceApprovalFlag(); - List dataList = depotItemService.getListWithBugOrSale(StringUtil.toNull(materialParam), + List dataList = depotItemService.getListWithBuyOrSale(StringUtil.toNull(materialParam), "buy", beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag, (currentPage-1)*pageSize, pageSize); String[] mpArr = mpList.split(","); - int total = depotItemService.getListWithBugOrSaleCount(StringUtil.toNull(materialParam), + int total = depotItemService.getListWithBuyOrSaleCount(StringUtil.toNull(materialParam), "buy", beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag); map.put("total", total); //存放数据json数组 @@ -696,6 +698,8 @@ public class DepotItemController { String materialOther = depotItemService.getOtherInfo(mpArr, diEx); item.put("materialOther", materialOther); item.put("materialColor", diEx.getMColor()); + item.put("materialBrand", diEx.getBrand()); + item.put("materialMfrs", diEx.getMMfrs()); item.put("materialUnit", diEx.getMaterialUnit()); item.put("unitName", diEx.getUnitName()); item.put("inSum", InSum); @@ -756,10 +760,10 @@ public class DepotItemController { String [] organArray = null; List depotList = depotService.parseDepotList(depotId); Boolean forceFlag = systemConfigService.getForceApprovalFlag(); - List dataList = depotItemService.getListWithBugOrSale(StringUtil.toNull(materialParam), + List dataList = depotItemService.getListWithBuyOrSale(StringUtil.toNull(materialParam), "retail", beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag, (currentPage-1)*pageSize, pageSize); String[] mpArr = mpList.split(","); - int total = depotItemService.getListWithBugOrSaleCount(StringUtil.toNull(materialParam), + int total = depotItemService.getListWithBuyOrSaleCount(StringUtil.toNull(materialParam), "retail", beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag); map.put("total", total); //存放数据json数组 @@ -780,6 +784,8 @@ public class DepotItemController { String materialOther = depotItemService.getOtherInfo(mpArr, diEx); item.put("materialOther", materialOther); item.put("materialColor", diEx.getMColor()); + item.put("materialBrand", diEx.getBrand()); + item.put("materialMfrs", diEx.getMMfrs()); item.put("materialUnit", diEx.getMaterialUnit()); item.put("unitName", diEx.getUnitName()); item.put("outSum", OutSumRetail); @@ -841,10 +847,10 @@ public class DepotItemController { String [] organArray = depotHeadService.getOrganArray("销售", ""); List depotList = depotService.parseDepotList(depotId); Boolean forceFlag = systemConfigService.getForceApprovalFlag(); - List dataList = depotItemService.getListWithBugOrSale(StringUtil.toNull(materialParam), + List dataList = depotItemService.getListWithBuyOrSale(StringUtil.toNull(materialParam), "sale", beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag, (currentPage-1)*pageSize, pageSize); String[] mpArr = mpList.split(","); - int total = depotItemService.getListWithBugOrSaleCount(StringUtil.toNull(materialParam), + int total = depotItemService.getListWithBuyOrSaleCount(StringUtil.toNull(materialParam), "sale", beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag); map.put("total", total); //存放数据json数组 @@ -865,6 +871,8 @@ public class DepotItemController { String materialOther = depotItemService.getOtherInfo(mpArr, diEx); item.put("materialOther", materialOther); item.put("materialColor", diEx.getMColor()); + item.put("materialBrand", diEx.getBrand()); + item.put("materialMfrs", diEx.getMMfrs()); item.put("materialUnit", diEx.getMaterialUnit()); item.put("unitName", diEx.getUnitName()); item.put("outSum", OutSum); @@ -939,7 +947,6 @@ public class DepotItemController { if (null != list) { for (DepotItemStockWarningCount disw : list) { DepotItemVo4WithInfoEx diEx = new DepotItemVo4WithInfoEx(); - diEx.setMMfrs(disw.getMMfrs()); diEx.setMOtherField1(disw.getMOtherField1()); diEx.setMOtherField2(disw.getMOtherField2()); diEx.setMOtherField3(disw.getMOtherField3()); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java index a117f186..deb97ec6 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java @@ -228,10 +228,11 @@ public class MaterialController { if(StringUtil.isNotEmpty(mpList)){ mpArr= mpList.split(","); } - List dataList = materialService.findBySelectWithBarCode(categoryId, q, standardOrModel, - color, brand, mfrs, enableSerialNumber, enableBatchNumber, (currentPage-1)*pageSize, pageSize); - int total = materialService.findBySelectWithBarCodeCount(categoryId, q, standardOrModel, - color, brand, mfrs, enableSerialNumber, enableBatchNumber); + List dataList = materialService.findBySelectWithBarCode(categoryId, q, StringUtil.toNull(standardOrModel), + StringUtil.toNull(color), StringUtil.toNull(brand), StringUtil.toNull(mfrs), enableSerialNumber, enableBatchNumber, + (currentPage-1)*pageSize, pageSize); + int total = materialService.findBySelectWithBarCodeCount(categoryId, q, StringUtil.toNull(standardOrModel), + StringUtil.toNull(color), StringUtil.toNull(brand), StringUtil.toNull(mfrs), enableSerialNumber, enableBatchNumber); object.put("total", total); JSONArray dataArray = new JSONArray(); //存放数据json数组 diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java index 009bc4f0..499d8e78 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java @@ -72,7 +72,7 @@ public interface DepotItemMapperEx { @Param("categoryIdList") List categoryIdList, @Param("endTime") String endTime); - List getListWithBugOrSale( + List getListWithBuyOrSale( @Param("materialParam") String materialParam, @Param("billType") String billType, @Param("beginTime") String beginTime, @@ -85,7 +85,7 @@ public interface DepotItemMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int getListWithBugOrSaleCount( + int getListWithBuyOrSaleCount( @Param("materialParam") String materialParam, @Param("billType") String billType, @Param("beginTime") String beginTime, 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 01d9a866..1d8137c6 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 @@ -16,6 +16,12 @@ public class DepotHeadVo4InDetail { private String standard; + private String color; + + private String brand; + + private String mfrs; + private BigDecimal unitPrice; private String sku; @@ -84,6 +90,30 @@ public class DepotHeadVo4InDetail { this.standard = standard; } + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getMfrs() { + return mfrs; + } + + public void setMfrs(String mfrs) { + this.mfrs = mfrs; + } + public BigDecimal getUnitPrice() { return unitPrice; } 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 6e557f62..cdcf0b2c 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 @@ -14,6 +14,12 @@ public class DepotHeadVo4InOutMCount { private String standard; + private String color; + + private String brand; + + private String mfrs; + private String categoryName; private String materialUnit; @@ -64,6 +70,30 @@ public class DepotHeadVo4InOutMCount { this.standard = standard; } + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getMfrs() { + return mfrs; + } + + public void setMfrs(String mfrs) { + this.mfrs = mfrs; + } + public String getCategoryName() { return categoryName; } 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 09aa08e7..ce0c9ea1 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 @@ -21,6 +21,8 @@ public class DepotItemStockWarningCount { private String MMfrs; + private String brand; + private String unitName; private String MaterialOther; @@ -107,6 +109,14 @@ public class DepotItemStockWarningCount { this.MMfrs = MMfrs; } + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + public String getUnitName() { return unitName; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index c40789e2..6fc29b16 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -321,22 +321,22 @@ public class DepotItemService { return result; } - public List getListWithBugOrSale(String materialParam, String billType, + public List getListWithBuyOrSale(String materialParam, String billType, String beginTime, String endTime, String[] creatorArray, Long organId, String [] organArray, List depotList, Boolean forceFlag, Integer offset, Integer rows)throws Exception { List list =null; try{ - list = depotItemMapperEx.getListWithBugOrSale(materialParam, billType, beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag, offset, rows); + list = depotItemMapperEx.getListWithBuyOrSale(materialParam, billType, beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public int getListWithBugOrSaleCount(String materialParam, String billType, + public int getListWithBuyOrSaleCount(String materialParam, String billType, String beginTime, String endTime, String[] creatorArray, Long organId, String [] organArray, List depotList, Boolean forceFlag)throws Exception { int result=0; try{ - result = depotItemMapperEx.getListWithBugOrSaleCount(materialParam, billType, beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag); + result = depotItemMapperEx.getListWithBuyOrSaleCount(materialParam, billType, beginTime, endTime, creatorArray, organId, organArray, depotList, forceFlag); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 6f4368d5..b805dace 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -18,6 +18,9 @@ + + + @@ -37,6 +40,9 @@ + + + @@ -293,7 +299,7 @@ - select m.id MId, me.bar_code, m.name MName, m.mfrs MMfrs, m.model MModel, m.standard MStandard, m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3, - concat_ws('', m.unit, u.basic_unit) MaterialUnit, m.color MColor, u.name unit_name + concat_ws('', m.unit, u.basic_unit) MaterialUnit, m.color MColor, m.brand, u.name unit_name from jsh_material m left join jsh_depot_item di on di.material_id=m.id and ifnull(di.delete_Flag,'0') !='1' left join jsh_material_extend me on me.id=di.material_extend_id and ifnull(me.delete_Flag,'0') !='1' @@ -471,7 +474,7 @@ - select count(1) from (select m.id from jsh_material m left join jsh_depot_item di on di.material_id=m.id and ifnull(m.delete_Flag,'0') !='1' @@ -864,7 +867,7 @@