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

pjb

1 天以前 9ea93abc2606948e5724316a4a3ec338ea14a130

 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("请先删除拣货单");