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

解决库存预警报表查询的bug（计量单位改造导致）

Browse Source
This commit is contained in:
季圣华
2021-12-03 23:46:50 +08:00
parent 5cce9f1242
commit a20b5ebf35
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -546,10 +546,10 @@ public class DepotItemController {
*/ */
public String getUName(String materialUnit, String uName) { public String getUName(String materialUnit, String uName) {
String unitName = null; String unitName = null;
if(!StringUtil.isEmpty(materialUnit)) { if(StringUtil.isNotEmpty(materialUnit)) {
unitName = materialUnit; unitName = materialUnit;
} else if(!StringUtil.isEmpty(uName)) { } else if(StringUtil.isNotEmpty(uName)) {
unitName = uName.substring(0,uName.indexOf(",")); unitName = uName;
} }
return unitName; return unitName;
} }

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

@@ -425,7 +425,7 @@
<select id="findStockWarningCount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStockWarningCount"> <select id="findStockWarningCount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStockWarningCount">
select m.id MId, m.name MName, me.bar_code, m.mfrs MMfrs, m.model MModel, m.standard MStandard,m.color MColor, select m.id MId, m.name MName, me.bar_code, m.mfrs MMfrs, m.model MModel, m.standard MStandard,m.color MColor,
m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,d.name depotName, m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,d.name depotName,
m.unit MaterialUnit, u.name unit_name,mcs.current_number, m.unit MaterialUnit, u.basic_unit unit_name,mcs.current_number,
ifnull(mis.low_safe_stock,0) low_safe_stock, ifnull(mis.high_safe_stock,0) high_safe_stock ifnull(mis.low_safe_stock,0) low_safe_stock, ifnull(mis.high_safe_stock,0) high_safe_stock
from jsh_material m from jsh_material m
left join jsh_material_extend me on me.material_id=m.id and ifnull(me.delete_Flag,'0') !='1' left join jsh_material_extend me on me.material_id=m.id and ifnull(me.delete_Flag,'0') !='1'