#

luxiaotao1123

2022-04-01 1b13c69e4e2bb00bea4e90232a78715d49f1e24f

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

@@ -9,23 +9,16 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.model.BillDto;
import com.zy.common.model.MatnrDto;
import com.zy.common.service.ErpService;
import com.zy.common.service.wms.ReplenishDto;
import com.zy.common.service.wms.Result;
import com.zy.common.service.wms.WmsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.ArrayList;
import java.util.List;

/**
 * Created by vincent on 2020/7/6
 */
@Slf4j
@Service
public class WorkLogHandler extends AbstractHandler<String> {

@@ -42,42 +35,19 @@
    @Autowired
    private WaitPakinLogService waitPakinLogService;
    @Autowired
    private ErpService erpService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private WmsService wmsService;
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;

    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
        try {

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

                // 全板入库
                if (wrkMast.getIoType() == 1) {
                    String docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
                    // 上报给erp
                    List<MatnrDto> matnrDtos = new ArrayList<>();
                    List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                    for (WrkDetl wrkDetl : wrkDetls) {
                        MatnrDto dto = new MatnrDto();
                        dto.setMatnr(wrkDetl.getMatnr());
                        dto.setCount(wrkDetl.getAnfme());
                        matnrDtos.add(dto);
                    }
                    List<BillDto> dtos = new ArrayList<>();
                    for (MatnrDto dto : matnrDtos) {
                        BillDto billDto = new BillDto();
                        billDto.setMatnr(dto.getMatnr());
                        billDto.setQty(dto.getCount());
                        dtos.add(billDto);
                    }
                    if (!erpService.uploadBill(dtos, 34, docNum)) {
                        exceptionHandle("无法上报至erp[workNo={0}]失败", wrkMast.getWrkNo());
                    }

                    // 入库通知单
                    if (!Cools.isEmpty(wrkMast.getBarcode())) {
                        // 保存入库通知档历史档
@@ -91,44 +61,20 @@
                    }
                // 拣料再入库
                } else if (wrkMast.getIoType() == 53) {
                    // 非销售订单出库，需要补货到平仓
                    if (!wrkMast.getPdcType().equals("Y")) {
                        List<ReplenishDto> replenishDtos = new ArrayList<>();
                        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                        for (WrkDetl wrkDetl : wrkDetls) {
                            ReplenishDto param = new ReplenishDto();
                            param.setMatnr(wrkDetl.getMatnr());
                            param.setCount(wrkDetl.getAnfme());
                            replenishDtos.add(param);
                        }
                        Result result = wmsService.replenish(replenishDtos);
                        if (result.getCode() != 200) {
                            exceptionHandle("补货到平仓[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }

                }

            // 出库
            // 出库 --------------------------------------------------------------------------------
            } else if (wrkMast.getWrkSts() == 15) {
                // 非销售订单出库，需要补货到平仓
                if (!wrkMast.getPdcType().equals("Y")) {
                    List<ReplenishDto> replenishDtos = new ArrayList<>();
                    List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                    for (WrkDetl wrkDetl : wrkDetls) {
                        ReplenishDto param = new ReplenishDto();
                        param.setMatnr(wrkDetl.getMatnr());
                        param.setCount(wrkDetl.getAnfme());
                        replenishDtos.add(param);
                    }
                    Result result = wmsService.replenish(replenishDtos);
                    if (result.getCode() != 200) {
                        exceptionHandle("补货到平仓[workNo={0}]失败", wrkMast.getWrkNo());
                    }
                }

            }


            // 修改订单状态 作业中 ===>> 已完成
            for (WrkDetl wrkDetl : wrkDetlService.selectByWrkNo(wrkMast.getWrkNo())) {
                if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                    orderService.checkComplete(wrkDetl.getOrderNo());
                }
            }

            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
@@ -147,6 +93,7 @@
//                exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
            }
        } catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());