WMS功能完善

Administrator

13 小时以前 3d3fc58d20b03ad3a5bd6a40975608c8c8bf9e4c

WMS功能完善

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

@@ -1246,6 +1246,10 @@
                HashMap<String, Object> xx = new HashMap<>();
                List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
                for (GwmsGenerateInventoryDto.MatList obj : matList) {
                    int zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("brand", obj.getPackageGroupNo()));
                    if (zpalletCount2 > 0) {
                        throw new CoolException("包装组号已存在：" + obj.getPackageGroupNo());
                    }
                    if (xx.get(obj.getPackageGroupNo()) != null) {
                        throw new CoolException("明细中存在2条相同的包装组号：" + obj.getPackageGroupNo());
                    } else {

 src/main/java/com/zy/common/model/OutLocDto.java

@@ -47,14 +47,22 @@
                if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
                    continue;
                }
                if (!Cools.isEmpty(locDetl.getAnfme())) {
                if (next.getCount() > locDetl.getAnfme()) {
                    throw new CoolException("服务器内部错误");
                }
                }
                if (!locDetl.getMatnr().equalsIgnoreCase("空箱")){
                if (next.getCount().equals(locDetl.getAnfme())) {
                    sameNumber++;
                    iterator.remove();
                    break;
                }
                }else {
                    sameNumber++;
                    iterator.remove();
                    break;
                }
            }
        }
        return sameNumber == locDetls.size();

 src/main/resources/mapper/LocDetlMapper.xml

@@ -148,7 +148,7 @@
        <if test="anfme!=null and anfme!='' ">
            and a.anfme like concat('%' , #{anfme} , '%')
        </if>
        <if test="startTime!=null and endTime!=null">
        <if test="startTime!=null and endTime!=null and endTime!=''">
            and a.modi_time between #{startTime} and #{endTime}
        </if>
        <if test="crnNo!=null and crnNo!='' ">

 src/main/webapp/views/wrkDetlLog/wrkDetlLog.html

@@ -30,11 +30,16 @@
            <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="batch" placeholder="箱号" autocomplete="off">
        </div>
    </div>
<!--    <div class="layui-inline">-->
<!--        <div class="layui-input-inline">-->
<!--            <input class="layui-input" type="text" name="brand" placeholder="包装号" autocomplete="off">-->
<!--        </div>-->
<!--    </div>-->
<!--    <div class="layui-inline">-->
<!--        <div class="layui-input-inline">-->
<!--            <input class="layui-input" type="text" name="unit" placeholder="箱号" autocomplete="off">-->
<!--        </div>-->
<!--    </div>-->
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="model" placeholder="卷号" autocomplete="off">

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

@@ -124,7 +124,7 @@
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-cancel" 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="priWrkMast">维护状态</a>
<!--    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">维护状态</a>-->

    {{#if (d.ioType === 103) { }}
        <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">拣</a>