| src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/JlerHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application-dev.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/WrkMastMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -52,9 +52,9 @@ if(station.getAutoing()==null || !station.getAutoing().equals("Y")) { throw new CoolException(devpNo+"站点不是自动状态"); } if(station.getLoading()==null || !station.getLoading().equals("Y")) { throw new CoolException(devpNo+"站点无物"); } // if(station.getLoading()==null || !station.getLoading().equals("Y")) { // throw new CoolException(devpNo+"站点无物"); // } if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) { throw new CoolException(devpNo+"站点已有工作号"); } src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
@@ -372,7 +372,7 @@ // 空托出库 if (StringUtils.isEmpty(mesOutApply.getOrderNo()) && "01".equals(mesOutApply.getTransType())) { // 生成空托出库任务 mobileService.callEmptyBinOutBound(mesOutApply,WMS_TRANS_START_STATION_1,"1",1,defaultUserId); mobileService.callEmptyBinOutBound(mesOutApply,mesOutApply.getStationId().startsWith("LL") ? WMS_TRANS_START_STATION_3 : WMS_TRANS_START_STATION_1,"1",1,defaultUserId); // try { // if (!StringUtils.isEmpty(mesOutApply.getTaskno()) && !StringUtils.isEmpty(mesOutApply.getStationId())) { @@ -477,8 +477,13 @@ wrkMast.setIoType(101); // 入出库状态 wrkMast.setIoPri(13D); // 优先级：13 wrkMast.setCrnNo(1); wrkMast.setSourceStaNo("203"); // 源站 wrkMast.setStaNo("204"); // 目标站 if(mesOutApply.getStationId().startsWith("LL")) { wrkMast.setSourceStaNo("203"); // 源站 wrkMast.setStaNo("204"); // 目标站 } else { wrkMast.setSourceStaNo("205"); // 源站 wrkMast.setStaNo("205"); // 目标站 } wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位 wrkMast.setFullPlt("Y"); // 满板：Y wrkMast.setPicking("N"); // 拣料 @@ -587,7 +592,7 @@ transTask.setTransType(mesInApply.getTransType()); transTask.setCurProcess(mesInApply.getProductLineId()); transTask.setCurStationId(mesInApply.getStationID()); transTask.setNextStationId(WMS_TRANS_START_STATION_2); transTask.setNextStationId(mesInApply.getStationID().startsWith("LL") ? WMS_TRANS_START_STATION_2 : WMS_TRANS_START_STATION_1); transTask.setItemno(WMS_ZPALLET_ID); // 固定为空托的编码 transTask.setQty(1); // 空托只回1个 transTask.setProductLineId(mesInApply.getProductLineId()); @@ -686,7 +691,7 @@ transTask.setTransType(mesInApply.getTransType()); transTask.setCurProcess(mesInApply.getProductLineId()); transTask.setCurStationId(mesInApply.getStationID()); transTask.setNextStationId(WMS_TRANS_START_STATION_2); transTask.setNextStationId(mesInApply.getStationID().startsWith("LL") ? WMS_TRANS_START_STATION_2 : WMS_TRANS_START_STATION_1); transTask.setItemno(mesInApply.getItemno()); transTask.setQty(mesInApply.getQty()); transTask.setProductLineId(mesInApply.getProductLineId()); @@ -972,7 +977,7 @@ transTask.setOrderNo(dbMemo.getString("OrderNo")); transTask.setTransType(dbMemo.getString("TransType")); // transTask.setCurProcess(); transTask.setCurStationId(WMS_TRANS_START_STATION_1); transTask.setCurStationId(WMS_TRANS_START_STATION_3); transTask.setNextProcess(dbMemo.getString("ProductLineId")); transTask.setNextStationId(dbMemo.getString("StationId")); transTask.setItemno(dbMemo.getString("Itemno")); src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -620,9 +620,9 @@ if (Cools.isEmpty(mat)) { throw new CoolException(detlDto.getMatnr() + "商品档案不存在"); } if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) { throw new CoolException("物料：" + detlDto.getMatnr() + "单次最大组托上限为：" + mat.getUpQty()); } // if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) { // throw new CoolException("物料：" + detlDto.getMatnr() + "单次最大组托上限为：" + mat.getUpQty()); // } WaitPakin waitPakin = new WaitPakin(); BeanUtils.copyProperties(mat, waitPakin); waitPakin.setBatch(detlDto.getBatch()); src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1258,7 +1258,7 @@ // 获取目标站 Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() .eq("type_no", wrkMast.getIoType() - 50) .eq("stn_no", Integer.parseInt(wrkMast.getStaNo())-2) // 作业站点 = 拣料出库的目标站 .eq("stn_no", wrkMast.getSourceStaNo()) // 作业站点 = 拣料出库的目标站 .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号 StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { @@ -1270,8 +1270,8 @@ // 更新工作档数据状态 wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57 wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走 wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站 wrkMast.setStaNo(staNo + ""); // 目标站 wrkMast.setSourceStaNo(staDesc.getStnNo$()); // 源站 wrkMast.setStaNo(staDesc.getCrnStn$()); // 目标站 wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位 wrkMast.setSourceLocNo(""); // 源库位清空 wrkMast.setModiTime(now); src/main/java/com/zy/asrs/task/handler/JlerHandler.java
@@ -55,7 +55,7 @@ // transTask.setTaskname(mesOutApply.getTaskname()); // transTask.setOrderNo(mesOutApply.getOrderNo()); transTask.setTransType("01"); transTask.setCurStationId(WMS_TRANS_START_STATION_3); transTask.setCurStationId(wrkMast.getStaNo()); // transTask.setNextProcess(mesOutApply.getProductLineId()); transTask.setNextStationId(wrkMast.getAgvSta()); transTask.setItemno(WMS_ZPALLET_ID); // 固定为空托的编码 @@ -76,7 +76,7 @@ transTask.setTaskname(mesOutApply.getTaskname()); transTask.setOrderNo(mesOutApply.getOrderNo()); transTask.setTransType(mesOutApply.getTransType()); transTask.setCurStationId(WMS_TRANS_START_STATION_3); transTask.setCurStationId(wrkMast.getStaNo()); transTask.setNextProcess(mesOutApply.getProductLineId()); transTask.setNextStationId(mesOutApply.getStationId()); transTask.setItemno(WMS_ZPALLET_ID); // 固定为空托的编码 @@ -102,7 +102,7 @@ transTask.setTaskname(mesOutApply.getTaskname()); transTask.setOrderNo(mesOutApply.getOrderNo()); transTask.setTransType(mesOutApply.getTransType()); transTask.setCurStationId(WMS_TRANS_START_STATION_3); transTask.setCurStationId(wrkMast.getStaNo()); transTask.setNextProcess(mesOutApply.getProductLineId()); transTask.setNextStationId(mesOutApply.getStationId()); transTask.setItemno(mesOutApply.getItemno()); src/main/resources/application-dev.yml
@@ -120,8 +120,8 @@ currentId: 2 #当前库名称 currentName: 加工库 #立库AGV自动运货出库口编码 wmsTransStartStation1: 204 #立库AGV自动运货出库口编码 侧面奥普瑞斯产线出入库口 wmsTransStartStation1: 205 #立库AGV自动运货入库口编码（输送线） wmsTransStartStation2: 202 #立库AGV自动运货出库口编码（输送线） src/main/resources/mapper/WrkMastMapper.xml
@@ -73,7 +73,7 @@ select * from asr_wrk_mast where wrk_sts=5 or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp)) or (wrk_sts=15 and dateadd(mi,1,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp)) or (wrk_sts=15 and dateadd(second,10,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp)) or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp)) order by io_time,wrk_no asc </select>
