#

lty

2025-01-13 cdf91538ba9d130afa33b12e55b18bd77d0b93d8

 src/main/java/com/zy/common/web/WcsController.java

@@ -356,14 +356,14 @@
            if ((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14) {
                List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                String sourcecLocNo = wrkMast.getSourceLocNo();
                // 获取后两位的层数
                // 获取后两位的层数（高低库位数据）
                String layerStr = sourcecLocNo.substring(sourcecLocNo.length() - 2);
                int layer = Integer.parseInt(layerStr);
                // 判断层数
                Short locType1 = (short) ((layer == 1) ? 1 : 2);
                LocTypeDto locTypeDto = new LocTypeDto();
                locTypeDto.setLocType1(locType1);
                //注意一个板只能放同一种物料
                //注意一个板只能放同一种物料（检索新库位）
                StartupDto dto = commonService.getLocNoRunPick(4, 1, 101, wrkDetls.get(0).getMatnr(), wrkDetls.get(0).getBatch(), null, 4, locTypeDto, 2);
                Date now = new Date();
                wrkMast.setIoTime(now);
@@ -402,12 +402,12 @@
                //更新工作明细并清空源库位
                for (WrkDetl wrkDetl : wrkDetls){
                    LocDetl locDetl = locDetlService.selectItem(wrkMast.getSourceLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                    if (null != locDetl && wrkMast.getIoType() == 103) {
                    if (null != locDetl && wrkMast.getIoType() == 103) {//拣料
                        if (!wrkDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            throw new CoolException("拣料入库 ===>> 修改库存明细数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                        }
                    }else if(wrkMast.getIoType() == 107){
                    }else if(wrkMast.getIoType() == 107){//盘点
                        if (!wrkDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            throw new CoolException("拣料入库 ===>> 修改库存明细数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -427,6 +427,7 @@
            }
        }
        wrkMastService.updateById(wrkMast);
        //已入库未确认历史档更新
        if(wrkMast.getWrkSts() == 14){
            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {