no message

skyouc

2 天以前 78df6cc0014e1b9ef290a8ae86c39b63c8fc36e1

no message

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -468,7 +468,7 @@
            }
//            OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
            OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getBrand()
                    , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());
                    , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), "1", locDto.getBoxType2(), locDto.getBoxType3());
//            if (orderDetl == null) {
////                orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
//                orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), null);
@@ -1525,7 +1525,6 @@
        if (!locMastService.updateById(locMast)) {
            throw new CoolException("修改库位状态失败");
        }


        // .修改并托入库明细托码
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -392,7 +392,7 @@
                        // 更新订单完成数量
                        OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(),
                                wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
                                wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(),
                                wrkDetl.getStandby2(), wrkDetl.getStandby3(), "1",
                                wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
                        try {
                            if (!Cools.isEmpty(orderDetlPakin)) {
@@ -400,7 +400,7 @@
                                        wrkDetl.getMatnr(),
                                        orderDetlPakin.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
                                        wrkDetl.getStandby2(), wrkDetl.getStandby3(),
                                        wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
                                        "1", wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
                                        wrkDetl.getAnfme())) {
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                    return FAIL.setMsg("并板入库 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo()

 src/main/resources/mapper/LocDetlMapper.xml

@@ -94,14 +94,14 @@
                and (d.standby3 IS NULL OR d.standby3 = '')
            </otherwise>
        </choose>
        <choose>
            <when test="boxType1 != null and boxType1 != ''">
                and d.box_type1 = #{boxType1}
            </when>
            <otherwise>
                and (d.box_type1 IS NULL OR d.box_type1 = '')
            </otherwise>
        </choose>
<!--        <choose>-->
<!--            <when test="boxType1 != null and boxType1 != ''">-->
<!--                and d.box_type1 = #{boxType1}-->
<!--            </when>-->
<!--            <otherwise>-->
<!--                and (d.box_type1 IS NULL OR d.box_type1 = '')-->
<!--            </otherwise>-->
<!--        </choose>-->
        <choose>
            <when test="boxType2 != null and boxType2 != ''">
                and d.box_type2 = #{boxType2}
@@ -226,14 +226,14 @@
                and (standby3 IS NULL OR standby3 = '')
            </otherwise>
        </choose>
        <choose>
            <when test="boxType1 != null and boxType1 != ''">
                and box_type1 = #{boxType1}
            </when>
            <otherwise>
                and (box_type1 IS NULL OR box_type1 = '')
            </otherwise>
        </choose>
<!--        <choose>-->
<!--            <when test="boxType1 != null and boxType1 != ''">-->
<!--                and box_type1 = #{boxType1}-->
<!--            </when>-->
<!--            <otherwise>-->
<!--                and (box_type1 IS NULL OR box_type1 = '')-->
<!--            </otherwise>-->
<!--        </choose>-->
        <choose>
            <when test="boxType2 != null and boxType2 != ''">
                and box_type2 = #{boxType2}

 src/main/resources/mapper/OrderDetlPakinMapper.xml

@@ -97,14 +97,14 @@
                and (standby3 IS NULL OR standby3 = '')
            </otherwise>
        </choose>
        <choose>
            <when test="boxType1 != null and boxType1 != ''">
                and box_type1 = #{boxType1}
            </when>
            <otherwise>
                and (box_type1 IS NULL OR box_type1 = '')
            </otherwise>
        </choose>
<!--        <choose>-->
<!--            <when test="boxType1 != null and boxType1 != ''">-->
<!--                and box_type1 = #{boxType1}-->
<!--            </when>-->
<!--            <otherwise>-->
<!--                and (box_type1 IS NULL OR box_type1 = '')-->
<!--            </otherwise>-->
<!--        </choose>-->
        <choose>
            <when test="boxType2 != null and boxType2 != ''">
                and box_type2 = #{boxType2}

 src/main/resources/mapper/OrderDetlPakoutMapper.xml

@@ -61,7 +61,6 @@
        and standby1 = #{standby1}
        and standby2 = #{standby2}
        and standby3 = #{standby3}
        and box_type1 = #{boxType1}
        and box_type2 = #{boxType2}
        and box_type3 = #{boxType3}
    </sql>

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -23,6 +23,7 @@
            }}
        ,{field: 'bookQty', align: 'center',title: '原数量'}
        ,{field: 'zpallet', align: 'center',title: '托盘条码'}
        ,{field: 'boxType1', align: 'center',title: '格层编码', width : 130}
        ,{field: 'specs', align: 'center',title: '规格'}
        ,{field: 'model', align: 'center',title: '代码', hide: true}
        ,{field: 'color', align: 'center',title: '颜色', hide: true}

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -25,7 +25,7 @@
            ,{field: 'wrkSts$', align: 'center',title: '工作状态', width: 120}
            ,{field: 'ioType$', align: 'center',title: '入出库类型', width: 140}
            ,{field: 'ioPri', align: 'center',title: '优先级'}
            ,{field: 'taskType$', align: 'center',title: '任务类型'}
            , {field: 'taskType$', align: 'center', title: '任务类型', hide: true}
            ,{field: 'barcode', align: 'center',title: '条码', width: 120}
            ,{field: 'crnNo$', align: 'center',title: '堆垛机'}
            ,{field: 'sourceStaNo$', align: 'center',title: '源站'}
