| src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/operateLog/operateLog.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1247,11 +1247,13 @@ ArrayList<LocDetl> locDetlArrayList = new ArrayList<>(); Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>() .eq("matnr", param.getMatnr()) .eq("weight", param.getWeight()) .orderBy("batch", true); .eq("weight", param.getWeight()); if (param.getDevNo() == 536) { wrapper.eq("model", param.getModel()) .eq("specs", param.getOrderNo()); .eq("specs", param.getOrderNo()) .orderBy("appe_time", true); } else { wrapper.orderBy("batch", true); } List<LocDetl> locDetls = locDetlService.selectList(wrapper); @@ -1274,12 +1276,16 @@ Wrapper<LocDetl> locDetlWrapper = new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr()) .lt("weight", param.getWeight() + mat.getUnits()) .and() .gt("weight", param.getWeight()) .orderBy("batch", true) .orderBy("weight", true); .gt("weight", param.getWeight()); if (param.getDevNo() == 536){ locDetlWrapper.eq("model", param.getModel()) .eq("specs", param.getOrderNo()); .eq("specs", param.getOrderNo()) .orderBy("appe_time", true) .orderBy("weight", true); } else { locDetlWrapper .orderBy("batch", true) .orderBy("weight", true); } locDetls = locDetlService.selectList(locDetlWrapper); if (locDetls.isEmpty()){ @@ -1300,12 +1306,16 @@ Wrapper<LocDetl> locDetlWrapper = new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr()) .gt("weight", param.getWeight() - mat.getUnits()) .and() .lt("weight", param.getWeight()) .orderBy("batch", true) .orderBy("weight", false); .lt("weight", param.getWeight()); if (param.getDevNo() == 536){ locDetlWrapper.eq("model", param.getModel()) .eq("specs", param.getOrderNo()); .eq("specs", param.getOrderNo()) .orderBy("appe_time", true) .orderBy("weight", false); } else { locDetlWrapper .orderBy("batch", true) .orderBy("weight", false); } locDetls = locDetlService.selectList(locDetlWrapper);
@@ -219,6 +219,9 @@ .eq("stn_no", param.getOutSite()) .eq("crn_no", locMast.getCrnNo()); StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { throw new CoolException("出库路径不存在"); } Integer sourceStaNo = staDesc.getCrnStn(); if (Cools.isEmpty(sourceStaNo)) { throw new CoolException("检索源站失败"); @@ -290,6 +293,9 @@ .eq("stn_no", param.getOutSite()) .eq("crn_no", locMast.getCrnNo()); StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { throw new CoolException("出库路径不存在"); } Integer sourceStaNo = staDesc.getCrnStn(); if (Cools.isEmpty(sourceStaNo)) { throw new CoolException("检索源站失败"); @@ -782,6 +788,9 @@ .eq("stn_no", param.getOutSite()) .eq("crn_no", locMast.getCrnNo()); StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { throw new CoolException("出库路径不存在"); } Integer sourceStaNo = staDesc.getCrnStn(); if (Cools.isEmpty(sourceStaNo)) { throw new CoolException("检索源站失败"); @@ -841,6 +850,9 @@ .eq("stn_no", param.getOutSite()) .eq("crn_no", locMast.getCrnNo()); StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { throw new CoolException("出库路径不存在"); } Integer sourceStaNo = staDesc.getCrnStn(); if (Cools.isEmpty(sourceStaNo)) { throw new CoolException("检索源站失败"); @@ -912,6 +924,9 @@ .eq("stn_no", param.getOutSite()) .eq("crn_no", locMast.getCrnNo()); StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { throw new CoolException("出库路径不存在"); } Integer sourceStaNo = staDesc.getCrnStn(); if (Cools.isEmpty(sourceStaNo)) { throw new CoolException("检索源站失败"); @@ -1090,6 +1105,9 @@ .eq("stn_no", param.getOutSite()) .eq("crn_no", locMast.getCrnNo()); StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { throw new CoolException("出库路径不存在"); } Integer sourceStaNo = staDesc.getCrnStn(); if (Cools.isEmpty(sourceStaNo)) { throw new CoolException("检索源站失败"); @@ -1401,7 +1419,7 @@ public void cancelWrkMast(String workNo, Long userId) { Date now = new Date(); WrkMast wrkMast = wrkMastService.selectById(workNo); if (Cools.isEmpty(wrkMast)){ if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()>12 || (wrkMast.getWrkSts()>3 && wrkMast.getWrkSts()<5)){ throw new CoolException(workNo+"工作档不存在"); } if (Cools.isEmpty(wrkMast.getLocNo()) && Cools.isEmpty(wrkMast.getSourceLocNo())){ src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -95,6 +95,11 @@ .eq("stn_no", staNo) .eq("crn_no", locMast.getCrnNo()); StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { // throw new CoolException("出库路径不存在"); sign = false; continue; } Integer sourceStaNo = staDesc.getCrnStn(); if (Cools.isEmpty(sourceStaNo)) { // throw new CoolException("检索源站失败"); src/main/webapp/views/operateLog/operateLog.html
@@ -32,6 +32,11 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="action" placeholder="操作内容" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="request" placeholder="请求数据" autocomplete="off"> </div> </div>
