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-09-28 01:07:47 +08:00
parent 538a641ef5
commit 33dbe7c3b9
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@ -1337,9 +1337,6 @@ public class MaterialService {
public String getMaterialOtherByParam(String[] mpArr, MaterialVo4Unit m) { public String getMaterialOtherByParam(String[] mpArr, MaterialVo4Unit m) {
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 + ((m.getMfrs() == null || m.getMfrs().equals("")) ? "" : "(" + m.getMfrs() + ")");
}
if (mpArr[i].equals("自定义1")) { if (mpArr[i].equals("自定义1")) {
materialOther = materialOther + ((m.getOtherField1() == null || m.getOtherField1().equals("")) ? "" : "(" + m.getOtherField1() + ")"); materialOther = materialOther + ((m.getOtherField1() == null || m.getOtherField1().equals("")) ? "" : "(" + m.getOtherField1() + ")");
} }

16
jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
View File

@ -48,7 +48,7 @@
where 1=1 where 1=1
<if test="materialParam != null and materialParam !=''"> <if test="materialParam != null and materialParam !=''">
<bind name="bindKey" value="'%'+materialParam+'%'"/> <bind name="bindKey" value="'%'+materialParam+'%'"/>
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey} or m.mnemonic like #{bindKey})
</if> </if>
<if test="color != null and color !=''"> <if test="color != null and color !=''">
<bind name="bindColor" value="'%'+color+'%'"/> <bind name="bindColor" value="'%'+color+'%'"/>
@ -107,7 +107,7 @@
and me.default_flag=1 and me.default_flag=1
<if test="materialParam != null and materialParam !=''"> <if test="materialParam != null and materialParam !=''">
<bind name="bindKey" value="'%'+materialParam+'%'"/> <bind name="bindKey" value="'%'+materialParam+'%'"/>
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey} or m.mnemonic like #{bindKey})
</if> </if>
<if test="color != null and color !=''"> <if test="color != null and color !=''">
<bind name="bindColor" value="'%'+color+'%'"/> <bind name="bindColor" value="'%'+color+'%'"/>
@ -171,6 +171,12 @@
<if test="standard != null"> <if test="standard != null">
standard, standard,
</if> </if>
<if test="brand != null">
brand,
</if>
<if test="mnemonic != null">
mnemonic,
</if>
<if test="color != null"> <if test="color != null">
color, color,
</if> </if>
@ -239,6 +245,12 @@
<if test="standard != null"> <if test="standard != null">
#{standard,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR},
</if> </if>
<if test="brand != null">
#{brand,jdbcType=VARCHAR},
</if>
<if test="mnemonic != null">
#{mnemonic,jdbcType=VARCHAR},
</if>
<if test="color != null"> <if test="color != null">
#{color,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR},
</if> </if>

3
jshERP-web/.gitignore vendored
View File

@ -18,4 +18,5 @@ yarn-error.log*
*.ntvs* *.ntvs*
*.njsproj *.njsproj
*.sln *.sln
*.sw* *.sw*
/package-lock.json