@@ -168,7 +168,9 @@
                    success: function(layero, index){
                        layer.getChildFrame('#data-detail-submit-edit', index).hide();
                        clearFormVal(layer.getChildFrame('#detail', index));
                        layer.getChildFrame('##dealDownLine', index).hide();layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                        layer.getChildFrame('##dealDownLine', index).hide();
                        layer.iframeAuto(index);
                        layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
                    }
                });
                break;
@@ -274,7 +276,10 @@
            // 取消
            case 'cancel':
                if (data.pdcType === "Y") {
                    layer.confirm('当前任务关联ERP销售单，取消将重新生成出库作业，是否继续？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    layer.confirm('当前任务关联ERP销售单，取消将重新生成出库作业，是否继续？', {
                        title: '工作号：' + data.wrkNo,
                        shadeClose: true
                    }, function () {
                        http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
                            $(".layui-laypage-btn")[0].click();
                            layer.msg(data.wrkNo + res.msg);
@@ -282,7 +287,10 @@
                        layer.closeAll();
                    });
                } else {
                    layer.confirm('确认取消该笔工作档？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    layer.confirm('确认取消该笔工作档？', {
                        title: '工作号：' + data.wrkNo,
                        shadeClose: true
                    }, function () {
                        http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
                            $(".layui-laypage-btn")[0].click();
                            layer.msg(data.wrkNo + res.msg);
@@ -303,7 +311,10 @@
                break;
            //  先入品
            case 'preHave':
                layer.confirm('任务发生先入品异常。如需重新入库，请确保货物已放至堆垛机出库站！', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                layer.confirm('任务发生先入品异常。如需重新入库，请确保货物已放至堆垛机出库站！', {
                    title: '工作号：' + data.wrkNo,
                    shadeClose: true
                }, function () {
                    http.post(baseUrl+"/deal/preHave/start", {wrkNo: data.wrkNo}, function (res) {
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(data.wrkNo + res.msg, {icon: 1});
@@ -313,7 +324,10 @@
                break;
            //  空操作
            case 'takeNone':
                layer.confirm('任务发送空操作异常！是否。。。。。。。。？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                layer.confirm('任务发送空操作异常！是否。。。。。。。。？', {
                    title: '工作号：' + data.wrkNo,
                    shadeClose: true
                }, function () {
                });
                break;
            case 'priWrkMast':
@@ -328,7 +342,8 @@
                        layer.getChildFrame('#data-detail-submit-save', index).hide();
                        setFormVal(layer.getChildFrame('#detail', index), data, false);
                        top.convertDisabled(layer.getChildFrame('#locNo', index), true);
                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                        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');
                    }
@@ -516,6 +531,7 @@
    });

    var pageCur;

    function locDetl(param){
        $('#detlTable').css("display", 'block');
        // 数据渲染