skyouc
2 天以前 99861dc6aa5a294f44c27ab461fed3b7d2ad466f
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
@@ -103,11 +103,15 @@
        if (null == task) {
            throw new CoolException("数据错误,未找到容器码对应盘点任务");
        }
        for (CheckDiffItem checkDiffItem : params.getCheckDiffItems()) {
        for (CheckDiffItem ckDiffItem : params.getCheckDiffItems()) {
            CheckDiffItem diffItem = new CheckDiffItem();
            if (Objects.isNull(checkDiffItem.getId())) {
                BeanUtils.copyProperties(checkDiffItem, diffItem);
                diffItem.setCheckId(params.getCheckId());
            if (Objects.isNull(ckDiffItem.getId())) {
                BeanUtils.copyProperties(ckDiffItem, diffItem);
                diffItem.setCheckId(params.getCheckId())
                        .setOrderCode(checkDiff.getOrderCode())
                        .setTaskId(task.getId())
                        .setBarcode(task.getBarcode())
                        .setAnfme(ckDiffItem.getCheckQty());
                Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, diffItem.getMatnrCode()));
                if (Objects.isNull(matnr)) {
@@ -122,6 +126,7 @@
                BeanUtils.copyProperties(diffItem, diffItem);
                taskItem.setTaskId(task.getId())
                        .setOrderType(OrderType.ORDER_CHECK.type)
                        .setSourceCode(diffItem.getOrderCode())
                        .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type))
                        .setAnfme(diffItem.getAnfme())
                        .setWorkQty(0.0)
@@ -145,18 +150,24 @@
                if (!taskItemService.save(taskItem)) {
                    throw new CoolException("新增盘点明细保存失败!!");
                }
                diffItem.setTaskItemId(taskItem.getId());
                if (!checkDiffItemService.updateById(diffItem)) {
                    throw new CoolException("明细修改失败!!");
                }
            } else {
                diffItem = checkDiffItemService.getById(checkDiffItem.getId());
                diffItem = checkDiffItemService.getById(ckDiffItem.getId());
                if (null == diffItem) {
                    return R.error("数据错误,未找到差异单明细");
                }
            }
            checkDiffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
            if (!checkDiffItemService.updateById(checkDiffItem)) {
            diffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
            if (!checkDiffItemService.updateById(diffItem)) {
                throw new CoolException("更新差异单明细失败");
            }
            Double checkQty = Math.round((checkDiff.getCheckQty() + checkDiffItem.getCheckQty()) * 10000) / 10000.0;
            Double checkQty = Math.round((checkDiff.getCheckQty() + diffItem.getCheckQty()) * 10000) / 10000.0;
            checkDiff.setCheckQty(checkQty);
        }
        checkDiff.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);