Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-05-31 29a928860314d79adfbd6fd564b916ea9e834a4e

Merge remote-tracking branch 'origin/master'

 igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java

@@ -2,6 +2,7 @@

import ch.qos.logback.classic.pattern.ClassNameOnlyAbbreviator;
import com.bstek.bdf2.core.business.IUser;
import com.bstek.bdf2.core.model.DefaultDept;
import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.common.manager.CommonManager;
import com.ld.igds.constant.BizType;
@@ -739,6 +740,8 @@
        view.addObject("bizType", BizType.INOUT_IN.getCode());
        view.addObject("type", InoutConstant.TYPE_IN);
        view.addObject("deptId", deptId);
        DefaultDept dept = commonManager.getSubDept(user, deptId);
        view.addObject("deptName", dept.getName());

        //入库流程
        String inoutProgress = inoutCommonManager.getInoutProgressConf(user.getCompanyId(), deptId, InoutConstant.TYPE_IN);
@@ -791,12 +794,7 @@
     */
    @RequestMapping("/update-sample")
    public PageResponse<InoutCheckData> updateSample(@RequestBody InoutCheckData data) {
        try {
            return inoutManager.updateSampleData(data);
        } catch (Exception e) {
            log.error("后台异常:{}", e);
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                    "后台异常：" + e.getMessage(), null);
        }

        return inoutManager.updateSampleData(data);
    }
}

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

@@ -1107,34 +1107,40 @@
    }

    @Transactional(rollbackFor = Exception.class)
    public PageResponse<InoutCheckData> updateSampleData(InoutCheckData data) throws Exception {
    public PageResponse<InoutCheckData> updateSampleData(InoutCheckData data){

        // 获取业务数据信息
        InoutParam param = new InoutParam();
        param.setCompanyId(data.getCompanyId());
        param.setId(data.getId());
        InoutData curData = inoutService.inoutProgressQuery(param);
        if (null == curData) {
        try {
            // 获取业务数据信息
            InoutParam param = new InoutParam();
            param.setCompanyId(data.getCompanyId());
            param.setId(data.getId());
            InoutData curData = inoutService.inoutProgressQuery(param);
            if (null == curData) {
                return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                        "没有获取到入库业务数据信息，更新失败", data);
            }
            if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) {
                return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                        "当前流程已经结束，不支持修改");
            }

            //扦样信息
            curData.setSampleTime(data.getSampleTime());
            curData.setSampleType(data.getSampleType());
            curData.setSampleUser(data.getSampleUser());

            String msg = inoutService.updateSampleData(curData);

            if (null != msg) {
                return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
            }

            return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "执行成功");
        } catch (Exception e) {
            log.error("后台异常:{}", e);
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                    "没有获取到入库业务数据信息，更新失败", data);
                    "后台异常：" + e.getMessage(), null);
        }
        if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) {
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                    "当前流程已经结束，不支持修改");
        }

        //扦样信息
        curData.setSampleTime(data.getSampleTime());
        curData.setSampleType(data.getSampleType());
        curData.setSampleUser(data.getSampleUser());

        String msg = inoutService.updateSampleData(curData);

        if (null != msg) {
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
        }

        return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "执行成功");
    }

}

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

@@ -1,5 +1,6 @@
//当前节点 入库质检
var layer;
var laydate;
var form;
var table;
var page = 1;
@@ -12,7 +13,7 @@
        layer = layui.layer;
        form = layui.form;
        table = layui.table;
        var laydate = layui.laydate;
        laydate = layui.laydate;

        laydate.render({
            elem: '#start',
@@ -27,9 +28,10 @@
        });

        laydate.render({
            elem: '#foodYear',
            elem: '#sampleTime',
            theme: '#7b8e9f',
            type: 'year',
            format: 'yyyy-MM-dd HH:mm:ss',
            type: 'datetime'
        });

        // 初始化表单数据
@@ -342,38 +344,72 @@
    });
}

