#

zjj

2023-11-13 4d86df5389fb939e5a7a04af89afd8ca34b62fb5

 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java

@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
@@ -73,8 +74,9 @@
        }
        if (complete) {
            for (OrderDetl orderDetl : orderDetls) {
                //生成单据和入库通知档时，给batch为空的明细赋了一个 =""， 现在改为null，回传用
                if (orderDetl.getBatch().equals("")){
                if (Cools.isEmpty(orderDetl.getBatch())){
                    orderDetlService.updateById(orderDetl);
                }else if (orderDetl.getBatch().equals("")){//生成单据和入库通知档时，给batch为空的明细赋了一个 =""， 现在改为null，回传用
                    orderDetl.setBatch(null);
                    orderDetlService.updateById(orderDetl);
                }
@@ -208,4 +210,15 @@
        return this.baseMapper.selectToBeHistoryOrder(settle);
    }

    @Override
    public List<OrderListDTO> selectAllorderNo() {
        return this.baseMapper.selectAllorderNo();
    }

    @Override
    public Page<Order> getOrderAll(Page<Order> page) {
        page.setRecords(baseMapper.getOrderAll(page.getCondition()));
        page.setTotal(baseMapper.getOrderAllCount(page.getCondition()));
        return page;
    }
}