wms-parent-manage/mt-pms-api
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'caixiang' of mengtong/mt-pms-api into master

Browse Source
This commit is contained in:
CaiXiangs 2020-01-12 14:29:56 +08:00 committed by Gitea
commit d7b946365b
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml
View File

@ -36,6 +36,7 @@
<resultMap extends="BaseResultMap" id="mtAloneProcessMaterialsBomVO" type="com.deer.wms.produce.manage.model.MaterialsInfoVO"> <resultMap extends="BaseResultMap" id="mtAloneProcessMaterialsBomVO" type="com.deer.wms.produce.manage.model.MaterialsInfoVO">
<result column="process_bom_id" jdbcType="INTEGER" property="processBomId" /> <result column="process_bom_id" jdbcType="INTEGER" property="processBomId" />
<result column="dosage" jdbcType="REAL" property="dosage" /> <result column="dosage" jdbcType="REAL" property="dosage" />
<result column="unit_name" jdbcType="VARCHAR" property="unitName" />
</resultMap> </resultMap>
@ -138,6 +139,7 @@
<select id="findMaterialsByKeyWords" parameterType="com.deer.wms.produce.manage.model.MaterialsInfoParams" resultMap="mtAloneProcessMaterialsBomVO"> <select id="findMaterialsByKeyWords" parameterType="com.deer.wms.produce.manage.model.MaterialsInfoParams" resultMap="mtAloneProcessMaterialsBomVO">
SELECT * from mt_alone_materials_info materialsInfo SELECT * from mt_alone_materials_info materialsInfo
LEFT JOIN unit u ON materialsInfo.unit_id = u.unit_id
<where> <where>
<if test="keywords != null and keywords != ''"> <if test="keywords != null and keywords != ''">
AND materialsInfo.materials_name LIKE CONCAT('%', #{keywords}, '%') AND materialsInfo.materials_name LIKE CONCAT('%', #{keywords}, '%')

13
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoVO.java
View File

@ -36,6 +36,19 @@ public class MaterialsInfoVO extends MaterialsInfo {
**/ **/
private Integer unitId; private Integer unitId;
/**
* 单位名称
**/
private String unitName;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
/** /**
* 备注 * 备注
**/ **/