给报表里面增加规格展示

3f2a592e · 季圣华 · 56bc53c2 · 3f2a592e · 3f2a592e · 3f2a592e
Commit 3f2a592e authored Dec 26, 2020 by 季圣华
--- a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java
+++ b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java
@@ -350,8 +350,6 @@ public class MaterialCategoryService {

    /**
     * create by: qiankunpingtai
-     * website：https://qiankunpingtai.cn
-     * description:
     *  正常删除，要考虑数据完整性，进行完整性校验
     * create time: 2019/4/11 9:26
     * @Param: ids

--- a/src/main/java/com/jsh/erp/service/msg/MsgService.java
+++ b/src/main/java/com/jsh/erp/service/msg/MsgService.java
@@ -182,8 +182,6 @@ public class MsgService {

    /**
     * create by: qiankunpingtai
-     * website：https://qiankunpingtai.cn
-     * description:
     *  逻辑删除角色信息
     * create time: 2019/3/28 15:44
     * @Param: ids

--- a/src/main/java/com/jsh/erp/service/person/PersonService.java
+++ b/src/main/java/com/jsh/erp/service/person/PersonService.java
@@ -224,8 +224,6 @@ public class PersonService {
    }
    /**
     * create by: qiankunpingtai
-     * website：https://qiankunpingtai.cn
-     * description:
     *  正常删除，要考虑数据完整性，进行完整性校验
     * create time: 2019/4/10 15:14
     * @Param: ids

--- a/src/main/java/com/jsh/erp/service/role/RoleService.java
+++ b/src/main/java/com/jsh/erp/service/role/RoleService.java
@@ -177,8 +177,6 @@ public class RoleService {
    }
    /**
     * create by: qiankunpingtai
-     * website：https://qiankunpingtai.cn
-     * description:
     *  逻辑删除角色信息
     * create time: 2019/3/28 15:44
     * @Param: ids

--- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
+++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
@@ -515,8 +515,6 @@ public class SerialNumberService {
    }
    /**
     * create by: qiankunpingtai
-     * website：https://qiankunpingtai.cn
-     * description:
     *  逻辑删除序列号信息
     * create time: 2019/3/27 17:43
     * @Param: ids

--- a/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
+++ b/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
@@ -379,8 +379,6 @@ public class SupplierService {
    }
    /**
     * create by: qiankunpingtai
-     * website：https://qiankunpingtai.cn
-     * description:
     *正常删除，要考虑数据完整性，进行完整性校验
     * create time: 2019/4/10 14:48
     * @Param: ids

--- a/src/main/java/com/jsh/erp/service/unit/UnitService.java
+++ b/src/main/java/com/jsh/erp/service/unit/UnitService.java
@@ -188,8 +188,6 @@ public class UnitService {

    /**
     * create by: qiankunpingtai
-     * website：https://qiankunpingtai.cn
-     * description:
     *  正常删除，要考虑数据完整性，进行完整性校验
     * create time: 2019/4/11 10:20
     * @Param: ids

--- a/src/main/java/com/jsh/erp/service/user/UserService.java
+++ b/src/main/java/com/jsh/erp/service/user/UserService.java
@@ -450,8 +450,6 @@ public class UserService {
        /**
         * create by: qiankunpingtai
         * create time: 2019/4/9 18:00
-         * website：https://qiankunpingtai.cn
-         * description:
         * 多次创建事务，事物之间无法协同，应该在入口处创建一个事务以做协调
         */
        if(BusinessConstants.DEFAULT_MANAGER.equals(ue.getLoginName())) {

--- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -12,6 +12,7 @@
        <result column="Number" jdbcType="VARCHAR" property="Number" />
        <result column="MName" jdbcType="VARCHAR" property="MName" />
        <result column="Model" jdbcType="VARCHAR" property="Model" />
+        <result column="standard" jdbcType="VARCHAR" property="standard" />
        <result column="unit_price" jdbcType="DECIMAL" property="UnitPrice" />
        <result column="oper_number" jdbcType="DECIMAL" property="OperNumber" />
        <result column="all_price" jdbcType="DECIMAL" property="AllPrice" />
@@ -25,6 +26,7 @@
        <result column="MaterialId" jdbcType="BIGINT" property="MaterialId" />
        <result column="mName" jdbcType="VARCHAR" property="mName" />
        <result column="Model" jdbcType="VARCHAR" property="Model" />
+        <result column="standard" jdbcType="VARCHAR" property="standard" />
        <result column="categoryName" jdbcType="VARCHAR" property="categoryName" />
        <result column="numSum" jdbcType="DECIMAL" property="numSum" />
        <result column="priceSum" jdbcType="DECIMAL" property="priceSum" />
@@ -136,7 +138,7 @@
    </select>

    <select id="findByAll" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
-        select dh.number,m.`name` MName,m.model,di.unit_price,di.oper_number,di.all_price,s.supplier SName,d.dName DName,
+        select dh.number,m.`name` MName,m.model,m.standard,di.unit_price,di.oper_number,di.all_price,s.supplier SName,d.dName DName,
        date_format(dh.oper_time, '%Y-%m-%d') OperTime, concat(dh.sub_type,dh.type) as NewType
        from jsh_depot_head dh
        inner join jsh_depot_item di on di.header_id=dh.id and ifnull(di.delete_flag,'0') !='1'
@@ -188,8 +190,7 @@
    </select>

    <select id="findInOutMaterialCount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultInOutMaterialCount">
-        select di.material_id, m.mName,m.Model,m.categoryName,
-
+        select di.material_id, m.mName,m.Model,m.standard,m.categoryName,
        (select sum(jdi.basic_number) numSum from jsh_depot_head jdh
        INNER JOIN jsh_depot_item jdi on jdh.id=jdi.header_id and ifnull(jdi.delete_flag,'0') !='1'
        where jdi.material_id=di.material_id
@@ -223,7 +224,7 @@
        ) priceSum
        from jsh_depot_head dh
        INNER JOIN jsh_depot_item di on dh.id=di.header_id and ifnull(di.delete_flag,'0') !='1'
-        INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_material_category.`Name` categoryName
+        INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model, standard, jsh_material_category.`Name` categoryName
        from jsh_material
        LEFT JOIN jsh_material_category on jsh_material.category_id=jsh_material_category.Id and ifnull(jsh_material_category.status,'0') !='2'
        where ifnull(jsh_material.delete_Flag,'0') !='1'
@@ -239,7 +240,7 @@
            and di.depot_id in (${dids})
        </if>
        and ifnull(dh.delete_flag,'0') !='1'
-        GROUP BY di.material_id,m.mName,m.Model,m.categoryName
+        GROUP BY di.material_id,m.mName,m.Model,m.standard,m.categoryName
        <if test="offset != null and rows != null">
            limit #{offset},#{rows}
        </if>
@@ -247,9 +248,9 @@

    <select id="findInOutMaterialCountTotal" resultType="java.lang.Integer">
        select count(1) from
-        (select di.material_id, m.mName,m.Model,m.categoryName from jsh_depot_head dh
+        (select di.material_id, m.mName,m.Model,m.standard,m.categoryName from jsh_depot_head dh
        INNER JOIN jsh_depot_item di on dh.id=di.header_id  and ifnull(di.delete_flag,'0') !='1'
-        INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_material_category.`Name` categoryName
+        INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,standard,jsh_material_category.`Name` categoryName
        from jsh_material
        LEFT JOIN jsh_material_category on jsh_material.category_id=jsh_material_category.Id and ifnull(jsh_material_category.status,'0') !='2'
        where ifnull(jsh_material.delete_Flag,'0') !='1'
@@ -264,7 +265,7 @@
            and di.depot_id in (${dids})
        </if>
        and ifnull(dh.delete_flag,'0') !='1'
-        GROUP BY di.material_id,m.mName,m.Model,m.categoryName) a
+        GROUP BY di.material_id,m.mName,m.Model,m.standard,m.categoryName) a
    </select>

    <select id="findStatementAccount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStatementAccount">

--- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -39,6 +39,7 @@
        <result column="MName" jdbcType="VARCHAR" property="MName" />
        <result column="MMfrs" jdbcType="VARCHAR" property="MMfrs" />
        <result column="MModel" jdbcType="VARCHAR" property="MModel" />
+        <result column="MStandard" jdbcType="VARCHAR" property="MStandard" />
        <result column="MaterialUnit" jdbcType="VARCHAR" property="MaterialUnit" />
        <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
        <result column="MColor" jdbcType="VARCHAR" property="MColor" />
@@ -48,6 +49,7 @@
    <resultMap id="ResultStockWarningCount" type="com.jsh.erp.datasource.vo.DepotItemStockWarningCount">
        <result column="MaterialName" jdbcType="VARCHAR" property="MaterialName" />
        <result column="MaterialModel" jdbcType="VARCHAR" property="MaterialModel" />
+        <result column="MaterialStandard" jdbcType="VARCHAR" property="MaterialStandard" />
        <result column="categoryName" jdbcType="VARCHAR" property="categoryName" />
        <result column="MaterialOther" jdbcType="VARCHAR" property="MaterialOther" />
        <result column="MaterialUnit" jdbcType="VARCHAR" property="MaterialUnit" />
@@ -155,7 +157,7 @@
    </select>

    <select id="findByAll" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultByMaterial">
-        select m.id MId, m.name MName, m.mfrs MMfrs, m.model MModel,
+        select m.id MId, m.name MName, m.mfrs MMfrs, m.model MModel, m.standard MStandard,
        m.unit MaterialUnit, m.color MColor, u.name unit_name,
        (select purchase_decimal from jsh_material_extend me
        where me.material_id=m.id and me.default_flag=1 and ifnull(me.delete_Flag,'0') !='1' limit 0,1)
@@ -366,6 +368,7 @@
        SELECT
        m.name MaterialName,
        m.model MaterialModel,
+        m.standard MaterialStandard,
        mc.`Name` categoryName,
        CONCAT(
        '(',