#

18516761980

2023-03-09 da3070daffbbe2ac420b2a4077c890dbf65d2557

#

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

@@ -3,14 +3,13 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.model.OrderDto;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.entity.Goods;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,13 +37,11 @@
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private WaitPakinLogService waitPakinLogService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private ErpService erpService;
    @Autowired
    private DocTypeService docTypeService;

    // update asr_wrk_mast set inv_wh = 'Y', ove_mk = 'Y' where wrk_no =
    @Transactional
@@ -66,50 +63,23 @@

            // 入库 --------------------------------------------------------------------------------
            if (wrkMast.getWrkSts() == 10) {

                // 全板入库
                if (wrkMast.getIoType() == 1) {

                    // 【 上报三方平台 】
                    // 入库通知单
                    if (!Cools.isEmpty(wrkMast.getBarcode())) {
                        // 保存入库通知档历史档
                        if (!waitPakinLogService.save(wrkMast.getBarcode())) {
                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                        // 删除入库通知档
                        if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
                    // 手动入库生成单据 【 上报三方平台 】
                    if (!Cools.isEmpty(wrkDetls)) {
                        for (WrkDetl wrkDetl : wrkDetls) {
                            // Goods 表
                            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.getBatch());
                            }
                            // OrderDetl 表
                            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.getBatch());
                                    }
                                }
                                // Order 表
                                if (order.getSettle() < 3L) {
                                    List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
                                    boolean complete = true;
                                    for (OrderDetl detl : orderDetls) {
                                        if (detl.getAnfme() > detl.getQty()) {
                                            complete = false;
                                            break;
                                        }
                                    }
                                    if (complete) {
                                        if (!orderService.updateSettle(order.getId(), 4L, null)) {
                                            throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
                                        }
                                    }
                                }
                            }
                        if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
                            exceptionHandle("生成手动入库单据[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
                // 拣料再入库
@@ -119,27 +89,6 @@
                            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());
                        }
                    }
                }

            // 出库 --------------------------------------------------------------------------------
@@ -147,27 +96,6 @@
                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());
                    }
                }
            }
@@ -190,7 +118,7 @@
            }
            // 修改订单状态 作业中 ===>> 已完成
            for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
                if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
                if (BaseController.isJSON(wrkDetl.getOrderNo())) {
                    orderService.checkComplete(wrkDetl.getOrderNo());
                } else {
                    // 订单合并出库