Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms

野心家

1 天以前 5127f46eedeede5cbfeae7a4908ddac11d332494

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

@@ -54,7 +54,10 @@
        if(config.getStatus()==0){
            return;
        }

        WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no",200));
        if(!Cools.isEmpty(wrkMast1)){
            return;
        }
        BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 200));
        if (Cools.isEmpty(basDevp.getLoading())||basDevp.getLoading().equals("N")) {
            //找到入库最早的