#

18516761980

2022-06-13 fcf3be88b1907d9d0a0004ee8fd858832ca5d53a

#

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

@@ -83,7 +83,11 @@
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)){
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        } else {
            wrapper.orderBy("appe_time", true);
        }
        return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/asrs/task/CheckDeepScheduler.java

@@ -84,6 +84,12 @@
        if (null == locMasts) return;

        for (LocMast sourceLoc : locMasts){
            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                    .eq("crn_no",sourceLoc.getCrnNo())
                    .last(" and wrk_sts in (2,3,4,11,12)")
            );
            if (wrkMasts.size() > 1) continue;

            String deep = Utils.getDeepLoc(slaveProperties, sourceLoc.getLocNo());
            LocMast destLoc = locMastService.selectById(deep);


 src/main/resources/mapper/LocDetlMapper.xml

@@ -66,6 +66,7 @@
            and b.loc_sts = 'F'
            <include refid="stockOutCondition"></include>
        ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
        order by appe_time
    </select>

    <select id="getStockOutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">