#

lty

3 天以前 3aab99bed6dd2b808645ee2e4744226f4c687168

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

@@ -1,13 +1,16 @@
package com.zy.asrs.task.handler;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.LocDetl;
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.asrs.utils.OrderInAndOutUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,6 +19,7 @@

import java.util.Iterator;
import java.util.List;
import java.util.Objects;

/**
 * Created by vincent on 2020/7/6
@@ -38,6 +42,12 @@
    private WaitPakinLogService waitPakinLogService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private ErpTokenService erpTokenService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private ApiLogService apiLogService;

    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
@@ -49,7 +59,12 @@
                while (iterator.hasNext()) {
                    WrkDetl wrkDetl = iterator.next();
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                        orderService.checkComplete(wrkDetl.getOrderNo());
//                        orderService.checkComplete(wrkDetl.getOrderNo());
                        if (wrkMast.getIoType() ==  1 || wrkMast.getIoType() == 8 ||  wrkMast.getIoType() == 54 ||  wrkMast.getIoType() == 104){
                            OrderInAndOutUtil.checkComplete(Boolean.TRUE,wrkDetl.getOrderNo());
                        } else {
                            OrderInAndOutUtil.checkComplete(Boolean.FALSE,wrkDetl.getOrderNo());
                        }
                        iterator.remove();
                    }
                }
@@ -61,29 +76,89 @@
                if (wrkMast.getIoType() == 1) {
                    // 入库通知单
                    if (!Cools.isEmpty(wrkMast.getBarcode())) {
                        String request = "{\"barcode\":\"" + wrkMast.getBarcode() + "\"}";
                        log.info("ERP入库上报请求: workNo={}, request={}", wrkMast.getWrkNo(), request);
                        JSONObject res = erpTokenService.stockIn(wrkMast.getBarcode());
                        log.info("ERP入库上报响应: workNo={}, response={}", wrkMast.getWrkNo(), res == null ? null : res.toJSONString());
                        apiLogService.save("erp.stockIn", "erpTokenService.stockIn", null, null, request,
                                res == null ? null : res.toJSONString(),
                                res != null && Boolean.TRUE.equals(res.getBoolean("success")));
                        if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
                            JSONObject data = res.getJSONObject("data");
                            String tlocation = data == null ? null : data.getString("tlocation");
                            if (!Cools.isEmpty(tlocation) && !Cools.isEmpty(wrkMast.getLocNo())) {
                                List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                                        .eq("loc_no", wrkMast.getLocNo()));
                                if (!Cools.isEmpty(detls)) {
                                    for (LocDetl detl : detls) {
                                        detl.setStandby1(tlocation);
                                        locDetlService.updateById(detl);
                                    }
                                }
                            }
                        }


                        // 保存入库通知档历史档
                        if (!waitPakinLogService.save(wrkMast.getBarcode())) {
                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
//                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                        // 删除入库通知档
                        if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
//                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
                    // 手动入库生成单据 【 上报三方平台 】
                    if (!Cools.isEmpty(wrkDetls)) {
                        if (!orderService.saveHandlerOrder(wrkMast, wrkDetls)) {
                            exceptionHandle("生成手动入库单据[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
//                    // 手动入库生成单据 【 上报三方平台 】
//                    if (!Cools.isEmpty(wrkDetls)) {
//                        if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
//                            exceptionHandle("生成手动入库单据[workNo={0}]失败", wrkMast.getWrkNo());
//                        }
//                    }
                // 拣料再入库
                } else if (wrkMast.getIoType() == 53) {

//                    if (!Cools.isEmpty(wrkDetls)) {
//                        if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
//                            exceptionHandle("生成手动出库单据[workNo={0}]失败", wrkMast.getWrkNo());
//                        }
//                    }
                }

            // 出库 --------------------------------------------------------------------------------
            } else if (wrkMast.getWrkSts() == 15) {
                if(wrkMast.getIsSuplus()!=null && wrkMast.getIsSuplus()==1 && wrkMast.getExitMk().equals("Y")){
                    List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo()));
                    WrkDetl wrkDetl = wrkDetls1.get(0);
                    String request = "{\"barcode\":\"" + wrkMast.getBarcode() + "\",\"anfme\":" + wrkDetl.getAnfme() + "}";
                    log.info("ERP退料上报请求: workNo={}, request={}", wrkMast.getWrkNo(), request);
                    JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),wrkDetl.getAnfme(),null);
                    log.info("ERP退料上报响应: workNo={}, response={}", wrkMast.getWrkNo(), res == null ? null : res.toJSONString());
                    apiLogService.save("erp.stockBack", "erpTokenService.stockBack", null, null, request,
                            res == null ? null : res.toJSONString(),
                            res != null && Boolean.TRUE.equals(res.getBoolean("success")));
                    if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {

                    }
                }else if(Objects.isNull(wrkMast.getLocNo())){
                    String request = "{\"barcode\":\"" + wrkMast.getBarcode() + "\"}";
                    log.info("ERP出库上报请求: workNo={}, request={}", wrkMast.getWrkNo(), request);
                    JSONObject res = erpTokenService.stockOut(wrkMast.getBarcode(),null);
                    log.info("ERP出库上报响应: workNo={}, response={}", wrkMast.getWrkNo(), res == null ? null : res.toJSONString());
                    apiLogService.save("erp.stockOut", "erpTokenService.stockOut", null, null, request,
                            res == null ? null : res.toJSONString(),
                            res != null && Boolean.TRUE.equals(res.getBoolean("success")));
                    if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {

                    }
                }
                
//                if (!Objects.isNull(wrkMast.getWrkCode())) {
//                    return FAIL;
//                }
//                if (!Cools.isEmpty(wrkDetls)) {
//                    if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
//                        exceptionHandle("生成手动出库单据[workNo={0}]失败", wrkMast.getWrkNo());
//                    }
//                }
            }

            // 保存工作主档历史档