佛山项目修改

YYC

2023-10-19 ed18e7c5d3cb3bb237cbf9eed2447ca3721258c5

佛山项目修改

 igds-inout/src/main/resources/mapper/InoutCommonMapper.xml

@@ -42,11 +42,11 @@

    <!-- æ ¹æ®ip和端口更新出入库设备状态 -->
    <update id="updateInoutConfStatus">
        update D_INOUT_CONF
        set STATUS_ = #{status}
        where IP_ = #{ip}
        and PORT_ = #{port}
    </update>
        update D_INOUT_CONF
        set STATUS_ = #{status}
        where IP_ = #{ip}
          and PORT_ = #{port}
    </update>

    <!-- æ ¹æ®å‚数获取往来单位 -->
    <select id="listCustomer" parameterType="com.ld.igds.inout.dto.InoutParam"
@@ -142,11 +142,11 @@
    <!-- èŽ·å–编码最大的单位 -->
    <select id="getMaxCustomerId" parameterType="java.lang.String"
            resultType="java.lang.String">
        select ID_ from D_INOUT_CUSTOMER
        where
        COMPANY_ID_ = #{companyId}
        order by ID_ DESC limit 1
    </select>
        select ID_
        from D_INOUT_CUSTOMER
        where COMPANY_ID_ = #{companyId}
        order by ID_ DESC limit 1
    </select>

    <!-- èŽ·å–入库通知单信息 -->
    <select id="listNoticeIn" parameterType="com.ld.igds.m.dto.NoticeParam"
@@ -156,7 +156,6 @@
        COMPANY_ID_ as companyId,
        DEPT_ID_ as deptId,
        PLAN_ID_ as planId,
        PLAN_NAME_ as planName,
        CONTRACT_ID_ as contractId,
        CONTRACT_NAME_ as contractName,
        NAME_ as name,
