分支自 igds-v4
上一版本: 2db1a7b1 | 补丁 | 提交 | 忽略空白
jiazx0107@163.com
2023-06-19 5b44d1832e93be61b034b7e531f0c954a0018d74 
出入库优化-卡回收
已修改6个文件
已添加1个文件
411 ■■■■■ 文件已修改
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/in-handle.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/in-card-back.html 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/in-card-back202306.html 380 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/in-handle.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java


@@ -635,7 +635,6 @@


    @RequestMapping("/submit-handle")


    @Transactional


    public PageResponse<InoutData> submitHandle(@RequestBody InoutData data) throws Exception {




        return inoutManager.submitHandle(data);


    }






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


@@ -1067,6 +1067,12 @@


    }




    public PageResponse<InoutData> submitHandle(InoutData data) throws Exception {






        if (null == data.getHandleUser()) {


            data.setHandleUser(ContextUtil.getLoginUserCName());


        }




        //获取系统参数配置


        InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());


        if (null == inoutSysConf) {


@@ -1294,7 +1300,7 @@


        try {




            List<InoutPrice> price = inoutService.getPrice(param);


            if(null == price || price.isEmpty()){


            if (null == price || price.isEmpty()) {


                return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "未获取到粮食定价配置信息");


            }


            return new PageResponse<>(RespCodeEnum.CODE_0000, price.get(0));




 igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java


@@ -195,6 +195,7 @@


    @Override


    public String updateDataByHandle(InoutData data) {


        data.setUpdateTime(new Date());




        if (StringUtils.isEmpty(data.getCompanyId())) {


            data.setCompanyId(ContextUtil.getCompanyId());


        }




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


@@ -238,6 +238,11 @@


                notifyProgress(result.msg, result.data);


            } else {


                recordData = result.data;




                //赋值当前登陆人作为值仓人


                if (!recordData.handleUser) {


                    recordData.handleUser = curUser;


                }


                // è¿”回的数据进行赋值


                form.val("form-data", recordData);


                form.render();




 igds-web/src/main/resources/templates/admin/inout/in-card-back.html


@@ -6,21 +6,12 @@


          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>


    <title>出入库管理-离库收卡</title>




    <link rel="stylesheet" type="text/css"


          th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">


          th:href="@{../../static/plugins/layui/css/layui.css}">


    <link rel="stylesheet" type="text/css"


          th:href="@{../../static/admin/inout/style.css}">




    <!--使用打印插件 éšè—å½“前插件 -->


    <script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>


    <object id="LODOP_OB"


            classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0


            style="display: none;">


        <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0


               style="display: none;"></embed>


    </object>




    <style>


        .display-none {




 igds-web/src/main/resources/templates/admin/inout/in-card-back202306.html


¶Ô±ÈÐÂÎļþ


@@ -0,0 +1,380 @@


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




    <link rel="stylesheet" type="text/css"


          th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">


    <link rel="stylesheet" type="text/css"


          th:href="@{../../static/admin/inout/style.css}">




    <!--使用打印插件 éšè—å½“前插件 -->


    <script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>


    <object id="LODOP_OB"


            classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0


            style="display: none;">


        <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0


               style="display: none;"></embed>


    </object>




    <style>


        .display-none {


            display: none;


        }




        .rk-step-wrap {


            padding: 0px;


            border-bottom: 0px;


            text-align: center;


        }




        .qyzj-btnbox .rkbk-quick {


            margin-top: 15px;


        }


    </style>




</head>




<body>




<div class="l-container layui-clear">


    <div class="rk-main">




        <div class="qyzj-btnbox layui-clear">




            <div class="rkbk-quick fl">


                <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">


                    <i><img th:src="@{../../static/images/icon-hyd.png}"/></i> æŸ¥çœ‹åŒ–验单


                </button>


                <button class="rkbk-quick-btn layui-btn btn-green"


                        onclick="submit()">


                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i> æ”¶å¡å‡ºåº“


                </button>


                <button class="rkbk-quick-btn layui-btn btn-violet"


                        onclick="printBill()">


                    <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>


                    æ‰“印过磅单


                </button>


            </div>




            <!-- æµç¨‹å¼•å¯¼ -->


            <div class="rk-step-wrap fr">


                <ul class="rk-step">


                    <li id="progress-register" class="active rk-step-first">


                        <span class="rk-step-span">


                            <img th:src="@{../../static/images/icon-dengji.png}"/>


                        </span>


                        <p>入库登记</p>


                    </li>


                    <li id="progress-check" class="active">


                        <span class="rk-step-span">


                            <img th:src="@{../../static/images/icon-zhijian.png}"/>


                        </span>


                        <p>扦样质检</p>


                    </li>


                    <li id="progress-fullWeight" class="active">


                        <span class="rk-step-span">


                            <img th:src="@{../../static/images/icon-chengzhong.png}"/>


                        </span>


                        <p>满车称重</p>


                    </li>


                    <li id="progress-hand" class="active">


                        <span class="rk-step-span">


                            <img th:src="@{../../static/images/icon-xiehuo.png}"/>


                        </span>


                        <p>入库值仓</p>


                    </li>


                    <li id="progress-emptyWeight" class="active">


                        <span class="rk-step-span">


                            <img th:src="@{../../static/images/icon-chengzhong.png}"/>


                        </span>


                        <p>空车称重</p>


                    </li>


                    <li id="progress-cardBack" class="active">


                        <span class="rk-step-span">


                            <img th:src="@{../../static/images/icon-banli.png}"/>


                        </span>


                        <p>离库确认</p>


                    </li>


                </ul>




            </div>


            <!-- æµç¨‹å¼•å¯¼EDN -->


        </div>


        <!--qyzj-btnbox end-->




        <div class="rkbk-con">




            <div class="radius-6 rkbk-left-wrap fl">


                <div class="rkbk-left">


                    <div class="rkbk-tit">


                        <i></i>


                        <h3>承运人信息</h3>


                    </div>


                    <div class="rkbk-left-form">


                        <form class="layui-form" action="" id="form-basic"


                              lay-filter="form-basic">




                            <div class="rkbk-form-box1">




                                <div class="rkbk-form-left">




                                    <div class="layui-form-item">


                                        <label class="layui-form-label">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名</label>


                                        <div class="layui-input-block">


                                            <input type="text" name="userName" placeholder="自动获取"


                                                   autocomplete="off" class="layui-input rkbk-search-input" disabled>


                                        </div>


                                    </div>


                                    <div class="layui-form-item">


                                        <label class="layui-form-label">身份证号</label>


                                        <div class="layui-input-block">


                                            <input type="text" name="userId" placeholder="自动获取"


                                                   autocomplete="off" class="layui-input rkbk-search-input" disabled>


                                        </div>


                                    </div>




                                    <div class="layui-form-item">


                                        <label class="layui-form-label">联系方式</label>


                                        <div class="layui-input-block">


                                            <input type="text" name="userContact" placeholder="自动获取"


                                                   autocomplete="off" class="layui-input rkbk-search-input" disabled>


                                        </div>


                                    </div>






                                    <div class="layui-form-item">


                                        <label class="layui-form-label">出生日期</label>


                                        <div class="layui-input-block">


                                            <input type="text" name="userBirthday"


                                                   placeholder="yyyy-MM-dd" autocomplete="off"


                                                   class="layui-input rkbk-search-input bg-date" id="test1" disabled>


                                        </div>


                                    </div>


                                    <div class="layui-form-item">


                                        <label class="layui-form-label">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别</label>


                                        <div class="layui-input-block rkbk-selBox">


                                            <input type="radio" name="userSex" value="男" title="男"


                                                   checked disabled> <input type="radio" name="userSex"


                                                                            value="女" title="女" disabled>


                                        </div>


                                    </div>




                                    <div class="layui-form-item">


                                        <label class="layui-form-label">民&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;族</label>


                                        <div class="layui-input-block">


                                            <input type="text" name="userNation" placeholder="自动获取"


                                                   autocomplete="off" class="layui-input rkbk-search-input" disabled>


                                        </div>


                                    </div>




                                </div>


                                <!--rk-form-left end-->




                                <div class="rkbk-photo">


                                    <a href="#"><img


                                            th:src="@{../../static/images/rkbk-photo_03.png}"/></a>


                                </div>






                            </div>


                            <!--rkbk-form-box1 end-->




                            <div class="rkbk-form-box2" style="padding-top: 20px;">


                                <div class="layui-form-item">


                                    <label class="layui-form-label">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址</label>


                                    <div class="layui-input-block">


                                        <input type="text" name="userAddress" placeholder="自动获取"


                                               autocomplete="off" class="layui-input rkbk-search-input" disabled>


                                    </div>


                                </div>


                            </div>


                            <div class="rkbk-quick layui-text-center">


                                <button id="button_readID" type="button"


                                        onclick="flushIdCard()"


                                        class="rkbk-quick-btn layui-btn btn-blue">读取身份证


                                </button>


                            </div>


                            <!--rkbk-form-box2 end-->


                        </form>




                    </div>


                </div>




            </div>


            <!--rkbk-left end-->






            <div class="radius-6 rkbk-right-wrap fr">


                <div class="rkbk-left">


                    <div class="rkbk-tit">


                        <i></i>


                        <h3>业务数据</h3>


                    </div>




                    <div class="rkbk-left-form rkbk-right-form">


                        <form class="layui-form" action="" id="form-data"


                              lay-filter="form-data">




                            <div class="layui-form-item display-none">


                                <label class="layui-form-label">隐藏字段-ID</label>


                                    <input type="text" name="id">


                            </div>


                            <div class="layui-form-item display-none">


                                <label class="layui-form-label">隐藏字段-流程节点</label>


                                <input type="text" name="progress">


                            </div>


                            <div class="layui-form-item display-none">


                                <label class="layui-form-label">隐藏字段-业务类型</label>


                                <input type="text" name="type">


                            </div>




                            <div class="layui-form-item">


                                <input type="button" value="读卡" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()">


                                <label class="layui-form-label">智慧卡号</label>


                                <div class="layui-input-block">


                                    <input type="text" name="intelCard" id="intelCard"


                                           placeholder="先点击读卡，后放卡......" autocomplete="off"


                                           class="layui-input">


                                </div>




                            </div>


                            <div class="layui-form-item">




                                <input type="button" value="查询" class="rkbk-r-btn fr layui-btn" onclick="flushData()">


                                <label class="layui-form-label">车牌号</label>


                                <div class="layui-input-block">


                                    <input type="text" name="plateNum" id="plateNum"


                                           placeholder="输入车牌号进行查询" autocomplete="off"


                                           class="layui-input">


                                </div>




                            </div>


                            <div class="layui-form-item">


                                <label class="layui-form-label">装卸仓库</label>


                                <div class="layui-input-block">


                                    <select name="depotId" id="depotId" disabled>


                                        <option value="">自动获取</option>


                                        <option th:each="depot,depotSet:${listDepot}"


                                                th:value="${depot.id}" th:text="${depot.name}"></option>


                                    </select>


                                </div>


                            </div>




                            <div class="layui-form-item">


                                <label class="layui-form-label">粮食品种</label>


                                <div class="layui-input-block">


                                    <select name="foodVariety" disabled>


                                        <option value="">自动获取</option>


                                        <option th:each="dic,dicSet:${listFoodVariety}"


                                                th:value="${dic.code}" th:text="${dic.name}"></option>


                                    </select>


                                </div>


                            </div>




                            <div class="layui-form-item">


                                <label class="layui-form-label">粮食等级</label>


                                <div class="layui-input-block">


                                    <select name="foodLevel" disabled>


                                        <option value="">自动获取</option>


                                        <option th:each="dic,dicSet:${listFoodLevel}"


                                                th:value="${dic.code}" th:text="${dic.name}"></option>


                                    </select>


                                </div>


                            </div>




                            <div class="layui-form-item">


                                <label class="layui-form-label">往来单位</label>


                                <div class="layui-input-block">


                                    <input type="text" name="customerName" placeholder="自动获取"


                                           autocomplete="off" class="layui-input rkbk-search-input" disabled>


                                </div>


                            </div>


                            <div class="layui-form-item">


                                <label class="layui-form-label">化验结果</label>


                                <div class="layui-input-block">


                                    <input type="text" name="checkStatus" placeholder="自动获取"


                                           autocomplete="off" class="layui-input rkbk-search-input" disabled>


                                </div>


                            </div>


                        </form>


                    </div>


                </div>


            </div>


            <!--rkbk-right end-->




        </div>


        <!--rkbk-con end-->




    </div>


    <!--rk-main end-->




</div>


<!--l-container end-->




<script th:inline="javascript">


    //流程环节


    var inoutProgress = [[${inoutProgress}]];


    var listDepot = [[${listDepot}]];


    //当前节点


    var progress = [[${progress}]];


    //业务步骤


    var bizType = [[${bizType}]];


    var deptId = [[${deptId}]];


    //userId


    var userId = [[${loginUser.username}]];


    var companyId = [[${loginUser.companyId}]];


    //出入库类型


    var type = [[${type}]];


    //品种


    var listFoodVariety = [[${listFoodVariety}]];


    var listFoodLevel = [[${listFoodLevel}]];


</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-print.js}"></script>


<script th:src="@{../../static/admin/inout/in-card-back.js}"></script>




<!-- å¼¹å‡ºæ¡†çš„信息 -->


<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">


    <table class="layui-table">


        <colgroup>


            <col width="100">


        </colgroup>


        <tbody>


        <tr>


            <td>返回信息</td>


            <td id="resultMsg" style="color: red;font-weight: bold;"></td>


        </tr>


        <tr>


            <td>承运人</td>


            <td id="resultUserName" style="font-weight: bold;"></td>


        </tr>


        <tr>


            <td>车牌号</td>


            <td id="resultPlateNum" style="font-weight: bold;"></td>


        </tr>


        <tr>


            <td>下一步</td>


            <td id="resultType" style="font-weight: bold;"></td>


        </tr>


        <tr>


            <td>智慧卡号</td>


            <td id="resultIntelCard" style="font-weight: bold;"></td>


        </tr>


        </tbody>


    </table>


</div>




</body>




</html>




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


@@ -310,7 +310,7 @@


                                    <label class="layui-form-label color-red">装卸仓库</label>


                                    <div class="layui-input-block">


                                        <select name="depotId" id="depotId" lay-filter="select_depotId">


                                            <option value="">不可编辑</option>


                                            <option value="">请选择</option>


                                            <option th:each="depot,depotSet:${listDepot}"


                                                    th:value="${depot.id}" th:text="${depot.name}"></option>


                                        </select>


@@ -520,6 +520,7 @@


    var bizType = [[${bizType}]];


    //userId


    var userId = [[${loginUser.username}]];


    var  curUser = [[${loginUser.cname}]];


    //出入库类型


    var type = [[${type}]];


    var companyId = [[${loginUser.companyId}]];