| src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/model/AgvBasDevpDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/agvBasDevpVisualized/basDevp.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -138,26 +138,33 @@ agvBasDevpDto.setAgvWrkMast(agvWrkMast); if("F".equals(agvBasDevpDto.getLocSts()) || "R".equals(agvBasDevpDto.getLocSts())){ AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>() //AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvBasDevpDto.getBarcode())); List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>() .eq("supp_code", agvBasDevpDto.getBarcode())); agvBasDevpDto.setAgvWaitPakin(agvWaitPakin); agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList); if(Cools.isEmpty(agvWaitPakin)){ AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>(). eq("wrk_no",agvWrkMast.getWrkNo())); if(Cools.isEmpty(agvWaitPakinList)){ //AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",agvWrkMast.getWrkNo())); List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo())); //agv站点可视化管理中的结余数量显示 agvWrkDetl.setVolume(0.0); if(agvWrkMast.getIoType() == 103){ AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getSourceLocNo()); agvWrkDetl.setVolume(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme()); for(AgvWrkDetl agvWrkDetl : agvWrkDetlList){ agvWrkDetl.setVolume(0.0); AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime()); if(agvWrkMast.getIoType() == 103){ //AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getSourceLocNo()); //AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime()); agvWrkDetl.setVolume(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme()); } if(agvWrkMast.getIoType() == 53){ //AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo()); agvWrkDetl.setVolume(agvLocDetl.getAnfme()); //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme()); } } if(agvWrkMast.getIoType() == 53){ AgvLocDetl agvLocDetl = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo()); agvWrkDetl.setVolume(agvLocDetl.getAnfme()); //agvWrkDetl.setAnfme(agvLocDetl.getAnfme() - agvWrkDetl.getAnfme()); } agvBasDevpDto.setAgvWrkDetl(agvWrkDetl); agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList); } }
@@ -77,9 +77,9 @@ @Override @Transactional public void comb(CombParam param, Long userId) { if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) { throw new CoolException(BaseRes.PARAM); } // if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) { // throw new CoolException(BaseRes.PARAM); // } // 判断是否有相同条码的数据 if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>(). eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) { src/main/java/com/zy/common/model/AgvBasDevpDto.java
@@ -6,6 +6,8 @@ import com.zy.asrs.entity.AgvWrkMast; import lombok.Data; import java.util.List; /** * 用于展示AGV站点可视化管理页面的数据 */ @@ -14,9 +16,9 @@ private AgvWrkMast agvWrkMast; private AgvWaitPakin agvWaitPakin; private List<AgvWaitPakin> agvWaitPakins; private AgvWrkDetl agvWrkDetl; private List<AgvWrkDetl> agvWrkDetls; private boolean containerMoveOutFlag;
@@ -75,17 +75,17 @@ 工作站编码：{{devNo}} </br> 站点状态：{{locSts$}} </div> {{#if agvWaitPakin}} {{#if agvWaitPakins}} <div style="padding-top: 10px;"> {{#if agvWaitPakin.orderNo}} 订单号：{{agvWaitPakin.orderNo}} </br> {{#if agvWaitPakins[0].orderNo}} 订单号：{{agvWaitPakins[0].orderNo}} </br> {{/if}} 物料号：{{agvWaitPakin.matnr}} </br> {{#if agvWaitPakin.batch}} 序列码：{{agvWaitPakin.batch}} </br> 物料号：{{agvWaitPakins[0].matnr}} </br> {{#if agvWaitPakins[0].batch}} 序列码：{{agvWaitPakins[0].batch}} </br> {{/if}} 料箱码：{{agvWaitPakin.suppCode}} </br> 数量：{{agvWaitPakin.anfme}} 料箱码：{{agvWaitPakins[0].suppCode}} </br> 数量：{{agvWaitPakins[0].anfme}} </div> {{/if}} {{#if agvWrkMast}} @@ -95,17 +95,17 @@ 工作类型：{{agvWrkMast.ioType$}} </div> {{/if}} {{#if agvWrkDetl}} {{#if agvWrkDetls}} <div style="padding-top: 10px;"> {{#if agvWrkDetl.orderNo}} 订单号：{{agvWrkDetl.orderNo}} </br> {{#if agvWrkDetls[0].orderNo}} 订单号：{{agvWrkDetls[0].orderNo}} </br> {{/if}} 物料号：{{agvWrkDetl.matnr}} </br> {{#if agvWrkDetl.batch}} 序列码：{{agvWrkDetl.batch}} </br> 物料号：{{agvWrkDetls[0].matnr}} </br> {{#if agvWrkDetls[0].batch}} 序列码：{{agvWrkDetls[0].batch}} </br> {{/if}} 料箱码：{{agvWrkDetl.suppCode}} </br> 取货数量：{{agvWrkDetl.anfme}} 结余数量：{{agvWrkDetl.volume}} 料箱码：{{agvWrkDetls[0].suppCode}} </br> 取货数量：{{agvWrkDetls[0].anfme}} 结余数量：{{agvWrkDetls[0].volume}} </div> {{/if}} </div>
