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

cl

2 天以前 79eb9321e21e873a373c10480f8066cbc0407eb8

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

# Conflicts:
#	src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -60,6 +60,11 @@
    private LocMastService locMastService;
    @Autowired
    private ReportQueryMapper reportQueryMapper;
    @Autowired
    private WorkService workService;

    @Autowired
    private LocMastService locMastService;
//    @PostMapping("/order/matSync/default/v1")
////    @AppAuth(memo = "商品信息同步接口")
//    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@@ -550,6 +555,12 @@
            }
            validOutOrders.add(outTaskParam);
        }
        for (OutTaskParam outTaskParam : validOutOrders) {
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", outTaskParam.getPalletId()));
            if (locMast == null) {
                throw new CoolException("没有找到托盘码=" + outTaskParam.getPalletId() + "对应的库位");
            }
        }

        for (OutTaskParam outTaskParam : validOutOrders) {
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", outTaskParam.getPalletId()));