gyzz/openerp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善单据查询接口，增加品牌和制造商字段

Browse Source
This commit is contained in:
jishenghua 2024-10-06 00:45:39 +08:00
parent a29a96bc88
commit 536718d326
5 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@ -225,6 +225,8 @@ public class DepotItemController {
item.put("standard", diEx.getMStandard()); item.put("standard", diEx.getMStandard());
item.put("model", diEx.getMModel()); item.put("model", diEx.getMModel());
item.put("color", diEx.getMColor()); item.put("color", diEx.getMColor());
item.put("brand", diEx.getBrand());
item.put("mfrs", diEx.getMMfrs());
item.put("materialOther", depotItemService.getOtherInfo(mpArr, diEx)); item.put("materialOther", depotItemService.getOtherInfo(mpArr, diEx));
BigDecimal stock; BigDecimal stock;
Unit unitInfo = materialService.findUnit(diEx.getMaterialId()); //查询计量单位信息 Unit unitInfo = materialService.findUnit(diEx.getMaterialId()); //查询计量单位信息

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
View File

@ -56,6 +56,8 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
private String imgName; private String imgName;
private String brand;
public Long getMId() { public Long getMId() {
return MId; return MId;
} }
@ -263,4 +265,12 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
public void setImgName(String imgName) { public void setImgName(String imgName) {
this.imgName = imgName; this.imgName = imgName;
} }
public String getBrand() {
return brand;
}
public void setBrand(String brand) {
this.brand = brand;
}
} }

34
jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@ -1447,10 +1447,10 @@ public class DepotHeadService {
String sheetTwoStr = ""; String sheetTwoStr = "";
if ("采购".equals(subType)) { if ("采购".equals(subType)) {
twoTip = "供应商单据明细"; twoTip = "供应商单据明细";
sheetTwoStr = "供应商,单据编号,单据日期,仓库名称,条码,名称,规格,型号,颜色,扩展信息,单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注"; sheetTwoStr = "供应商,单据编号,单据日期,仓库名称,条码,名称,规格,型号,颜色,品牌,制造商,扩展信息,单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注";
} else if ("销售".equals(subType)) { } else if ("销售".equals(subType)) {
twoTip = "客户单据明细"; twoTip = "客户单据明细";
sheetTwoStr = "客户,单据编号,单据日期,仓库名称,条码,名称,规格,型号,颜色,扩展信息,单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注"; sheetTwoStr = "客户,单据编号,单据日期,仓库名称,条码,名称,规格,型号,颜色,品牌,制造商,扩展信息,单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注";
} }
if (StringUtil.isNotEmpty(beginTime) && StringUtil.isNotEmpty(endTime)) { if (StringUtil.isNotEmpty(beginTime) && StringUtil.isNotEmpty(endTime)) {
twoTip = twoTip + "（" + beginTime + "至" + endTime + "）"; twoTip = twoTip + "（" + beginTime + "至" + endTime + "）";
@ -1470,21 +1470,23 @@ public class DepotHeadService {
objs[6] = diEx.getMStandard(); objs[6] = diEx.getMStandard();
objs[7] = diEx.getMModel(); objs[7] = diEx.getMModel();
objs[8] = diEx.getMColor(); objs[8] = diEx.getMColor();
objs[9] = depotItemService.getOtherInfo(mpArr, diEx); objs[9] = diEx.getBrand();
objs[10] = diEx.getMaterialUnit(); objs[10] = diEx.getMMfrs();
objs[11] = diEx.getSnList(); objs[11] = depotItemService.getOtherInfo(mpArr, diEx);
objs[12] = diEx.getBatchNumber(); objs[12] = diEx.getMaterialUnit();
objs[13] = Tools.parseDateToStr(diEx.getExpirationDate()); objs[13] = diEx.getSnList();
objs[14] = diEx.getSku(); objs[14] = diEx.getBatchNumber();
objs[15] = parseDecimalToStr(diEx.getOperNumber(), 2); objs[15] = Tools.parseDateToStr(diEx.getExpirationDate());
objs[16] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getUnitPrice(), billCategory, priceLimit, request), 2); objs[16] = diEx.getSku();
objs[17] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getAllPrice(), billCategory, priceLimit, request), 2); objs[17] = parseDecimalToStr(diEx.getOperNumber(), 2);
objs[18] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxRate(), billCategory, priceLimit, request), 2); objs[18] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getUnitPrice(), billCategory, priceLimit, request), 2);
objs[19] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxMoney(), billCategory, priceLimit, request), 2); objs[19] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getAllPrice(), billCategory, priceLimit, request), 2);
objs[20] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxLastMoney(), 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()); BigDecimal allWeight = diEx.getBasicNumber() == null || diEx.getWeight() == null ? BigDecimal.ZERO : diEx.getBasicNumber().multiply(diEx.getWeight());
objs[21] = parseDecimalToStr(allWeight, 2); objs[23] = parseDecimalToStr(allWeight, 2);
objs[22] = diEx.getRemark(); objs[24] = diEx.getRemark();
billDetail.add(objs); billDetail.add(objs);
} }
ExcelUtils.exportObjectsManySheet(wtwb, twoTip, sheetTwoArr, "单据明细", 1, billDetail); ExcelUtils.exportObjectsManySheet(wtwb, twoTip, sheetTwoArr, "单据明细", 1, billDetail);