//隐藏信息--替换为*
function replaceStr(str) {
    if (!str) {
        return "";
    }
    var split = str.split("");
/**
 * 时间等
 */
function getTime() {

    if (split.length == 1) {
        return "*";
        var now = new Date();
        var time = now.toLocaleString('chinese', {
            hour12: false
        });
        return time;
}

function formatDateTime(date, format) {
    const o = {
        'M+': date.getMonth() + 1, // 月份
        'd+': date.getDate(), // 日
        'h+': date.getHours() % 12 === 0 ? 12 : date.getHours() % 12, // 小时
        'H+': date.getHours(), // 小时
        'm+': date.getMinutes(), // 分
        's+': date.getSeconds(), // 秒
        'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
        S: date.getMilliseconds(), // 毫秒
        a: date.getHours() < 12 ? '上午' : '下午', // 上午/下午
        A: date.getHours() < 12 ? 'AM' : 'PM', // AM/PM
    };
    if (/(y+)/.test(format)) {
        format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
    }
    if (split.length == 2 || split.length == 3) {
        return str.slice(0, 1) + "**"
    for (let k in o) {
        if (new RegExp('(' + k + ')').test(format)) {
            format = format.replace(
                RegExp.$1,
                RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
            );
        }
    }
    return str.slice(0, 1) + "***" + str.slice(split.length - 1);
    return format;
}

function showDetail(obj) {
    curSampleData = obj.data;
    curSampleData = null;
    var nowTime = formatDateTime(new Date(), "yyyy-MM-dd HH:mm:ss");
    $("#printTime").html(nowTime);

    curSampleData = obj.data;
    if(!curSampleData.sampleTime){
        curSampleData.sampleTime = nowTime;
    }
    if(!curSampleData.sampleUser){
        curSampleData.sampleUser = sampleUser;
    }
    // 赋值
    form.val("form-detail", curSampleData);
    form.render();

    layer.open({
        type: 1,
        title: "扦样信息",
        area: ['900px', '400px'],
        title: "扦样管理信息",
        area: ['900px', '520px'],
        shade: 0,
        content: $('#checkDetail'),
        btnAlign: 'c',
        btn: ['保存提交', '关闭取消'],
        btn: ['保存并打印', '保存提交','关闭取消'],
        yes: function () {
            layer.alert("条形码待确定！");
        }, btn2: function () {
            // 更新到页面
            var data = form.val("form-detail");
            obj.update(data);
@@ -381,7 +417,8 @@
            Object.assign(curSampleData, data);

            submit();
        }, btn2: function () {

        }, btn3: function () {
            layer.closeAll();
        },
        closeBtn: 0

 igds-web/src/main/resources/static/images/txm.jpg

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

@@ -106,6 +106,10 @@
            padding: 10px;
            color: blue;
        }

        .input_ba {
            background: #e7eaec !important;
        }
    </style>

</head>
@@ -307,7 +311,7 @@
    //userId
    var userId = [[${loginUser.username}]];

    var checkUser = [[${loginUser.cname}]];
    var sampleUser = [[${loginUser.cname}]];

    var companyId = [[${loginUser.companyId}]];
    //品种
@@ -319,6 +323,7 @@

    //所属分库
    var deptId = [[${deptId}]];
    var deptName = [[${deptName}]];

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

@@ -339,79 +344,103 @@
<!-- 化验信息，包括基本信息和化验结果 -->
<div class="layui-tab-content" id="checkDetail" style="display: none;">
    <!-- 表单基本信息 -->
    <form class="layui-form" id="form-detail" lay-filter="form-detail">

        <div class="layui-col-xs6" style="display: none;">
            <div class="layui-form-item">
                <label class="layui-form-label">隐藏字段-流水编号</label>
                <div class="layui-input-block">
                    <input type="text" name="id" autocomplete="off" class="layui-input rkbk-search-input">
                </div>
            </div>
        </div>

        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label">质检单号</label>
                <div class="layui-input-block">
                    <input type="text" name="checkId" autocomplete="off"
                           class="layui-input rkbk-search-input" disabled="">
                </div>
            </div>
        </div>

        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label">车  牌  号</label>
                <div class="layui-input-block">
                    <input type="text" name="plateNum" autocomplete="off"
                           class="layui-input rkbk-search-input" disabled="">
                </div>
            </div>
        </div>
        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label">登记时间</label>
                <div class="layui-input-block">
                    <input type="text" name="registerTime" autocomplete="off"
                           class="layui-input rkbk-search-input" disabled="">
                </div>
            </div>
        </div>
        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label red">扦样人员</label>
                <div class="layui-input-block">
                    <input type="text" name="sampleUser" autocomplete="off" class="layui-input rkbk-search-input">
                </div>
            </div>
        </div>
        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label red">扦样时间</label>
                <div class="layui-input-block">
                    <input type="text" name="sampleTime" autocomplete="off" class="layui-input rkbk-search-input">
                </div>
            </div>
        </div>
        <div class="layui-col-xs6">
            <div class="layui-form-item">
                <label class="layui-form-label red">扦样方式</label>
                <div class="layui-input-block">
                    <input type="radio" name="sampleType" value="0" title="人工" checked>
                    <input type="radio" name="sampleType" value="1" title="自动">
                    <input type="radio" name="sampleType" value="2" title="智能随机">
                </div>
            </div>
        </div>
    <div style="height: 100%; width: 55%; float: left">
        <div class="layui-col-xs12">
            <blockquote class="layui-elem-quote">
                <div>
                    <span style="font-weight: bold; margin-right: 10px;">备注：扦样时间需晚于登记时间</span>
                </div>
                <span style="font-weight: bold; margin-right: 10px;">扦样信息</span>
            </blockquote>
        </div>
    </form>
        <form class="layui-form" id="form-detail" lay-filter="form-detail">
            <div class="layui-col-xs12" style="display: none;">
                <div class="layui-form-item">
                    <label class="layui-form-label">隐藏字段-流水编号</label>
                    <div class="layui-input-block">
                        <input type="text" name="id" autocomplete="off" class="layui-input rkbk-search-input">
                    </div>
                </div>
            </div>

            <div class="layui-col-xs12">
                <div class="layui-form-item">
                    <label class="layui-form-label">质检单号</label>
                    <div class="layui-input-block">
                        <input type="text" name="checkId" autocomplete="off"
                               class="layui-input input_ba" disabled="">
                    </div>
                </div>
            </div>

            <div class="layui-col-xs12">
                <div class="layui-form-item">
                    <label class="layui-form-label">车 牌 号</label>
                    <div class="layui-input-block">
                        <input type="text" name="plateNum" autocomplete="off"
                               class="layui-input input_ba" disabled="">
                    </div>
                </div>
            </div>
            <div class="layui-col-xs12">
                <div class="layui-form-item">
                    <label class="layui-form-label">登记时间</label>
                    <div class="layui-input-block">
                        <input type="text" name="registerTime" autocomplete="off"
                               class="layui-input input_ba" disabled="">
                    </div>
                </div>
            </div>
            <div class="layui-col-xs12">
                <div class="layui-form-item">
                    <label class="layui-form-label red">扦样人员</label>
                    <div class="layui-input-block">
                        <input type="text" name="sampleUser" autocomplete="off" class="layui-input rkbk-search-input">
                    </div>
                </div>
            </div>
            <div class="layui-col-xs12">
                <div class="layui-form-item">
                    <label class="layui-form-label red">扦样时间</label>
                    <div class="layui-input-block">
                        <input type="text" name="sampleTime" placeholder="请选择"
                               autocomplete="off" class="layui-input rkbk-search-input bg-date" id="sampleTime">
                    </div>
                </div>
            </div>
            <div class="layui-col-xs12">
                <div class="layui-form-item">
                    <label class="layui-form-label red">扦样方式</label>
                    <div class="layui-input-block">
                        <input type="radio" name="sampleType" value="0" title="人工" checked>
                        <input type="radio" name="sampleType" value="1" title="自动">
                        <input type="radio" name="sampleType" value="2" title="智能随机">
                    </div>
                </div>
            </div>
            <div class="layui-col-xs12" style="margin-bottom: 10px">
                <div style="padding-left: 50px; color: #2ab5ad;">
                    <span style="font-weight: bold; margin-right: 10px;">备注：扦样时间需晚于登记时间</span>
                </div>
            </div>
        </form>
    </div>
    <div style="height: 100%; width: 42%; float: right">
        <div class="layui-col-xs12">
            <blockquote class="layui-elem-quote">
                <span style="font-weight: bold; margin-right: 10px;">打印信息</span>
            </blockquote>
            <div style="text-align: center; margin-top: 10px">
                <img style="max-width: 100px;" th:src="@{/static/images/login-app-code.png}"/>
            </div>
            <div style="text-align: center; margin-top: 10px">
                <img style="max-width: 220px;" th:src="@{/static/images/txm.jpg}"/>
            </div>
            <div style="text-align: center; font-size: 16px; margin-top: 10px">
                <span th:text="${deptName}"></span>
            </div>
            <div style="text-align: center; font-size: 14px; margin-top: 10px">
                <span id="printTime">2023-05-31 17:30:30</span>
            </div>
        </div>
    </div>
</div>

<!-- 弹出框的信息 -->