船运问题修改

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);

        //执行附件信息
@@ -670,8 +673,8 @@

        //获取仓库信息
        List<Depot> depotList = coreCommonService.getCacheDepotList(param.getCompanyId(), param.getDeptId());
        Map<String,String> map = new HashMap<>();
        if(depotList != null && depotList.size() > 0){
        Map<String, String> map = new HashMap<>();
        if (depotList != null && depotList.size() > 0) {
            for (Depot depot : depotList) {
                map.put(depot.getId(), depot.getName());
            }
@@ -679,7 +682,7 @@

        //赋值仓库名称
        for (InoutNoticeOut inoutNoticeOut : list) {
            if(map.get(inoutNoticeOut.getDepotId()) != null){
            if (map.get(inoutNoticeOut.getDepotId()) != null) {
                inoutNoticeOut.setDepotName(map.get(inoutNoticeOut.getDepotId()));
            }
        }

 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

@@ -16,12 +16,12 @@
        });

        //监听品种
        layui.form.on('select(select_foodVariety)',function (data) {
        layui.form.on('select(select_foodVariety)', function (data) {
            updateFoodVariety(data.value);
        });

        //监听化验结果单填写数据,并给出提示结果
        table.on('edit(tableCheckItem)',function (obj) {
        table.on('edit(tableCheckItem)', function (obj) {
            getResult(obj);
        });
    });
@@ -147,7 +147,7 @@
/**
 * 弹出化验单信息
 */
function showCheckDetail(){
function showCheckDetail() {
    // 赋值
    var data = form.val("form-data");
    data.checkUser = checkUser;
@@ -165,7 +165,7 @@
        yes: function () {
            curCheckData = form.val("form-detail");

            if(null == curCheckData.foodVariety){
            if (null == curCheckData.foodVariety) {
                notify("请填写粮食品种！");
                return;
            }
@@ -210,12 +210,12 @@

    var index = layer.load();
    $.ajax({
        type : "POST",
        url : "../../basic/inout/get-check-item",
        dataType : "json",
        contentType : "application/json;charset=UTF-8",
        data : JSON.stringify(data),
        success : function(result) {
        type: "POST",
        url: "../../basic/inout/get-check-item",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(data),
        success: function (result) {
            if (result.code != "0000") {
                layer.msg(result.msg);
            } else {
@@ -225,7 +225,7 @@
                layer.close(index);
            }
        },
        error : function() {
        error: function () {
            layer.close(index);
            layer.msg("后台异常，请重试或者联系管理员！！");
        }
@@ -239,11 +239,11 @@
    // 清空数据
    $("#tableCheckItem").empty();
    table.render({
        elem : '#tableCheckItem',
        data : curCheckItems,
        page : false,
        elem: '#tableCheckItem',
        data: curCheckItems,
        page: false,
        // skin: 'line',
        even : true,
        even: true,
        cols: [[{
            field: 'standardName',
            title: '化验项目',
@@ -274,8 +274,8 @@
    });

    $("thead tr").css({
        "border-bottom" : "2px solid #53adce",
        "background" : "#eff4f6"
        "border-bottom": "2px solid #53adce",
        "background": "#eff4f6"
    });
}

@@ -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',
@@ -461,54 +461,54 @@
    var index = layer.load();
    // 渲染往来单位列表
    table.render({
        elem : '#tableFoodLoaction',
        url : '../../basic/common/page-food-location',
        page : false,
        toolbar : '#toolbarFoodLocaton',
        even : true,
        method : 'POST',
        contentType : "application/json;charset=UTF-8",
        cols : [ [ {
            field : 'code',
            title : '编码'
        elem: '#tableFoodLoaction',
        url: '../../basic/common/page-dicArea',
        page: false,
        toolbar: '#toolbarFoodLocaton',
        even: true,
        method: 'POST',
        contentType: "application/json;charset=UTF-8",
        cols: [[{
            field: 'code',
            title: '编码'
        }, {
            field : 'simple',
            title : '简拼'
            field: 'simple',
            title: '简拼'
        }, {
            field : 'name',
            title : '名称',
            width : '60%'
        } ] ],
        where : {
            "page" : 1,
            "limit" : 100
            field: 'name',
            title: '名称',
            width: '60%'
        }]],
        where: {
            "page": 1,
            "limit": 100
        },
        parseData : function(res) {
        parseData: function (res) {
            if ("0000" == res.code) {
                return {
                    "code" : "0",
                    "msg" : res.msg,
                    "count" : res.data.total,
                    "data" : res.data.records
                    "code": "0",
                    "msg": res.msg,
                    "count": res.data.total,
                    "data": res.data.records
                }
            } else {
                return {
                    "code" : "1",
                    "msg" : res.msg
                    "code": "1",
                    "msg": res.msg
                }
            }
        },
        done : function(res) {
        done: function (res) {
            layer.close(index);
        }
    });

    //双击显示选中数据
    table.on('rowDouble(tableFoodLoaction)', function(obj){
    table.on('rowDouble(tableFoodLoaction)', function (obj) {
        var data = obj.data;
        // 赋值
        form.val("form-data", {
            foodLocation : data.name
            foodLocation: data.name
        });
        // 关闭
        layer.close(index2);
@@ -516,18 +516,18 @@

    // 弹出对话框
    var index2 = layer.open({
        type : 1,
        title : "选择粮产地",
        area : [ '600px', '600px' ],
        shade : 0,
        content : $('#listFoodLocation'),
        btn : 0,
        btn : [ '取消' ],
        yes : function() {
        type: 1,
        title: "选择粮产地",
        area: ['600px', '600px'],
        shade: 0,
        content: $('#listFoodLocation'),
        btn: 0,
        btn: ['取消'],
        yes: function () {
            // 关闭
            layer.close(index2);
        },
        closeBtn : 0
        closeBtn: 0
    });

}
@@ -536,11 +536,11 @@
function flushFoodLocation() {
    var key = $("#key2").val();
    table.reload('tableFoodLoaction', {
        url : "../../basic/common/page-food-location",
        where : {
            key : key
        url: "../../basic/common/page-dicArea",
        where: {
            key: key
        },
        done : function(res) {
        done: function (res) {
            if (key) {
                $("#key2").val(key);
            }

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

@@ -16,7 +16,7 @@
        });

        // 监听仓库选择，选择后自动调用仓库的粮品种和产地信息
        form.on('select(select_depotId)', function(obj) {
        form.on('select(select_depotId)', function (obj) {
            updateFoodVarietyByDepot(obj.value);
        });
    });
@@ -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',
@@ -288,54 +288,54 @@
    var index = layer.load();
    // 渲染往来单位列表
    table.render({
        elem : '#tableFoodLoaction',
        url : '../../basic/common/page-food-location',
        page : false,
        toolbar : '#toolbarFoodLocaton',
        even : true,
        method : 'POST',
        contentType : "application/json;charset=UTF-8",
        cols : [ [ {
            field : 'code',
            title : '编码'
        elem: '#tableFoodLoaction',
        url: '../../basic/common/page-dicArea',
        page: false,
        toolbar: '#toolbarFoodLocaton',
        even: true,
        method: 'POST',
        contentType: "application/json;charset=UTF-8",
        cols: [[{
            field: 'code',
            title: '编码'
        }, {
            field : 'simple',
            title : '简拼'
            field: 'simple',
            title: '简拼'
        }, {
            field : 'name',
            title : '名称',
            width : '60%'
        } ] ],
        where : {
            "page" : 1,
            "limit" : 100
            field: 'name',
            title: '名称',
            width: '60%'
        }]],
        where: {
            "page": 1,
            "limit": 100
        },
        parseData : function(res) {
        parseData: function (res) {
            if ("0000" == res.code) {
                return {
                    "code" : "0",
                    "msg" : res.msg,
                    "count" : res.data.total,
                    "data" : res.data.records
                    "code": "0",
                    "msg": res.msg,
                    "count": res.data.total,
                    "data": res.data.records
                }
            } else {
                return {
                    "code" : "1",
                    "msg" : res.msg
                    "code": "1",
                    "msg": res.msg
                }
            }
        },
        done : function(res) {
        done: function (res) {
            layer.close(index);
        }
    });

    //双击显示选中数据
    table.on('rowDouble(tableFoodLoaction)', function(obj){
    table.on('rowDouble(tableFoodLoaction)', function (obj) {
        var data = obj.data;
        // 赋值
        form.val("form-data", {
            foodLocation : data.name,
            foodLocation: data.name,
        });
        // 关闭
        layer.close(index2);
@@ -343,18 +343,18 @@

    // 弹出对话框
    var index2 = layer.open({
        type : 1,
        title : "选择粮产地",
        area : [ '600px', '600px' ],
        shade : 0,
        content : $('#listFoodLocation'),
        btn : 0,
        btn : [ '取消' ],
        yes : function() {
        type: 1,
        title: "选择粮产地",
        area: ['600px', '600px'],
        shade: 0,
        content: $('#listFoodLocation'),
        btn: 0,
        btn: ['取消'],
        yes: function () {
            // 关闭
            layer.close(index2);
        },
        closeBtn : 0
        closeBtn: 0
    });

}
@@ -363,11 +363,11 @@
function flushFoodLocation() {
    var key = $("#key2").val();
    table.reload('tableFoodLoaction', {
        url : "../../basic/common/page-food-location",
        where : {
            key : key
        url: "../../basic/common/page-dicArea",
        where: {
            key: key
        },
        done : function(res) {
        done: function (res) {
            if (key) {
                $("#key2").val(key);
            }

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

@@ -37,18 +37,21 @@
        }

        .rkbk-right-form .layui-input-block {
             margin-right: unset;
            margin-right: unset;
        }

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

        .rkbk-search-input{
        .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

@@ -33,17 +33,21 @@
        }

        .rkbk-right-form .layui-input-block {
             margin-right: unset;
            margin-right: unset;
        }

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

        .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>

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