3077,3106只有合格能出,2041 只有待判能出

pang.jiabao

2 天以前 e012a72a5660566d698c93ca4f29b6e5ffe997b0

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

@@ -1436,7 +1436,7 @@
    @Override
    public R pdaFxprk(GwmsGenerateInventoryDto param, Long userId) {

        if (Cools.isEmpty(param)) {
        if (Cools.isEmpty(param,param.getMatList())) {
            throw new CoolException("请求参数不能为空：" + param);
        }
        if (Cools.isEmpty(param.getBarcode())) {
@@ -1468,6 +1468,7 @@
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setWhsType(1); // 返修入库标识
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(1L); // 工作状态：设备上走
        wrkMast.setIoType(iotype); // 入出库状态：1.入库
@@ -1548,12 +1549,113 @@
        }

        // 一楼返修入库推送mes做记录
        pushFxrkToMes(param);
//        pushFxrkToMes(param); 改为库存更新完成后上报

        // 返回GWCS目标信息
        openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "二楼返修入库推送gwcs");
        openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "一楼返修入库推送gwcs");

        return R.ok("反修入库成功");
    }

    @Override
    public R pdaBoxIn(BoxInParam param, Long userId) {

        if (Cools.isEmpty(param.getBarcode())) {
            throw new CoolException("条码不能为空：" + param.getBarcode());
        }

        if (Cools.isEmpty(param.getAnfme())) {
            throw new CoolException("请输入数量" + param.getAnfme());
        }
        if (Cools.isEmpty(param.getMemo())) {
            throw new CoolException("请输入备注");
        }
        if (Cools.isEmpty(param.getOld())) {
            throw new CoolException("请输入新旧" );
        }

        int zpalletCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        if (zpalletCount > 0) {
            throw new CoolException("库存托盘码已存在：" + param.getBarcode());
        }

        int barcodeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        if (barcodeCount > 0) {
            throw new CoolException("工作档已存在该托盘码：" + param.getBarcode());
        }

        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short) 1);
        int iotype = 1; //空箱

        // 根据源站点寻找库位
        StartupDto dto = commonService.getLocNo(iotype, param.getPalletizingNo(), locTypeDto, 0);

        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(1L); // 工作状态：设备上走
        wrkMast.setIoType(iotype); // 入出库状态：1.入库
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(param.getPalletizingNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setBarcode(param.getBarcode()); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setCtnType(1); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setAppeUser(userId);
        wrkMast.setModiTime(now);
        wrkMast.setModiUser(userId);
        wrkMastService.insert(wrkMast);

        if (!Cools.isEmpty(param.getBatch())) {
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.setMatnr("空箱");
                wrkDetl.setSuppCode(param.getOld());
                wrkDetl.setAnfme(param.getAnfme());
                wrkDetl.setWrkNo(wrkMast.getWrkNo());
                wrkDetl.setWrkNo(wrkMast.getWrkNo());
                wrkDetl.setBatch(param.getBatch()); // 尺寸
                wrkDetl.setZpallet(param.getBarcode()); // 托盘码
                wrkDetl.setBarcode(param.getBarcode());
                wrkDetl.setMemo(param.getMemo()); //备注
                wrkDetl.setAnfme(param.getAnfme());
                wrkDetl.setIoTime(now);
                wrkDetl.setAppeTime(now);
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiUser(userId);
                wrkDetl.setModiTime(now);
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作明细失败");
                }
        }

        // 更新目标库位状态
        LocMast locMast = locMastService.selectById(dto.getLocNo());
        if (locMast.getLocSts().equals("O")) {
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }

        // 返回GWCS目标信息
        openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "一楼空箱入库推送gwcs");

        return R.ok("空箱入库成功");
    }

    private void pushFxrkToMes(GwmsGenerateInventoryDto param) {
@@ -1928,7 +2030,7 @@
     * 调整库存明细
     */
    @Transactional
    void insertLocDetl(String locNo, String barcode, List<PdtzParam.MatList> matList) {
    public void insertLocDetl(String locNo, String barcode, List<PdtzParam.MatList> matList) {
        Date now = new Date();
        for (PdtzParam.MatList mat : matList) {
            LocDetl locDetl = new LocDetl();
@@ -2113,4 +2215,33 @@
        }
        return result;
    }

    @Override
    public List<Map<String, Object>> pdaGetMemo() {
        List<Integer> tagIds = Arrays.asList(7, 8,9);
        List<Map<String, Object>> raw = matMapper.getBoxMemoMap(tagIds);

        // 用 Map<String, List<String>> 分组
        Map<String, List<String>> grouped = new HashMap<>();
        for (Map<String, Object> row : raw) {
            String tagId = String.valueOf(row.get("tag_id"));
            String memo = String.valueOf(row.get("memo"));
            if (memo == null || "null".equalsIgnoreCase(memo)) continue;

            grouped.computeIfAbsent(tagId, k -> new ArrayList<>()).add(memo);
        }

        // 转成 List<Map<String, Object>> 结构返回
        List<Map<String, Object>> result = new ArrayList<>();
        for (Map.Entry<String, List<String>> entry : grouped.entrySet()) {
            Map<String, Object> item = new HashMap<>();
            item.put("tagId", entry.getKey());
            item.put("memos", entry.getValue());
            result.add(item);
        }

        return result;
    }


}