#

luxiaotao1123

2022-04-01 e64a8134fa282704744dff90fb64ab5f666c823d

#

 src/main/java/com/zy/asrs/controller/OutController.java

@@ -1,6 +1,5 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -8,9 +7,7 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.result.StoPreTab;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
@@ -19,7 +16,9 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

/**
 * Created by vincent on 2022/3/26
@@ -83,17 +82,18 @@
        if (Cools.isEmpty(locDtos)) {
            return R.parse(BaseRes.PARAM);
        }
        boolean refuse = true;
        boolean lack = true;
        for (LocDto locDto : locDtos) {
            if (!locDto.isLack()) {
                refuse = !refuse;
                lack = false;
                break;
            }
        }
        if (refuse) {
        if (lack) {
            return R.error("库存不足");
        }

        Thread.sleep(500L);
        Thread.sleep(1000L);

        List<TaskDto> taskDtos = new ArrayList<>();
        // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务

 src/main/webapp/views/pakStore/matQuery.html

@@ -30,7 +30,12 @@
        <div id="search-box" class="layui-form layui-card-header">
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input class="layui-input" type="text" name="mat_no" placeholder="商品编号" autocomplete="off">
                    <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
                </div>
            </div>
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input class="layui-input" type="text" name="maktx" placeholder="商品名称" autocomplete="off">
                </div>
            </div>
            <!-- 日期范围 -->

 src/main/webapp/views/wrkMast/wrkMast.html

@@ -116,7 +116,9 @@
    <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">明细</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">完成</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">取消</a>
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">拣</a>
    {{#if (d.ioType === 103) { }}
        <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">拣</a>
    {{# } }}
</script>

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