自动补货单新增 1.订单中只能生成两笔自动补货单 2.CTU库是否有足够的空库位，空库位数需要大于100才会生成自动补货单 3.在补货时加上订单明细的...

zwl

20 小时以前 43efe016c156158b9fc3a8b647810f612fb126e6

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

@@ -2,18 +2,17 @@

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.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.handler.AutoReplenishmentHandler;
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.List;
import java.util.Set;

@Slf4j
@Component
@@ -21,6 +20,8 @@

    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private DocTypeService docTypeService;
    @Autowired
@@ -30,20 +31,33 @@
    @Autowired
    private AgvLocDetlService agvLocDetlService;
    @Autowired
    private AgvLocMastService agvLocMastService;
    @Autowired
    private LocDetlService locDetlService;

    /*
    定时便利库存，生成自动补货单据
    定时遍历库存，生成自动补货单据
     */
    @Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(cron = "0 */1 * * * ? ")
    public void createOrder(){

        if(!"Y".equals(Parameter.get().getAutoReplenishment())){
            return;
        }

        //检测是否有未完成的补货单据
        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().eq("settle",1));
        if(count > 0){
        if(count > 2){
            return;
        }
        
        //判断CTU库是否有足够的空库位，空库位数需要大于100
        int i = agvLocMastService.selectCount(new EntityWrapper<AgvLocMast>().eq("loc_sts", "O"));
        if(i < 100){
            return;
        }

@@ -51,17 +65,67 @@
        List<Mat> matList = matService.selectList(new EntityWrapper<Mat>().gt( "store_min", 0));
        if(!Cools.isEmpty(matList)){
            for (Mat mat : matList){
                //检测是否有未完成的补货单据
                DocType docType1 = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "自动补货单"));
                int count1 = orderService.selectCount(new EntityWrapper<Order>()
                        .eq("doc_type", docType1.getDocId())
                        .andNew().eq("settle",2)
                        .or().eq("settle",1));
                if(count1 > 2){
                    break;
                }

                //判断CTU库是否有足够的空库位，空库位数需要大于100
                int j = agvLocMastService.selectCount(new EntityWrapper<AgvLocMast>().eq("loc_sts", "O"));
                if(j < 100){
                    return;
                }

                //收集当前物料自动补货单明细数量
                Double orderDetlCount = 0.0;
                List<Order> orders = orderService.selectList(new EntityWrapper<Order>()
                        .eq("doc_type", docType1.getDocId())
                        .andNew().eq("settle", 2)
                        .or().eq("settle", 1));
                if(!Cools.isEmpty(orders)){
                    for (Order order : orders){
                        List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
                                .eq("matnr", mat.getMatnr())
                                .eq("order_no", order.getOrderNo()));
                        if(Cools.isEmpty(orderDetls)){
                            continue;
                        }
                        for (OrderDetl orderDetl : orderDetls){
                            orderDetlCount=orderDetlCount+orderDetl.getQty();
                        }
                    }
                }
                //查询当前物料是否在agv库小于库存上限
                Double anfmeSum = agvLocDetlService.selectSumAnfmeByMatnr(mat.getMatnr());
                if(Cools.isEmpty(anfmeSum)){
                    anfmeSum = 0.0;
                }
                //查询当前物料四项库是否存在
                //当前物料不需要补货
                if(anfmeSum+orderDetlCount > mat.getStoreMin()){
                    continue;
                }
                //查询当前物料四项库是否存在,并且托盘不含有非料箱物料
                if(Cools.isEmpty(locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("matnr", mat.getMatnr())))){
                    continue;
                }

                if(anfmeSum < mat.getStoreMin()){
                Set<String> locNosSearch = locDetlService.selectLocNos(mat.getMatnr());
                //是否含有可补货出库的库位
                boolean flag = false;
                for (String locNo : locNosSearch){
                    //log.info("需要拣料的货位：" + locNo +"，需要补货的物料：" + mat.getMatnr());
                    if(Cools.isEmpty(locDetlService.selectByLocWithoutContainer(locNo))){
                        flag = true;
                        continue;
                    }
                }

                if(flag){
                    autoReplenishmentHandler.create(mat,mat.getStoreMax() - anfmeSum);
                    break;
                }
@@ -72,7 +136,7 @@
    /*
    定时处理自动补货单据
     */
    @Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(cron = "0/10 * * * * ? ")
    public void excuteOrder(){
        DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "自动补货单"));
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>()