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 fd773d0c2..8f7524d7a 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 @@ -225,6 +225,8 @@ public class DepotItemController { item.put("standard", diEx.getMStandard()); item.put("model", diEx.getMModel()); item.put("color", diEx.getMColor()); + item.put("brand", diEx.getBrand()); + item.put("mfrs", diEx.getMMfrs()); item.put("materialOther", depotItemService.getOtherInfo(mpArr, diEx)); BigDecimal stock; Unit unitInfo = materialService.findUnit(diEx.getMaterialId()); //查询计量单位信息 diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java index 5fa9c9259..1e415aef0 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java @@ -56,6 +56,8 @@ public class DepotItemVo4WithInfoEx extends DepotItem{ private String imgName; + private String brand; + public Long getMId() { return MId; } @@ -263,4 +265,12 @@ public class DepotItemVo4WithInfoEx extends DepotItem{ public void setImgName(String imgName) { this.imgName = imgName; } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index e4738926f..82d357bff 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -1447,10 +1447,10 @@ public class DepotHeadService { String sheetTwoStr = ""; if ("采购".equals(subType)) { twoTip = "供应商单据明细"; - sheetTwoStr = "供应商,单据编号,单据日期,仓库名称,条码,名称,规格,型号,颜色,扩展信息,单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注"; + sheetTwoStr = "供应商,单据编号,单据日期,仓库名称,条码,名称,规格,型号,颜色,品牌,制造商,扩展信息,单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注"; } else if ("销售".equals(subType)) { twoTip = "客户单据明细"; - sheetTwoStr = "客户,单据编号,单据日期,仓库名称,条码,名称,规格,型号,颜色,扩展信息,单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注"; + sheetTwoStr = "客户,单据编号,单据日期,仓库名称,条码,名称,规格,型号,颜色,品牌,制造商,扩展信息,单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注"; } if (StringUtil.isNotEmpty(beginTime) && StringUtil.isNotEmpty(endTime)) { twoTip = twoTip + "(" + beginTime + "至" + endTime + ")"; @@ -1470,21 +1470,23 @@ public class DepotHeadService { objs[6] = diEx.getMStandard(); objs[7] = diEx.getMModel(); objs[8] = diEx.getMColor(); - objs[9] = depotItemService.getOtherInfo(mpArr, diEx); - objs[10] = diEx.getMaterialUnit(); - objs[11] = diEx.getSnList(); - objs[12] = diEx.getBatchNumber(); - objs[13] = Tools.parseDateToStr(diEx.getExpirationDate()); - objs[14] = diEx.getSku(); - objs[15] = parseDecimalToStr(diEx.getOperNumber(), 2); - objs[16] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getUnitPrice(), billCategory, priceLimit, request), 2); - objs[17] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getAllPrice(), billCategory, priceLimit, request), 2); - objs[18] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxRate(), billCategory, priceLimit, request), 2); - objs[19] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxMoney(), billCategory, priceLimit, request), 2); - objs[20] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxLastMoney(), billCategory, priceLimit, request), 2); + objs[9] = diEx.getBrand(); + objs[10] = diEx.getMMfrs(); + objs[11] = depotItemService.getOtherInfo(mpArr, diEx); + objs[12] = diEx.getMaterialUnit(); + objs[13] = diEx.getSnList(); + objs[14] = diEx.getBatchNumber(); + objs[15] = Tools.parseDateToStr(diEx.getExpirationDate()); + objs[16] = diEx.getSku(); + objs[17] = parseDecimalToStr(diEx.getOperNumber(), 2); + objs[18] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getUnitPrice(), billCategory, priceLimit, request), 2); + objs[19] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getAllPrice(), billCategory, priceLimit, request), 2); + objs[20] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxRate(), billCategory, priceLimit, request), 2); + objs[21] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxMoney(), billCategory, priceLimit, request), 2); + objs[22] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxLastMoney(), billCategory, priceLimit, request), 2); BigDecimal allWeight = diEx.getBasicNumber() == null || diEx.getWeight() == null ? BigDecimal.ZERO : diEx.getBasicNumber().multiply(diEx.getWeight()); - objs[21] = parseDecimalToStr(allWeight, 2); - objs[22] = diEx.getRemark(); + objs[23] = parseDecimalToStr(allWeight, 2); + objs[24] = diEx.getRemark(); billDetail.add(objs); } ExcelUtils.exportObjectsManySheet(wtwb, twoTip, sheetTwoArr, "单据明细", 1, billDetail); 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 a66f779d6..c40789e2c 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 @@ -1412,9 +1412,6 @@ public class DepotItemService { public String getOtherInfo(String[] mpArr, DepotItemVo4WithInfoEx diEx)throws Exception { String materialOther = ""; for (int i = 0; i < mpArr.length; i++) { - if (mpArr[i].equals("制造商")) { - materialOther = materialOther + ((diEx.getMMfrs() == null || diEx.getMMfrs().equals("")) ? "" : "(" + diEx.getMMfrs() + ")"); - } if (mpArr[i].equals("自定义1")) { materialOther = materialOther + ((diEx.getMOtherField1() == null || diEx.getMOtherField1().equals("")) ? "" : "(" + diEx.getMOtherField1() + ")"); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 5ca791734..3052cdb67 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -36,6 +36,7 @@ + @@ -316,7 +317,7 @@ select di.*,m.name MName,m.model MModel,m.unit MaterialUnit,m.color MColor,m.standard MStandard,m.mfrs MMfrs,m.weight, m.position, m.img_name, m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,m.enable_serial_number, m.enable_batch_number, - dp1.name DepotName,dp2.name AnotherDepotName, me.bar_code barCode, me.purchase_decimal + m.brand, dp1.name DepotName,dp2.name AnotherDepotName, me.bar_code barCode, me.purchase_decimal from jsh_depot_item di left join jsh_material m on di.material_id=m.id and ifnull(m.delete_flag,'0') !='1' left join jsh_material_extend me on me.id=di.material_extend_id and ifnull(me.delete_Flag,'0') !='1'