#

Administrator

2 天以前 b61c2d7525bcbdf02db339c1b9865c6032412a8c

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

@@ -433,12 +433,13 @@
        List<MesToCombParam> errorComb = Lists.newArrayList();
        List<MesToCombParam> validComb = Lists.newArrayList();
        for (MesToCombParam mesToCombParam : param) {
//            if (mesToCombParam.getPalletId().length() != 8) {
//                return R.error(mesToCombParam.getPalletId()+"-该托盘码不为8位");
//            }
            if (Cools.isEmpty(mesToCombParam.getBizNo())) {
                return R.error("bizNo不能為空");
            }
//        if (param.getCombMats().size()>1){
//            throw new CoolException("不允许混料===>>" + param.getBarcode());
//        }


            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", mesToCombParam.getPalletId()));
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", mesToCombParam.getPalletId()));
@@ -482,24 +483,24 @@
            }
            orderIds.add(outTaskParam.getOrderId());
        }
        if (!orderIds.isEmpty()) {
            Set<String> existedOrderIds = new LinkedHashSet<>();
            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("user_no", orderIds));
            for (WrkMast wrkMast : wrkMasts) {
                if (!Cools.isEmpty(wrkMast.getUserNo())) {
                    existedOrderIds.add(wrkMast.getUserNo());
                }
            }
            List<WrkMastLog> wrkMastLogs = wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().in("user_no", orderIds));
            for (WrkMastLog wrkMastLog : wrkMastLogs) {
                if (!Cools.isEmpty(wrkMastLog.getUserNo())) {
                    existedOrderIds.add(wrkMastLog.getUserNo());
                }
            }
            if (!existedOrderIds.isEmpty()) {
                return R.error("出库单号已存在任务档或任务历史档：" + String.join("，", existedOrderIds));
            }
        }
//        if (!orderIds.isEmpty()) {
//            Set<String> existedOrderIds = new LinkedHashSet<>();
//            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("user_no", orderIds));
//            for (WrkMast wrkMast : wrkMasts) {
//                if (!Cools.isEmpty(wrkMast.getUserNo())) {
//                    existedOrderIds.add(wrkMast.getUserNo());
//                }
//            }
//            List<WrkMastLog> wrkMastLogs = wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().in("user_no", orderIds));
//            for (WrkMastLog wrkMastLog : wrkMastLogs) {
//                if (!Cools.isEmpty(wrkMastLog.getUserNo())) {
//                    existedOrderIds.add(wrkMastLog.getUserNo());
//                }
//            }
//            if (!existedOrderIds.isEmpty()) {
//                return R.error("出库单号已存在任务档或任务历史档：" + String.join("，", existedOrderIds));
//            }
//        }

        List<OutTaskParam> errorOutOrders = Lists.newArrayList();
        List<OutTaskParam> validOutOrders = Lists.newArrayList();