3
jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@ -1412,9 +1412,6 @@ public class DepotItemService {
public String getOtherInfo(String[] mpArr, DepotItemVo4WithInfoEx diEx)throws Exception { public String getOtherInfo(String[] mpArr, DepotItemVo4WithInfoEx diEx)throws Exception {
String materialOther = ""; String materialOther = "";
for (int i = 0; i < mpArr.length; i++) { 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")) { if (mpArr[i].equals("自定义1")) {
materialOther = materialOther + ((diEx.getMOtherField1() == null || diEx.getMOtherField1().equals("")) ? "" : "(" + diEx.getMOtherField1() + ")"); materialOther = materialOther + ((diEx.getMOtherField1() == null || diEx.getMOtherField1().equals("")) ? "" : "(" + diEx.getMOtherField1() + ")");
} }

5
jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@ -36,6 +36,7 @@
<result column="MOtherField3" jdbcType="VARCHAR" property="MOtherField3" /> <result column="MOtherField3" jdbcType="VARCHAR" property="MOtherField3" />
<result column="enable_serial_number" jdbcType="VARCHAR" property="enableSerialNumber" /> <result column="enable_serial_number" jdbcType="VARCHAR" property="enableSerialNumber" />
<result column="enable_batch_number" jdbcType="VARCHAR" property="enableBatchNumber" /> <result column="enable_batch_number" jdbcType="VARCHAR" property="enableBatchNumber" />
<result column="brand" jdbcType="VARCHAR" property="brand" />
<result column="DepotName" jdbcType="VARCHAR" property="DepotName" /> <result column="DepotName" jdbcType="VARCHAR" property="DepotName" />
<result column="AnotherDepotName" jdbcType="VARCHAR" property="AnotherDepotName" /> <result column="AnotherDepotName" jdbcType="VARCHAR" property="AnotherDepotName" />
<result column="barCode" jdbcType="VARCHAR" property="barCode" /> <result column="barCode" jdbcType="VARCHAR" property="barCode" />
@ -316,7 +317,7 @@
<select id="getDetailList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap"> <select id="getDetailList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
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, 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, 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 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 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' left join jsh_material_extend me on me.id=di.material_extend_id and ifnull(me.delete_Flag,'0') !='1'
@ -330,7 +331,7 @@
<select id="getBillDetailListByIds" resultType="com.jsh.erp.datasource.entities.DepotItemVo4WithInfoEx"> <select id="getBillDetailListByIds" resultType="com.jsh.erp.datasource.entities.DepotItemVo4WithInfoEx">
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, 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, 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 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 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' left join jsh_material_extend me on me.id=di.material_extend_id and ifnull(me.delete_Flag,'0') !='1'