src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -234,6 +234,10 @@ if(!"O".equals(agvBasDevp.getLocSts())){ throw new CoolException(stationCode + "该站点货位状态非空"); } AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", agvBasDevp.getDevNo())); if(!Cools.isEmpty(agvWrkMast)){ throw new CoolException(stationCode + "该站点已被工作号为" + agvWrkMast.getWrkNo() + "占用,无法绑定"); } agvBasDevp.setBarcode(barcode); agvBasDevp.setLocSts("F"); src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
@@ -3,12 +3,10 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.zy.asrs.entity.DocType; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.Mat; import com.zy.asrs.entity.Order; import com.zy.asrs.service.AgvLocDetlService; import com.zy.asrs.service.DocTypeService; import com.zy.asrs.service.MatService; import com.zy.asrs.service.OrderService; import com.zy.asrs.service.*; import com.zy.asrs.task.handler.AutoReplenishmentHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -31,28 +29,38 @@ private MatService matService; @Autowired private AgvLocDetlService agvLocDetlService; @Autowired private LocDetlService locDetlService; /* 定时便利库存,生成自动补货单据 */ //@Scheduled(cron = "0/5 * * * * ? ") @Scheduled(cron = "0/5 * * * * ? ") public void createOrder(){ //检测是否有未完成的补货单据 DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "自动补货单")); int count = orderService.selectCount(new EntityWrapper<Order>() .eq("doc_type", docType.getDocId()) .andNew().eq("settle",2) .or("settle",1)); .or().eq("settle",1)); if(count > 0){ return; } //查询所有需要补货的物料 List<Mat> matList = matService.selectList(new EntityWrapper<Mat>().eq(false, "store_min", 0)); List<Mat> matList = matService.selectList(new EntityWrapper<Mat>().gt( "store_min", 0)); if(!Cools.isEmpty(matList)){ for (Mat mat : matList){ //查询当前物料是否在agv库小于库存上限 Double anfmeSum = agvLocDetlService.selectSumAnfmeByMatnr(mat.getMatnr()); if(Cools.isEmpty(anfmeSum)){ anfmeSum = 0.0; } //查询当前物料四项库是否存在 if(Cools.isEmpty(locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("matnr", mat.getMatnr())))){ continue; } if(anfmeSum < mat.getStoreMin()){ autoReplenishmentHandler.create(mat,mat.getStoreMax() - anfmeSum); break; src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.stream.Collectors; @Service public class AutoReplenishmentHandler extends AbstractHandler<String> { @@ -44,6 +45,7 @@ public ReturnT<String> create(Mat mat, double anfme) { //创建一个新的自动补货单据 Order order = createOrder(); orderService.insert(order); OrderDetl orderDetl = createOrderDetl(order); orderDetl.setMatnr(mat.getMatnr()); orderDetl.setMaktx(mat.getMaktx()); @@ -51,7 +53,7 @@ orderDetl.setAnfme(anfme); orderDetl.setQty(0.0); orderService.insert(order); orderDetlService.insert(orderDetl); return SUCCESS; @@ -157,6 +159,16 @@ //List<String> locNosSearch = locDetlService.selectLocNo(matnr); Set<String> locNosSearch = locDetlService.selectLocNos(matnr); //过滤库位货物为高货物 locNosSearch = locNosSearch.stream().filter(locNo -> { LocMast locMast = locMastService.selectByLoc(locNo); if(locMast.getLocType1() == 3){ return false; }else { return true; } }).collect(Collectors.toSet()); //重新排序 并且检测该库位是否含没有料箱码的物料,如有有则不允许出库 Set<String> resort = resort(locNosSearch);