船运问题修改

YYC

2023-10-19 6bd36a38fc587ba39bd50e26257ed6ece71363e7

船运问题修改

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java

@@ -227,6 +227,9 @@
        if (null == data.getIntelCard()) {
            data.setIntelCard(data.getUserId());
        }
        if (null == data.getRegisterTime()) {
            data.setRegisterTime(new Date());
        }
        msg = inoutService.insertData(data);

        //执行附件信息

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

@@ -104,14 +104,14 @@
            <if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
            <if test="param.progress != null and param.progress != '' ">AND PROGRESS_ = #{param.progress}</if>
            <if test="param.end != null">AND
                COMPLETE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
                UPDATE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
            </if>
            <if test="param.start != null">AND
                COMPLETE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
                UPDATE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
            </if>
            AND PROGRESS_ = 'RECORD'
            AND RECORD_STATUS_ != 'DEL'
            ORDER BY COMPLETE_TIME_
            ORDER BY UPDATE_TIME_
        </where>
    </select>


 igds-web/src/main/resources/static/admin/inout/in-ship-register.js

@@ -387,7 +387,7 @@
    // 渲染往来单位列表
    table.render({
        elem: '#tableNotice',
        url: '../../basic/inout/list-notice—in',
        url: '../../basic/inout/list-notice-in',
        page: false,
        even: true,
        method: 'POST',
@@ -462,7 +462,7 @@
    // 渲染往来单位列表
    table.render({
        elem : '#tableFoodLoaction',
        url : '../../basic/common/page-food-location',
        url: '../../basic/common/page-dicArea',
        page : false,
        toolbar : '#toolbarFoodLocaton',
        even : true,
@@ -536,7 +536,7 @@
function flushFoodLocation() {
    var key = $("#key2").val();
    table.reload('tableFoodLoaction', {
        url : "../../basic/common/page-food-location",
        url: "../../basic/common/page-dicArea",
        where : {
            key : key
        },

 igds-web/src/main/resources/static/admin/inout/out-ship-register.js

@@ -207,7 +207,7 @@
    // 渲染往来单位列表
    table.render({
        elem: '#tableNotice',
        url: '../../basic/inout/list-notice—out',
        url: '../../basic/inout/list-notice-out',
        page: false,
        // skin : "nob",
        // size : 'sm',
@@ -289,7 +289,7 @@
    // 渲染往来单位列表
    table.render({
        elem : '#tableFoodLoaction',
        url : '../../basic/common/page-food-location',
        url: '../../basic/common/page-dicArea',
        page : false,
        toolbar : '#toolbarFoodLocaton',
        even : true,
@@ -363,7 +363,7 @@
function flushFoodLocation() {
    var key = $("#key2").val();
    table.reload('tableFoodLoaction', {
        url : "../../basic/common/page-food-location",
        url: "../../basic/common/page-dicArea",
        where : {
            key : key
        },

 igds-web/src/main/resources/templates/admin/inout/in-ship-register.html

@@ -39,6 +39,7 @@
        .rkbk-right-form .layui-input-block {
             margin-right: unset;
        }

        .layui-form-item .layui-input-inline {
            width: unset;
        }
@@ -46,9 +47,11 @@
        .rkbk-search-input{
            background: #FFF !important;
        }

        .rkbk-search-input.bg-date {
            background: #FFF !important;
        }

        .layui-select-disabled .layui-disabled {
            color: #000 !important;
        }
@@ -61,6 +64,7 @@
            padding: 10px;
            color: blue;
        }

        .layui-form-selected dl {
            max-height: 150px;
        }
@@ -164,7 +168,8 @@
                                <!--rk-form-left end-->

                                <div class="rkbk-photo">
                                    <a href="#"><img id="id_img_pers" th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
                                    <a href="#"><img id="id_img_pers"
                                                     th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
                                </div>

                            </div>
@@ -257,6 +262,9 @@
                                    </select>
                                </div>
                            </div>
                            <div class="layui-form-item display-none">
                                <input type="text" name="foodLocationId">
                            </div>
                            <div class="layui-form-item">
                                <label class="layui-form-label">装卸仓库：</label>
                                <div class="layui-input-block">
@@ -311,6 +319,8 @@
    var listDepot = [[${listDepot}]];
    //当前节点

    //品种
    var listFoodVariety = [[${listFoodVariety}]];
    //业务步骤
    var bizType = [[${bizType}]];
    var checkUser = [[${checkUser}]];
@@ -320,13 +330,13 @@
    var userId = [[${loginUser.username}]];
    var companyId = [[${loginUser.companyId}]];
    //车牌识别
    var listFoodVariety = [[${listFoodVariety}]];
</script>

<script th:src="@{../../static/plugins/layui/layui.js}"></script>
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/in-ship-register.js}"></script>

<!-- 弹出通知单 -->

 igds-web/src/main/resources/templates/admin/inout/out-ship-register.html

@@ -35,15 +35,19 @@
        .rkbk-right-form .layui-input-block {
             margin-right: unset;
        }

        .layui-form-item .layui-input-inline {
            width: unset;
        }

        .rkbk-search-input{
            background: #FFF !important;
        }

        .rkbk-search-input.bg-date {
            background: #FFF !important;
        }

        .layui-select-disabled .layui-disabled {
            color: #000 !important;
        }
@@ -51,6 +55,7 @@
        .layui-table td {
            font-weight: bold;
        }

        .layui-form-selected dl {
            max-height: 150px;
        }
@@ -300,6 +305,7 @@
    var userId = [[${loginUser.username}]];
    var companyId = [[${loginUser.companyId}]];
    //车牌识别
    //品种
    var listFoodVariety = [[${listFoodVariety}]];
</script>

@@ -307,6 +313,7 @@
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/out-ship-register.js}"></script>

<!-- 弹出通知单 -->