入库流程功能优化

skyouc

2 天以前 6c3f8b83a4d5a5c7d7044532fbb8fbf3dde6c497

入库流程功能优化

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

@@ -25,6 +25,7 @@

import javax.annotation.Resource;
import java.util.*;

/**
 * 移动端服务核心类
 * Created by vincent on 2020/6/28
@@ -961,7 +962,7 @@
    @Override
    @Transactional
    public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
            Double curOutQty, Integer ioType, Long userId, Date now) {
                         Double curOutQty, Integer ioType, Long userId, Date now) {
        // 获取库位
        LocMast locMast = locMastService.selectById(locDetl.getLocNo());
        // 获取路径
@@ -1123,12 +1124,30 @@
//            throw new CoolException("AGV任务完成失败!!");
//        }


        List<WaitPakin> waitPakins = waitPakinService
                .selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
        if (Objects.isNull(waitPakins) || waitPakins.isEmpty()) {
            throw new CoolException("数据错误,组拖档已不存在!!");
        }

        //修改单据执行数量
        waitPakins.forEach(waitPakin -> {
            OrderDetlPakin detlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
                    .eq("matnr", waitPakin.getMatnr())
                    .eq("barcode", waitPakin.getZpallet())
                    .eq("order_no", waitPakin.getOrderNo()));
            if (Objects.isNull(detlPakin)) {
                throw new CoolException("单据明细不存在！！");
            }
            detlPakin.setWorkQty(waitPakin.getAnfme());

            if (!orderDetlPakinService.updateById(detlPakin)) {
                throw new CoolException("单据明细修改失败！！");
            }
        });


        generateCrnInTask(waitPakins, param.getStation(), param.getLocType1(), userId);
    }


 src/main/webapp/static/js/order/order.js

@@ -241,8 +241,11 @@
                        { type: 'numbers', title: '#' },
                        { field: 'matnr', title: '商品编码', width: 160 },
                        { field: 'maktx', title: '商品名称', width: 200 },
                        {field:  'barcode', title: 'SN', edit: true },
                        { field: 'batch', title: '批号', edit: true },
                        { field: 'specs', title: '规格' },
                        {field: 'brand', title: '品牌' },
                        { field: 'unit', title: '单位' },
                        { field: 'anfme', title: '数量(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110 },
                        { field: 'workQty', title: '作业数量', minWidth: 100, width: 100 },
                        // {field: 'unit', title: '单位', width: 80},

 src/main/webapp/static/js/orderPakout/order.js

@@ -125,11 +125,13 @@
                            {field: 'matnr', title: '商品编码', width: 160},
                            {field: 'maktx', title: '商品名称', width: 160},
                            {field: 'batch', title: '批号'},
                            {field: 'brand', title: '品牌'},
                            {field: 'specs', title: '规格'},
                            {field: 'standby1', title: '机台'},
                            {field: 'unit', title: '单位'},
                            {field: 'anfme', title: '数量'},
                            {field: 'workQty', title: '作业数量'},
                            {field: 'qty', title: '完成数量', style: 'font-weight: bold'},
                            // {field: 'unit', title: '单位'},
                            // {
                            //     field: 'createTime$', title: '创建时间', sort: true, templet: function (d) {
                            //         return util.toDateString(d.createTime);
@@ -137,7 +139,6 @@
                            // },
                            // {field: 'inQty', title: '已入库量'},
                            // {field: 'color', title: '颜色'},
                            {field: 'specs', title: '规格'}
                        ]],
                        request: {
                            pageName: 'curr',

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

@@ -21,12 +21,12 @@
        cols: [[
            {type: 'checkbox'}
            ,{field: 'wrkNo', align: 'center',title: '工作号',sort: true, width: 95}
            ,{field: 'wrkCode', align: 'center',title: '下发工作号',sort: true, width: 120}
            ,{field: 'wrkCode', align: 'center',title: '下发工作号',sort: true, width: 120, hide: true}
            ,{field: 'ioTime$', align: 'center',title: '工作时间',sort: true, width: 170}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态', width: 120}
            ,{field: 'ioType$', align: 'center',title: '入出库类型', width: 140}
            ,{field: 'ioPri', align: 'center',title: '优先级', width: 95}
            ,{field: 'taskType$', align: 'center',title: '任务类型', width: 95}
            // ,{field: 'taskType$', align: 'center',title: '任务类型', width: 95}
            ,{field: 'barcode', align: 'center',title: '条码', width: 120}
            ,{field: 'crnNo$', align: 'center',title: '堆垛机', width: 95}
            ,{field: 'sourceStaNo$', align: 'center',title: '源站', width: 95}

 src/main/webapp/views/locAroundBind/locAroundBind.html

@@ -71,12 +71,12 @@
                        <input class="layui-input" name="devNo" placeholder="请输入机台号" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">库位ID: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="blocId" placeholder="请输入库位ID" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">库位ID: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="blocId" placeholder="请输入库位ID" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">库位码: </label>
                    <div class="layui-input-block">
@@ -105,9 +105,11 @@
<div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
    <div class="layui-form layui-form-pane">
        <div class="layui-form-item">
            <label class="·layui-form-label">机台号</label>
            <div class="layui-input-inline">
                <input type="text" name="devNo" autocomplete="off" class="layui-input">
            <div class="layui-inline">
                <label class="layui-form-label">机台号</label>
                <div class="layui-input-inline">
                    <input type="text" name="devNo" autocomplete="off" class="layui-input">
                </div>
            </div>
        </div>
        <!-- 排 -->

 src/main/webapp/views/mat/mat.html

@@ -228,6 +228,18 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">归零阀值</label>
                    <div class="layui-input-block">
                        <input id="safeQty" name="safeQty" placeholder="请输入阀值" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">每公斤长度</label>
                    <div class="layui-input-block">
                        <input id="volume" name="volume" placeholder="请输入" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">规格</label>
                    <div class="layui-input-block">
                        <input name="specs" placeholder="请输入代码" class="layui-input">
@@ -245,12 +257,12 @@
                        <input name="manLength" placeholder="请输入单箱毛重" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">单箱体积</label>
                    <div class="layui-input-block">
                        <input name="threeCode" placeholder="请输入箱子尺寸" class="layui-input">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">单箱体积</label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input name="threeCode" placeholder="请输入箱子尺寸" class="layui-input">-->
<!--                    </div>-->
<!--                </div>-->
            </div>
        </div>
        <hr class="layui-bg-gray">

 src/main/webapp/views/orderPakin/order.html

@@ -79,8 +79,8 @@
                        <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>添加
                        </button>
<!--                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>添加-->
<!--                        </button>-->
                    </div>
                </div>
            </div>