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

给商品库存增加图片的展示

Browse Source
This commit is contained in:
jishenghua
2025-06-15 16:01:14 +08:00
parent 715976be2d
commit 271026979d
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,6 +389,11 @@ public class DepotItemController {
} else { } else {
item.put("thisAllPrice", thisSum.multiply(diEx.getPurchaseDecimal())); item.put("thisAllPrice", thisSum.multiply(diEx.getPurchaseDecimal()));
} }
item.put("imgName", diEx.getImgName());
if(fileUploadType == 2) {
item.put("imgSmall", "small");
item.put("imgLarge", "large");
}
dataArray.add(item); dataArray.add(item);
} }
} }

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

@@ -350,7 +350,7 @@
<select id="getInOutStock" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultByMaterial"> <select id="getInOutStock" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultByMaterial">
select m.id MId, me.bar_code, m.name MName, m.mfrs MMfrs, m.model MModel, m.standard MStandard, m.brand, select m.id MId, me.bar_code, m.name MName, m.mfrs MMfrs, m.model MModel, m.standard MStandard, m.brand,
m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3, m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3, m.img_name,
concat_ws('', m.unit, u.basic_unit) MaterialUnit, m.color MColor, m.unit_id, u.name unit_name, concat_ws('', m.unit, u.basic_unit) MaterialUnit, m.color MColor, m.unit_id, u.name unit_name,
ifnull(me.purchase_decimal,0) purchase_decimal, ifnull(mcs.current_unit_price,0) currentUnitPrice ifnull(me.purchase_decimal,0) purchase_decimal, ifnull(mcs.current_unit_price,0) currentUnitPrice
from jsh_material m from jsh_material m
@@ -377,7 +377,7 @@
</if> </if>
and ifnull(m.delete_flag,'0') !='1' and ifnull(m.delete_flag,'0') !='1'
group by m.id, me.bar_code, m.name, m.mfrs, m.model, m.standard, m.brand, group by m.id, me.bar_code, m.name, m.mfrs, m.model, m.standard, m.brand,
m.other_field1,m.other_field2,m.other_field3,m.unit, u.basic_unit, m.color, m.unit_id, u.name, m.other_field1,m.other_field2,m.other_field3, m.img_name ,m.unit, u.basic_unit, m.color, m.unit_id, u.name,
me.purchase_decimal, mcs.current_unit_price me.purchase_decimal, mcs.current_unit_price
order by m.id desc order by m.id desc
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">

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

@@ -650,7 +650,7 @@
</select> </select>
<select id="getListWithStock" resultMap="ResultMapListWithStock"> <select id="getListWithStock" resultMap="ResultMapListWithStock">
select m.id, m.name, m.standard, m.model, m.color, m.brand, m.mfrs, m.position, select m.id, m.name, m.standard, m.model, m.color, m.brand, m.mfrs, m.position, m.img_name,
me.commodity_unit unitName, mc.name categoryName, me.bar_code mBarCode, me.commodity_unit unitName, mc.name categoryName, me.bar_code mBarCode,
ifnull(me.purchase_decimal,0) purchaseDecimal, ifnull(me.purchase_decimal,0) purchaseDecimal,
ifnull(mcs.current_unit_price,0) currentUnitPrice, ifnull(mcs.current_unit_price,0) currentUnitPrice,
@@ -688,7 +688,7 @@
or m.other_field2 like #{bindKey} or m.other_field3 like #{bindKey}) or m.other_field2 like #{bindKey} or m.other_field3 like #{bindKey})
</if> </if>
and ifnull(m.delete_flag,'0') !='1' and ifnull(m.delete_flag,'0') !='1'
group by m.id, m.name, m.standard, m.model, m.color, m.brand, m.mfrs, m.position, group by m.id, m.name, m.standard, m.model, m.color, m.brand, m.mfrs, m.position, m.img_name,
me.commodity_unit, mc.name, me.bar_code, ifnull(me.purchase_decimal,0), ifnull(mcs.current_unit_price,0) me.commodity_unit, mc.name, me.bar_code, ifnull(me.purchase_decimal,0), ifnull(mcs.current_unit_price,0)
<if test="zeroStock == 0"> <if test="zeroStock == 0">
having ifnull(sum(mcs.current_number),0)!=0 having ifnull(sum(mcs.current_number),0)!=0