#

18516761980

2023-03-09 21a9bab4a910f78ed182c24543195698a63b1fe0

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -74,22 +74,23 @@
                    if (!Cools.isEmpty(wrkDetls)) {
                        for (WrkDetl wrkDetl : wrkDetls) {
                            // Goods 表
                            Goods goods = erpService.selectGoodsOne(wrkDetl.getMatnr());
                            Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
                            if (!Cools.isEmpty(goods)) {
                                if (!erpService.updateStateAndLocForGoods(goods.getBarCode(), 3, wrkMast.getLocNo())) {
                                    log.error("{}条码在erp数据库中更新失败！", goods.getBarCode());
                                }
                            } else {
                                log.error("{}条码不在erp数据库中！", wrkDetl.getMatnr());
                                log.error("{}条码不在erp数据库中！", wrkDetl.getBatch());
                            }
                            // OrderDetl 表
                            OrderDetl orderDetl = orderDetlService.selectByMatnr(wrkDetl.getMatnr());
                            OrderDetl orderDetl = orderDetlService.selectItemOfBatch(wrkDetl.getMatnr(), wrkDetl.getBatch());
//                            OrderDetl orderDetl = orderDetlService.selectContainBatch(wrkDetl.getBatch());
                            if (!Cools.isEmpty(orderDetl)) {
                                Order order = orderService.selectById(orderDetl.getOrderId());
                                DocType docType = docTypeService.selectById(order.getDocType());
                                if (docType.getPakin() == 1) {
                                    if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), wrkDetl.getAnfme())) {
                                        log.error("{}编号订单，更新{}条码数量失败", orderDetl.getOrderNo(), orderDetl.getMatnr());
                                        log.error("{}编号订单，更新{}条码数量失败", orderDetl.getOrderNo(), orderDetl.getBatch());
                                    }
                                }
                                // Order 表
@@ -111,22 +112,64 @@
                            }
                        }
                    }
                    // 拣料再入库
                // 拣料再入库
                } else if (wrkMast.getIoType() == 53) {
                    if (!Cools.isEmpty(wrkDetls)) {
                        if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
                            exceptionHandle("生成手动出库单据[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
                    // 修改 erp Goods 表
                    for (WrkDetl wrkDetl : wrkDetls) {
                        Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
                        if (!Cools.isEmpty(goods)) {
                            if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
                                log.error("{}条码在erp数据库中更新失败！", goods.getBarCode());
                            }
                        } else {
                            log.error("{}条码不在erp数据库中！", wrkDetl.getMatnr());
                        }
                    }
                    for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
                        Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
                        if (!Cools.isEmpty(goods)) {
                            if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
                                log.error("{}条码在erp数据库中更新失败！", goods.getBarCode());
                            }
                        } else {
                            log.error("{}条码不在erp数据库中！", wrkDetl.getMatnr());
                        }
                    }
                }

                // 出库 --------------------------------------------------------------------------------
            // 出库 --------------------------------------------------------------------------------
            } else if (wrkMast.getWrkSts() == 18) {
                if (!Cools.isEmpty(wrkDetls)) {
                    if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
                        exceptionHandle("生成手动出库单据[workNo={0}]失败", wrkMast.getWrkNo());
                    }
                }
                // 修改 erp Goods 表
                for (WrkDetl wrkDetl : wrkDetls) {
                    Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
                    if (!Cools.isEmpty(goods)) {
                        if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
                            log.error("{}条码在erp数据库中更新失败！", goods.getBarCode());
                        }
                    } else {
                        log.error("{}条码不在erp数据库中！", wrkDetl.getMatnr());
                    }
                }
                for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
                    Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
                    if (!Cools.isEmpty(goods)) {
                        if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
                            log.error("{}条码在erp数据库中更新失败！", goods.getBarCode());
                        }
                    } else {
                        log.error("{}条码不在erp数据库中！", wrkDetl.getMatnr());
                    }
                }
            }

            // 保存工作主档历史档