#

zjj

2025-04-14 287170042ad762d32ca574a5ed692648ea8e002f

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

@@ -76,8 +76,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);
                }
@@ -166,9 +167,8 @@
    }

    @Override
    public List<OrderCheck> selectToBeHistoryOrder(boolean isERP) {
        int settle = isERP ? 6 : 4;
        return this.baseMapper.selectToBeHistoryOrder(settle);
    public List<OrderCheck> selectToBeHistoryOrder() {
        return this.baseMapper.selectToBeHistoryOrder();
    }

    @Override