purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给单据明细列表接口增加仓位货架字段

Browse Source
This commit is contained in:
jishenghua
2024-02-03 15:06:09 +08:00
parent 755117abc2
commit 5ada171a5c
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,6 +258,7 @@ public class DepotItemController {
}
BigDecimal allWeight = diEx.getBasicNumber()==null||diEx.getWeight()==null?BigDecimal.ZERO:diEx.getBasicNumber().multiply(diEx.getWeight());
item.put("weight", allWeight);
item.put("position", diEx.getPosition());
item.put("remark", diEx.getRemark());
item.put("imgName", diEx.getImgName());
if(fileUploadType == 2) {

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

@@ -50,6 +50,8 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
private BigDecimal weight;
private String position;
private String imgName;
public Long getMId() {
@@ -236,6 +238,14 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
this.weight = weight;
}
public String getPosition() {
return position;
}
public void setPosition(String position) {
this.position = position;
}
public String getImgName() {
return imgName;
}

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

@@ -26,6 +26,7 @@
<result column="MStandard" jdbcType="VARCHAR" property="MStandard" />
<result column="MMfrs" jdbcType="VARCHAR" property="MMfrs" />
<result column="weight" jdbcType="VARCHAR" property="weight" />
<result column="position" jdbcType="VARCHAR" property="position" />
<result column="img_name" jdbcType="VARCHAR" property="imgName" />
<result column="MOtherField1" jdbcType="VARCHAR" property="MOtherField1" />
<result column="MOtherField2" jdbcType="VARCHAR" property="MOtherField2" />
@@ -308,7 +309,7 @@
</select>
<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.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,
dp1.name DepotName,dp2.name AnotherDepotName, me.bar_code barCode, me.purchase_decimal
from jsh_depot_item di
@@ -322,7 +323,7 @@
</select>
<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.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,
dp1.name DepotName,dp2.name AnotherDepotName, me.bar_code barCode, me.purchase_decimal
from jsh_depot_item di