Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

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

@@ -142,7 +142,7 @@

        Order order = this.selectById(orderId);

        int count = manPakOutService.selectCount(new EntityWrapper<ManPakOut>().eq("doc_name", order.getOrderNo()));
        int count = manPakOutService.selectCount(new EntityWrapper<ManPakOut>().eq("doc_num", order.getOrderNo()));

        if(count > 0){
            throw new CoolException("请先删除拣货单");