@@ -198,51 +197,47 @@

    <!-- æ–°å¢žå…¥åº“通知单 -->
    <insert id="addNoticeIn" parameterType="com.ld.igds.models.InoutNoticeIn">
        insert into
        D_INOUT_NOTICE_IN (
        ID_,
        COMPANY_ID_,
        DEPT_ID_,
        PLAN_ID_,
        CONTRACT_ID_,
        NAME_,
        CUSTOMER_ID_,
        CUSTOMER_NAME_,
        UNIT_NAME_,
        FOOD_VARIETY_,
        YEAR_,
        TARGET_NUMBER_,
        COMPLETE_NUMBER_,
        AUDIT_STATUS_,
        AUDIT_USER_,
        COMPLETE_STATUS_,
        CREATE_TIME_,
        CREATE_USER_,
        UPDATE_TIME_,
        REMARK_
        )values (
        #{param.id},
        #{param.companyId},
        #{param.deptId},
        #{param.planId},
        #{param.contractId},
        #{param.name},
        #{param.customerId},
        #{param.customerName},
        #{param.unitName},
        #{param.foodVariety},
        #{param.year},
        #{param.targetNumber},
        #{param.completeNumber},
        #{param.auditStatus},
        #{param.auditUser},
        #{param.completeStatus},
        #{param.createTime},
        #{param.createUser},
        #{param.updateTime},
        #{param.remark}
        )
    </insert>
        insert into D_INOUT_NOTICE_IN (ID_,
                                       COMPANY_ID_,
                                       DEPT_ID_,
                                       PLAN_ID_,
                                       CONTRACT_ID_,
                                       NAME_,
                                       CUSTOMER_ID_,
                                       CUSTOMER_NAME_,
                                       UNIT_NAME_,
                                       FOOD_VARIETY_,
                                       YEAR_,
                                       TARGET_NUMBER_,
                                       COMPLETE_NUMBER_,
                                       AUDIT_STATUS_,
                                       AUDIT_USER_,
                                       COMPLETE_STATUS_,
                                       CREATE_TIME_,
                                       CREATE_USER_,
                                       UPDATE_TIME_,
                                       REMARK_)
        values (#{param.id},
                #{param.companyId},
                #{param.deptId},
                #{param.planId},
                #{param.contractId},
                #{param.name},
                #{param.customerId},
                #{param.customerName},
                #{param.unitName},
                #{param.foodVariety},
                #{param.year},
                #{param.targetNumber},
                #{param.completeNumber},
                #{param.auditStatus},
                #{param.auditUser},
                #{param.completeStatus},
                #{param.createTime},
                #{param.createUser},
                #{param.updateTime},
                #{param.remark})
    </insert>

    <!--更新入库通知单-->
    <update id="updateNoticeIn" parameterType="com.ld.igds.m.dto.NoticeInData">
@@ -267,18 +262,17 @@

    <!-- èŽ·å–所有未完成状态入库通知单 -->
    <select id="getUnComNoticeIn" resultType="com.ld.igds.models.InoutNoticeIn">
        select
        ID_ as id,
        COMPANY_ID_ as companyId,
        DEPT_ID_ as deptId,
        PLAN_ID_ as planId,
        CONTRACT_ID_ as contractId,
        NAME_ as name,
        CUSTOMER_ID_ as customerId,
        CUSTOMER_NAME_ as customerName,
        UNIT_NAME_ as unitName,
        FOOD_VARIETY_ as foodVariety,
        YEAR_ as year,
        select ID_            as id,
               COMPANY_ID_    as companyId,
               DEPT_ID_       as deptId,
               PLAN_ID_       as planId,
               CONTRACT_ID_   as contractId,
               NAME_          as name,
               CUSTOMER_ID_   as customerId,
               CUSTOMER_NAME_ as customerName,
               UNIT_NAME_     as unitName,
               FOOD_VARIETY_  as foodVariety,
               YEAR_ as year,
        TARGET_NUMBER_ as targetNumber,
        COMPLETE_NUMBER_ as completeNumber,
        AUDIT_STATUS_ as auditStatus,
@@ -288,36 +282,36 @@
        CREATE_USER_ as createUser,
        COMPLETE_TIME_ as completeTime,
        REMARK_ as remark
        from
        D_INOUT_NOTICE_IN
        where
        COMPLETE_STATUS_ = 'NONE'
        and COMPANY_ID_ = #{companyId}
    </select>
        from
            D_INOUT_NOTICE_IN
        where
            COMPLETE_STATUS_ = 'NONE'
          and COMPANY_ID_ = #{companyId}
    </select>

    <!-- é‡æ–°è®¡ç®—入库通知单完成量 -->
    <update id="reSumNoticeInComplete" parameterType="com.ld.igds.m.dto.NoticeParam">
        update D_INOUT_NOTICE_IN t,(
        SELECT
        r.CUSTOMER_ID_,
        r.FOOD_VARIETY_,
        r.NOTICE_ID_,
        sum(r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
        from d_inout_record r
        where r.COMPANY_ID_ = #{param.companyId}
        and r.DEPT_ID_ = #{param.deptId}
        and r.CUSTOMER_ID_ = #{param.customerId}
        and r.FOOD_VARIETY_ = #{param.foodVariety}
        and r.NOTICE_ID_ = #{param.id}
        and r.RECORD_STATUS_ != 'DEL'
        and r.RECORD_STATUS_ != 'ERROR'
        GROUP BY r.FOOD_VARIETY_
        ) b
        SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
        WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
        AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
        AND t.ID_ = b.NOTICE_ID_
    </update>
        update D_INOUT_NOTICE_IN t,(
            SELECT
            r.CUSTOMER_ID_,
            r.FOOD_VARIETY_,
            r.NOTICE_ID_,
            sum (r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
            from d_inout_record r
            where r.COMPANY_ID_ = #{param.companyId}
            and r.DEPT_ID_ = #{param.deptId}
            and r.CUSTOMER_ID_ = #{param.customerId}
            and r.FOOD_VARIETY_ = #{param.foodVariety}
            and r.NOTICE_ID_ = #{param.id}
            and r.RECORD_STATUS_ != 'DEL'
            and r.RECORD_STATUS_ != 'ERROR'
            GROUP BY r.FOOD_VARIETY_
            ) b
        SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
        WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
          AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
          AND t.ID_ = b.NOTICE_ID_
    </update>

    <!-- æ ¹æ®å‚数查询出库通知单 -->
    <select id="queryNoticeOut" resultType="int" parameterType="com.ld.igds.m.dto.NoticeParam">
@@ -387,7 +381,6 @@
        COMPANY_ID_ as companyId,
        DEPT_ID_ as deptId,
        PLAN_ID_ as planId,
        PLAN_NAME_ as planName,
        CONTRACT_ID_ as contractId,
        CONTRACT_NAME_ as contractName,
        NAME_ as name,
@@ -437,21 +430,20 @@

    <!-- èŽ·å–所有未完成状态出库通知单 -->
    <select id="getUnComNoticeOut" resultType="com.ld.igds.models.InoutNoticeOut">
        select
        ID_ as id,
        COMPANY_ID_ as companyId,
        DEPT_ID_ as deptId,
        PLAN_ID_ as planId,
        CONTRACT_ID_ as contractId,
        NAME_ as name,
        DEPOT_ID_ as depotId,
        CUSTOMER_ID_ as customerId,
        CUSTOMER_NAME_ as customerName,
        UNIT_NAME_ as unitName,
        FOOD_VARIETY_ as foodVariety,
        FOOD_TYPE_ as foodType,
        FOOD_LEVEL_ as foodLevel,
        YEAR_ as year,
        select ID_            as id,
               COMPANY_ID_    as companyId,
               DEPT_ID_       as deptId,
               PLAN_ID_       as planId,
               CONTRACT_ID_   as contractId,
               NAME_          as name,
               DEPOT_ID_      as depotId,
               CUSTOMER_ID_   as customerId,
               CUSTOMER_NAME_ as customerName,
               UNIT_NAME_     as unitName,
               FOOD_VARIETY_  as foodVariety,
               FOOD_TYPE_     as foodType,
               FOOD_LEVEL_    as foodLevel,
               YEAR_ as year,
        STORAGE_REAL_ as storageReal,
        TARGET_NUMBER_ as targetNumber,
        COMPLETE_NUMBER_ as completeNumber,
@@ -462,37 +454,37 @@
        CREATE_USER_ as createUser,
        COMPLETE_TIME_ as completeTime,
        REMARK_ as remark
        from
        D_INOUT_NOTICE_OUT
        where
        COMPLETE_STATUS_ = 'NONE'
        and COMPANY_ID_ = #{companyId}
    </select>
        from
            D_INOUT_NOTICE_OUT
        where
            COMPLETE_STATUS_ = 'NONE'
          and COMPANY_ID_ = #{companyId}
    </select>

    <!-- é‡æ–°è®¡ç®—出库通知单完成量，只根据客户更新 -->
    <update id="reSumNoticeOutComplete" parameterType="com.ld.igds.m.dto.NoticeParam">
        update D_INOUT_NOTICE_OUT t,(
        SELECT
        r.CUSTOMER_ID_,
        r.FOOD_VARIETY_,
        r.DEPOT_ID_,
        r.NOTICE_ID_,
        sum(r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
        from d_inout_record r
        where r.COMPANY_ID_ = #{param.companyId}
        AND r.DEPT_ID_ = #{param.deptId}
        and r.CUSTOMER_ID_ = #{param.customerId}
        and r.DEPOT_ID_ = #{param.depotId}
        and r.FOOD_VARIETY_ = #{param.foodVariety}
        and r.RECORD_STATUS_ != 'DEL'
        and r.RECORD_STATUS_ != 'ERROR'
        GROUP BY r.DEPOT_ID_
        ) b
        SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
        WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
        AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
        AND t.DEPOT_ID_ = b.DEPOT_ID_
        AND t.ID_ = b.NOTICE_ID_
    </update>
        update D_INOUT_NOTICE_OUT t,(
            SELECT
            r.CUSTOMER_ID_,
            r.FOOD_VARIETY_,
            r.DEPOT_ID_,
            r.NOTICE_ID_,
            sum (r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
            from d_inout_record r
            where r.COMPANY_ID_ = #{param.companyId}
            AND r.DEPT_ID_ = #{param.deptId}
            and r.CUSTOMER_ID_ = #{param.customerId}
            and r.DEPOT_ID_ = #{param.depotId}
            and r.FOOD_VARIETY_ = #{param.foodVariety}
            and r.RECORD_STATUS_ != 'DEL'
            and r.RECORD_STATUS_ != 'ERROR'
            GROUP BY r.DEPOT_ID_
            ) b
        SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
        WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
          AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
          AND t.DEPOT_ID_ = b.DEPOT_ID_
          AND t.ID_ = b.NOTICE_ID_
    </update>

</mapper>

 igds-web/pom.xml

@@ -204,7 +204,7 @@
            </exclusions>
        </dependency>

        <!--  ç§æœ‰åè®®-贝博粮情
        <!--  ç§æœ‰åè®®-贝博粮情-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-beibo</artifactId>
@@ -219,9 +219,9 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>-->
        </dependency>

        <!--  ç§æœ‰åè®®-DLT645电表协议
        <!--  ç§æœ‰åè®®-DLT645电表协议-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-es</artifactId>
@@ -236,7 +236,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>-->
        </dependency>

        <!--  ç§æœ‰åè®®-邦海智能-->
        <dependency>

 igds-web/src/main/java/com/ld/igds/web/WebController.java

@@ -97,7 +97,7 @@

        // æŠ€æœ¯æ”¯æŒä¿¡æ¯
        view.addObject("support", "技术支持：" + sysConf.getSupport());
        if (StringUtils.isEmpty(groupTag)){
        if (StringUtils.isEmpty(groupTag)) {
            groupTag = "0";
        }
        view.addObject("groupTag", groupTag);
@@ -113,6 +113,9 @@
        }
        if ("5326".equals(companyId)) {
            view.setViewName("index/index-5326");
        }
        if ("5329".equals(companyId)) {
            view.setViewName("index/index-5329");
        }
        return view;
    }
@@ -193,7 +196,7 @@
            welcomeUrl += "all";
        } else {
            welcomeUrl += code;
            menuList = systemService.getMenuBySystemId(company.getId(), code,user);
            menuList = systemService.getMenuBySystemId(company.getId(), code, user);
        }

        view.addObject("menuList", menuList);

 igds-web/src/main/resources/templates/index/index-5329.html

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,223 @@
<!DOCTYPE html>
<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="viewport"
          content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <title>智慧仓库管理系统 -首页</title>
    <meta name="description" content="智慧仓库管理系统">

    <link rel="shortcut icon" th:href="@{/static/favicon.ico}"/>
    <link th:href="@{/static/plugins/layui/css/layui.css}" rel="stylesheet"
          type="text/css">
    <link th:href="@{/static/index/index.css}" rel="stylesheet"
          type="text/css">

</head>
<style>
    .i-footer p {
        line-height: 24px;
        /*     color: #8a99a6; */
        color: #FFF;
        font-size: 16px;
    }

    .i-tit img {
        height: 96px;
    }

    .dis-none {
        display: none !important;
    }
</style>

<body>
<div class="i-bodyBg">
    <img th:src="@{/static/images/i-body2.png}"/>
</div>

<div class="i-container ">
    <div class="i-top layui-row">
        <div class="layui-col-lg6">
            <h1 class="i-logo">
                <img th:src="${logoTitle}"/>
            </h1>
        </div>
        <div class="i-top-r">
            <a id="menu-group" href="./home-group" target="_self" class="i-top-btn dis-none">
                <i class="i-icon">
                    <img th:src="@{/static/images/i-icon-sy.png}" style="height: 28px;width: 28px;"/>
                </i>
                é¦–页
            </a>
            <!--            <a href="./basic/common/help-center" target="_blank" class="i-top-btn">-->
            <!--                <i class="i-icon">-->
            <!--                    <img th:src="@{/static/images/i-icon-help.png}"/>-->
            <!--                </i>-->
            <!--                å¸®åŠ©-->
            <!--            </a>-->
            <a href="./basic/databoard/index-gateway" target="_blank" class="i-top-btn">
                <i class="i-icon">
                    <img th:src="@{/static/images/i-icon-dpm.png}"/>
                </i>
                ç»¼åˆå¤§å±
            </a>
            <a href="./basic/databoard/inout" target="_blank" class="i-top-btn">
                <i class="i-icon">
                    <img th:src="@{/static/images/i-icon-dpm.png}"/>
                </i>
                å‡ºå…¥åº“大屏
            </a>
            <a href="./log-out" class="i-top-btn">
                <i class="i-icon">
                    <img th:src="@{/static/images/i-icon-tc.png}"/>
                </i>
                é€€å‡ºç™»å½•
            </a>
        </div>
    </div>

</div>
<!--i-top end-->

<h2 class="i-tit">
    <img th:src="@{/static/images/login-titimg2.png}"/>
</h2>

<div class="i-main layui-row">
    <div class="layui-col-lg6">
        <div class="i-menuBox">
                <span class="i-menu-item i-menu-tit"> <img
                        th:src="@{/static/images/i-bg-tit1.png}"/>
                </span> <span class="i-menu-item i-menu1 i-navBg1"> <a
                href="javascript:;" onclick="openByTag('grain')"> <i><img
                th:src="@{/static/images/i-icon-lq.png}"/></i>
                        <P>多参数粮情</P>
                </a>
                </span> <span class="i-menu-item i-menu2 i-navBg2"> <a
                href="javascript:;" onclick="openByTag('temp')"> <i><img
                th:src="@{/static/images/i-icon-wkgl.png}"/></i>
                        <P>内环流温控</P>
                </a>
                </span> <span class="i-menu-item i-menu3 i-navBg3"> <a
                href="javascript:;" onclick=""> <i></i>
                        <P></P>
                </a>
                </span> <span class="i-menu-item i-menu4 i-navBg4"> <a
                href="javascript:;" onclick="openByTag('warn')"> <i><img
                th:src="@{/static/images/i-icon-ai.png}"/></i>
                        <P>智能预警</P>
                </a>
                </span> <span class="i-menu-item i-menu5 i-navBg5">
                <a href="javascript:;" onClick="open3d()">
                    <i><img th:src="@{/static/images/i-icon-help1.png}"/></i>
                    <P>帮助中心</P>
                </a>
                </span> <span class="i-menu-item i-menu6 i-navBg6"> <a
                href="javascript:;" onclick="openByTag('temp')"> <i></i>
                        <P></P>
                </a>
                </span>
        </div>
        <!--i-menuBox end-->

    </div>

    <div class="layui-col-lg6">
        <div class="i-menuBox">
                <span class="i-menu-item i-menu-tit"> <img
                        th:src="@{/static/images/i-bg-tit2.png}"/>
                </span> <span class="i-menu-item i-menu1 i-navBg6"> <a
                href="javascript:;" onclick="openByTag('inout')"> <i><img
                th:src="@{/static/images/i-icon-crkgl.png}"/></i>
                        <P>出入库管理</P>
                </a>
                </span> <span class="i-menu-item i-menu2 i-navBg3"> <a
                href="javascript:;" onclick="openByTag('manager')"> <i><img
                th:src="@{/static/images/i-icon-zhyw.png}"/></i>
                        <P>综合业务</P>
                </a>
                </span> <span class="i-menu-item i-menu3 i-navBg4"> <a
                href="javascript:;" onClick="open3d()"> <i><img
                th:src="@{/static/images/i-icon-swzs.png}"/></i>
                        <P>三维展示</P>
                </a>
                </span> <span class="i-menu-item i-menu4 i-navBg5"> <a
                href="javascript:;" onclick="openByTag('sys')"> <i><img
                th:src="@{/static/images/i-icon-xtgl.png}"/></i>
                        <P>系统管理</P>
                </a>
                </span> <span class="i-menu-item i-menu5 i-navBg2"> <a
                href="javascript:;" onclick="openByTag('es')"> <i><img
                th:src="@{/static/images/i-icon-nhgl.png}"/></i>
                        <P>能耗管理</P>
                </a>
                </span> <span class="i-menu-item i-menu6 i-navBg1"> <a
                href="javascript:;" onclick="openByTag('security')"> <i><img
                th:src="@{/static/images/i-icon-afgl.png}"/></i>
                        <P>安防管理</P>
                </a>
                </span>
        </div>
        <!--i-menuBox end-->
    </div>
</div>

<!--i-main end-->
<div class="i-footer">
    <p th:text=${support}>技术支持: é£Žæ­£è‡´è¿œä¿¡æ¯æŠ€æœ¯è‚¡ä»½æœ‰é™å…¬å¸</p>
</div>

<script th:src="@{/static/js/jquery.min.js}"></script>

<script th:inline="javascript">
    //定义变量
    var companyId = [[${loginUser.companyId}]];
    //userId
    var userId = [[${loginUser.username}]];

    //数量检测访问地址
    var quantityPath = [[${quantityPath}]];

    //三维路径
    var threePath = [[${threePath}]];

    var groupTag = [[${groupTag}]];//是否集团或者公司用户进入

    window.onload = function () {
        //表示集团/公司用户进入
        if (1 == groupTag) {
            $("#menu-group").removeClass("dis-none");
        }
    };

    function openByTag(tag) {
        window.open("./home?t=" + tag + "&g=" + groupTag, "_self");
    };

    //打开质量检
    function openQuantity() {
        if ("#" == quantityPath) {
            openByTag("quantity")
        } else {
            window.open(quantityPath, "_blank");
        }
    };

    //打开质量检测
    // function open3d() {
    //     if ("#" == threePath) {
    //         window.open("#", "_self");
    //     } else {
    //         window.open(threePath, "_blank");
    //     }
    // };
    function open3d() {
        window.open("./basic/common/help-center", "_blank");
    };
</script>
</body>

</html>