库存调整Bug修复 新增单据历史页面

zyx

2023-11-22 7a8348eedc96af517f57721f03c35605815c45c6

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

@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.DocType;
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.task.handler.AutoReplenishmentHandler;
import lombok.extern.slf4j.Slf4j;
@@ -24,12 +27,45 @@
    private DocTypeService docTypeService;
    @Autowired
    private AutoReplenishmentHandler autoReplenishmentHandler;
    @Autowired
    private MatService matService;
    @Autowired
    private AgvLocDetlService agvLocDetlService;

    /*
    定时便利库存，生成自动补货单据
     */
    //@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));
        if(count > 0){
            return;
        }

        //查询所有需要补货的物料
        List<Mat> matList = matService.selectList(new EntityWrapper<Mat>().eq(false, "store_min", 0));
        if(!Cools.isEmpty(matList)){
            for (Mat mat : matList){
                //查询当前物料是否在agv库小于库存上限
                Double anfmeSum = agvLocDetlService.selectSumAnfmeByMatnr(mat.getMatnr());
                if(anfmeSum < mat.getStoreMin()){
                    autoReplenishmentHandler.create(mat,mat.getStoreMax() - anfmeSum);
                    break;
                }
            }
        }
    }

    /*
    定时处理自动补货单据
     */
    @Scheduled(cron = "0/5 * * * * ? ")
    public void excute(){
    public void excuteOrder(){
        DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "自动补货单"));
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>()
                .eq("doc_type", docType.getDocId())