#

luxiaotao1123

2021-03-25 b6a8cc0f2d3ced0b287348eb2a6a5785129f0ffb

#

 src/main/java/zy/cloud/wms/manager/entity/Check.java

@@ -101,6 +101,13 @@
    private Double cekQty;

    /**
     * 差值
     */
    @ApiModelProperty(value= "差值")
    @TableField("diff_qty")
    private Double diffQty;

    /**
     * 盈亏 1: 盘盈  2: 盘亏  
     */
    @ApiModelProperty(value= "盈亏 1: 盘盈  2: 盘亏  ")
@@ -148,7 +155,7 @@

    public Check() {}

    public Check(String uuid,Long nodeId,String nodeUuid,String locNo,String matnr,String maktx,String unit,Long docId,String docNum,Double oriQty,Double cekQty,Integer settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
    public Check(String uuid,Long nodeId,String nodeUuid,String locNo,String matnr,String maktx,String unit,Long docId,String docNum,Double oriQty,Double cekQty,Double diffQty,Integer settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.uuid = uuid;
        this.nodeId = nodeId;
        this.nodeUuid = nodeUuid;
@@ -160,6 +167,7 @@
        this.docNum = docNum;
        this.oriQty = oriQty;
        this.cekQty = cekQty;
        this.diffQty = diffQty;
        this.settle = settle;
        this.status = status;
        this.createBy = createBy;
@@ -295,6 +303,14 @@
        this.cekQty = cekQty;
    }

    public Double getDiffQty() {
        return diffQty;
    }

    public void setDiffQty(Double diffQty) {
        this.diffQty = diffQty;
    }

    public Integer getSettle() {
        return settle;
    }
@@ -323,9 +339,11 @@
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "正常";
                return "待审核";
            case 2:
                return "已通过";
            case 0:
                return "禁用";
                return "取消";
            default:
                return String.valueOf(this.status);
        }

 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java

@@ -428,9 +428,7 @@
        Date now = new Date();
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("node_id", node.getId()));
        List<String> locDetlMatnrs = new ArrayList<>();
        locDetls.forEach(locDetl -> {
            locDetlMatnrs.add(locDetl.getMatnr());
        });
        locDetls.forEach(locDetl -> locDetlMatnrs.add(locDetl.getMatnr()));
        Iterator<LocDetl> detlIterator = locDetls.iterator();
        List<PakinMatDto> dtos = param.getDtos();

@@ -452,6 +450,7 @@
                                null,    // 单据编号
                                locDetl.getAnfme(),    // 账面数量
                                dto.getCount(),    // 实盘数量
                                dto.getCount() - locDetl.getAnfme(), // 差值
                                locDetl.getAnfme() < dto.getCount() ? 1 : 2,    // 盈亏
                                1,    // 状态
                                userId,    // 添加人员
@@ -484,6 +483,7 @@
                    null,    // 单据编号
                    locDetl.getAnfme(),    // 账面数量
                    0D,    // 实盘数量
                    0D - locDetl.getAnfme(), // 差值
                    2,    // 盈亏
                    1,    // 状态
                    userId,    // 添加人员
@@ -514,6 +514,7 @@
                        null,    // 单据编号
                        0D,    // 账面数量
                        dto.getCount(),    // 实盘数量
                        dto.getCount() - 0D, // 差值
                        1,    // 盈亏
                        1,    // 状态
                        userId,    // 添加人员

 src/main/resources/mapper/CheckMapper.xml

@@ -16,6 +16,7 @@
        <result column="doc_num" property="docNum" />
        <result column="ori_qty" property="oriQty" />
        <result column="cek_qty" property="cekQty" />
        <result column="diff_qty" property="diffQty" />
        <result column="settle" property="settle" />
        <result column="status" property="status" />
        <result column="create_by" property="createBy" />

 src/main/webapp/static/js/check/check.js

@@ -31,16 +31,17 @@
            ,{field: 'docId', align: 'center',title: '单据类型', hide: true}
            ,{field: 'docNum', align: 'center',title: '单据编号', hide: true}
            ,{field: 'oriQty', align: 'center',title: '账面数量 (原)', style: 'font-weight: bolder'}
            ,{field: 'cekQty', align: 'center',title: '实盘数量 (现)', style: 'font-weight: bolder; color: blue'}
            ,{field: 'cekQty', align: 'center',title: '实盘数量 (现)', style: 'font-weight: bolder'}
            ,{field: 'diffQty', align: 'center',title: '差值', style: 'font-weight: bolder; color: blue'}
            ,{field: 'settle$', align: 'center',title: '盈亏', templet: '#checkTpl', width: 100}
            ,{field: 'status$', align: 'center',title: '状态', hide: true}
            ,{field: 'createTime$', align: 'center',title: '盘点时间'}
            ,{field: 'createBy$', align: 'center',title: '盘点人员'}
            ,{field: 'status$', align: 'center',title: '状态', templet: '#statusTpl', width: 110}
            ,{field: 'updateBy$', align: 'center',title: '修改人员', hide: true}
            ,{field: 'updateTime$', align: 'center',title: '修改时间', hide: true}
            ,{field: 'memo', align: 'center',title: '备注', hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:100}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],
        request: {
            pageName: 'curr',
@@ -205,24 +206,11 @@
                    }
                });
                break;
            // 编辑
            case 'edit':
                layer.open({
                    type: 2,
                    title: '修改',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    content: 'check_detail.html',
                    success: function(layero, index){
                        layer.getChildFrame('#data-detail-submit-save', index).hide();
                        setFormVal(layer.getChildFrame('#detail', index), data, false);
                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
                        top.convertDisabled(layer.getChildFrame('#id', index), true);
                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
                    }
                });
            // 审核
            case 'auditing':
                layer.msg('审核成功', {icon : 1})


                break;

        }

 src/main/webapp/views/check/check.html

@@ -55,8 +55,8 @@
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-normal layui-btn-xs btn-edit" lay-event="auditing">审核</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>
<!--    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a>-->
</script>
<script type="text/html" id="checkTpl">
    <span name="settle"
@@ -67,6 +67,14 @@
          {{# } }}
    >{{d.settle$}}</span>
</script>
<script type="text/html" id="statusTpl">
    {{# if(d.status==1){ }}
    <span style="color: orange;cursor: default;" lay-tips="正在审核中，请耐心等待">
    {{# }else if(d.status==2){ }}
    <span class="icon-text" style="color: green;cursor: default;">
    {{# } }}
    {{d.status$}}</span>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>

 src/main/webapp/views/check/check_detail.html

@@ -102,6 +102,12 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">差值：</label>
            <div class="layui-input-inline">
                <input id="diffQty" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">盈　　亏：</label>
            <div class="layui-input-inline">
                <select id="settle">
@@ -116,8 +122,9 @@
            <div class="layui-input-inline">
                <select id="status">
                    <option value="" style="display: none"></option>
                    <option value="1">正常</option>
                    <option value="0">禁用</option>
                    <option value="1">待审核</option>
                    <option value="2">已通过</option>
                    <option value="0">取消</option>
                </select>
            </div>
        </div>