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

优化商品信息的字段

Browse Source
This commit is contained in:
季圣华
2020-05-04 10:28:40 +08:00
parent 3f83d340c1
commit d074471de2
12 changed files with 483 additions and 2011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -38,8 +38,7 @@
<result column="MaterialUnit" jdbcType="VARCHAR" property="MaterialUnit" />
<result column="UName" jdbcType="VARCHAR" property="UName" />
<result column="MColor" jdbcType="VARCHAR" property="MColor" />
<result column="PresetPriceOne" jdbcType="DECIMAL" property="presetPriceOne" />
<result column="PriceStrategy" jdbcType="VARCHAR" property="priceStrategy" />
<result column="purchase_decimal" jdbcType="DECIMAL" property="purchaseDecimal" />
</resultMap>
<resultMap id="ResultStockWarningCount" type="com.jsh.erp.datasource.vo.DepotItemStockWarningCount">
@@ -149,11 +148,13 @@
<select id="findByAll" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultByMaterial">
select m.id MId, m.Name MName, m.Model MModel, m.Unit MaterialUnit, m.Color MColor,
m.PresetPriceOne, m.PriceStrategy, u.UName UName
me.purchase_decimal, u.UName UName
from jsh_depotitem di
inner join jsh_material m on di.MaterialId=m.id and ifnull(m.delete_Flag,'0') !='1'
left join jsh_material_extend me on me.id=di.material_extend_id and ifnull(me.delete_Flag,'0') !='1'
left join jsh_unit u on m.UnitId=u.id and ifnull(u.delete_Flag,'0') !='1'
where 1=1
and me.default_flag=1
<if test="headIds != null">
and di.HeaderId in (${headIds})
</if>
@@ -161,7 +162,7 @@
and di.MaterialId in (${materialIds})
</if>
and ifnull(di.delete_Flag,'0') !='1'
group by m.id,m.Name, m.Model, m.Unit, m.Color, m.PresetPriceOne, m.PriceStrategy, u.UName
group by m.id,m.Name, m.Model, m.Unit, m.Color, me.purchase_decimal, u.UName
<if test="offset != null and rows != null">
limit #{offset},#{rows}
</if>

1014
src/main/resources/mapper_xml/MaterialMapper.xml
View File

File diff suppressed because it is too large Load Diff

22
src/main/resources/mapper_xml/MaterialMapperEx.xml
View File

@@ -116,23 +116,6 @@
and ifnull(m.delete_Flag,'0') !='1'
</select>
<update id="updatePriceNullByPrimaryKey" parameterType="java.lang.Long">
update jsh_material
set
RetailPrice = null,
LowPrice = null,
PresetPriceOne = null,
PresetPriceTwo = null
where Id = #{id,jdbcType=BIGINT}
</update>
<update id="updateUnitIdNullByPrimaryKey" parameterType="java.lang.Long">
update jsh_material
set
UnitId = null
where Id = #{id,jdbcType=BIGINT}
</update>
<select id="findByAll" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList">
select m.*,u.uname unitName, mc.name categoryName
FROM jsh_material m
@@ -164,9 +147,8 @@
<select id="getMaterialEnableSerialNumberList" parameterType="java.util.Map" resultMap="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap">
select
Id, CategoryId, name, Mfrs, Packing, SafetyStock, Model, Standard, Color, Unit, Remark,
RetailPrice, LowPrice, PresetPriceOne, PresetPriceTwo, UnitId, FirstOutUnit, FirstInUnit,
PriceStrategy, Enabled,enableSerialNumber
Id, CategoryId, name, Mfrs, SafetyStock, Model, Standard, Color, Unit, Remark,
UnitId, Enabled,enableSerialNumber
FROM jsh_material
where 1=1
and enabled ='1'