工作历史档可搜索返修品

pang.jiabao

2024-12-21 7a3227174bde55918aef6f411489d0dd24c3b129

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -1,5 +1,6 @@
package com.zy.asrs.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -14,6 +15,8 @@
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.entity.result.ZphjcdgzVo;
import com.zy.asrs.entity.result.ZphjcdwcVo;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.mapper.MatMapper;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
@@ -25,11 +28,14 @@
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.NodeUtils;
import com.zy.system.entity.Config;
import com.zy.system.mapper.ConfigMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

@@ -39,6 +45,14 @@
@Slf4j
@Service
public class OpenServiceImpl implements OpenService {

    // 二楼堆垛机对应入库站点
    private static final int[] secondFloorIn = new int[]{0,2061,2064,2067,2070,2073,2076};
    // 堆垛机对应一楼出库站点
    private static final int[] secondFloorOut = new int[]{0,3002,3003,3006,3008,3009,3012};
    // 堆垛机对应一楼入库站点
    private static final int[] oneFloorIn = new int[]{0,3001,3004,3005,3007,3010,3011};


    @Autowired
    private OrderService orderService;
@@ -84,6 +98,15 @@
    private LocMastService locMastService;
    @Autowired
    private ApiLogService apiLogService;

    @Resource
    private MatMapper matMapper;

    @Resource
    private LocDetlMapper locDetlMapper;

    @Resource
    private ConfigMapper configMapper;

    @Override
    @Transactional
@@ -986,31 +1009,62 @@
    }

    @Override
    public void updateBarcode() {
        List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D"));
        for (int i = 0; i < locMasts.size(); i ++) {
            LocMast locMast = locMasts.get(i);
            locMast.setBarcode("a"+i);
            locMastService.updateById(locMast);
        }
        System.out.println("更新完了" + locMasts.size());
    }

    @Override
    @Transactional
    public R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {

        if (Cools.isEmpty(param)) {
            throw new CoolException("请求参数有误：" + param);
    public void prodCheck(List<ProdCheckParam> param) {
        if (param.isEmpty()) {
            throw new CoolException("请求参数不能为空");
        }
        int zpalletCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        if (zpalletCount > 0) {
            throw new CoolException("库存托盘码已存在：" + param.getBarcode());
        }
        for (ProdCheckParam checkParam : param) {
            // 更新库存明细是否合格
            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("brand", checkParam.getPackageGroupNo())
                    .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo()));
            // 更新商品表是否合格
            Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("brand", checkParam.getPackageGroupNo())
                    .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo()));
            if (locDetl == null || mat == null) {
                throw new CoolException("更新是否合格物料不存在：" + checkParam);
            }

        int barcodeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        if (barcodeCount > 0) {
            throw new CoolException("工作档已存在该托盘码：" + param.getBarcode());
            locDetl.setThreeCode(checkParam.getQualified());
            mat.setThreeCode(checkParam.getQualified());

            locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("brand", checkParam.getPackageGroupNo())
                    .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo()));
            matService.update(mat,(new EntityWrapper<Mat>().eq("brand", checkParam.getPackageGroupNo())
                    .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo())));
        }
    }

    @Override
    @Transactional
    public String fxprk(FxprkParam param) {

        // 根据包装组号获取到木箱卷信息
        List<Mat> list = matService.selectList(new EntityWrapper<Mat>().in("brand", param.getBoxList().stream().map(FxprkParam.Box::getPackageGroupNo).collect(Collectors.toList())));
        if (list.isEmpty()) {
            throw new CoolException("没有查询到该包装组号信息：" + param.getBoxList().toString());
        }

        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short)1);

        // 根据源站点寻找库位
//        StartupDto dto = commonService.getLocNo(1, 1, param.getPalletizingNo(), null,null,null, locTypeDto);
        StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto);
        locTypeDto.setLocType1((short) 1);
        StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto, 0);

        // 返回GWCS目标信息
        pushStaNoToGwcs(param.getPalletizingNo(),dto.getStaNo(),dto.getWorkNo());
        pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(),"一楼反修品入库推送gwcs");
//        if (!result) {
//            throw new CoolException("入库回推入库码头给GWCS失败");
//        }

        int workNo = dto.getWorkNo();
        Date now = new Date();
@@ -1040,46 +1094,232 @@
            throw new CoolException("保存工作档失败");
        }

        List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
        for (GwmsGenerateInventoryDto.MatList obj :matList) {
        for (Mat obj : list) {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(obj);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            obj.getRolls().forEach(roll -> {
                Mat mat = matService.selectByMatnr(roll.getSpecs());
                if (mat == null) {
                    mat = new Mat();
                    mat.setTagId(6L);
                    mat.setMatnr(roll.getSpecs());
                    mat.setMaktx(roll.getSpecs());
                    mat.setSpecs(roll.getSpecs());
                    mat.setStatus(1);
                    mat.setCreateTime(now);
                    mat.setUpdateTime(now);
                    if (!matService.insert(mat)) {
                        throw new CoolException("物料导入失败！");
            wrkDetl.setAnfme(1.0);
            // 重新定位木箱位置
            for (FxprkParam.Box box :param.getBoxList()) {
                if (box.getPackageGroupNo().equals(obj.getBrand())) {
                    if (!box.getBoxPos().equals(obj.getOrigin())) {
                        wrkDetl.setOrigin(box.getBoxPos());
                        wrkDetl.setZpallet(param.getBarcode());
                        wrkDetl.setBarcode(param.getBarcode());
                        matMapper.updateBoxPos(box.getPackageGroupNo(), box.getBoxPos(),param.getBarcode());
                    }
                    break;
                }
                wrkDetl.setWrkNo(wrkMast.getWrkNo());
                wrkDetl.setMatnr(roll.getSpecs()); // 规格
                wrkDetl.setMaktx(roll.getSpecs()); //规格
                wrkDetl.setBatch(roll.getBoxNo()); // 箱号
                wrkDetl.setModel(roll.getRollNo()); // 卷号
                wrkDetl.setBrand(""); // 木箱类型
                wrkDetl.setZpallet(param.getBarcode()); // 托盘吗
                wrkDetl.setOrigin(obj.getBoxPos()); // 木箱在托盘位置
                wrkDetl.setWeight(roll.getNetWeight()); // 净重
                wrkDetl.setVolume(roll.getGrossWeight()); // 毛重
                wrkDetl.setPrice(roll.getLength());
                wrkDetl.setSpecs(String.valueOf(roll.getSplices()));
                wrkDetl.setAnfme(1.0);
                wrkDetl.setIoTime(now);
                wrkDetl.setAppeTime(now);
                wrkDetl.setModiTime(now);
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作明细失败");
                }
            });
            }
            wrkDetl.setIoTime(now);
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
        }

        // 更新目标库位状态
        LocMast locMast = locMastService.selectById(dto.getLocNo());
        if (locMast.getLocSts().equals("O")) {
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
        return "入库成功";
    }

    @Override
    @Transactional
    public R kthl(KthlParam param) {

        // 获取模式为电脑模式，无任务的堆垛机列表:防止分配到堆垛机不可用
        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts",3)
                .eq("wrk_no",0).eq("in_enable","Y").eq("out_enable","Y"));
        if (basCrnps.isEmpty()) {
            // 都有任务则获取电脑模式的堆垛机列表
            basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts",3).eq("in_enable","Y")
                    .eq("out_enable","Y"));
        }
        if (basCrnps.isEmpty()) {
            throw new CoolException("没有可用堆垛机,堆垛机停止或异常或禁用");
        }
        // 可用堆垛机列表
        List<Integer> crnNoList = basCrnps.stream().map(BasCrnp::getCrnNo).collect(Collectors.toList());
        Integer crnNo = crnNoList.get(0);

        int workNo = commonService.getWorkNo(5);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(1L); //
        wrkMast.setIoType(3); // 站到站
        wrkMast.setIoPri(14D); // 优先级
        wrkMast.setCrnNo(crnNo);
        wrkMast.setSourceStaNo(secondFloorIn[crnNo]);
        wrkMast.setStaNo(secondFloorOut[crnNo]);
        wrkMast.setLocNo("");
        wrkMast.setBarcode(param.getBarcode()); // 托盘码
        wrkMast.setFullPlt("N"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setCtnType(1); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }
        // 返回GWCS目标信息
        pushStaNoToGwcs(param.getPalletizingNo(),wrkMast.getSourceStaNo(),workNo,param.getBarcode(),"二楼空托回流推送gwcs");

        return R.ok("空托回流请求成功");
    }

    @Override
    public R tb(TbParam param) {
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("barcode", param.getBarcode()));
        if (wrkDetls.isEmpty()) {
            return R.parse("无物料明细信息");
        }
        List<String> collect = wrkDetls.stream().map(WrkDetl::getUnit).distinct().collect(Collectors.toList());
        return R.ok(collect);
    }

    @Override
    public R dd(TbParam param) {
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("barcode", param.getBarcode()));
        if (wrkDetls.isEmpty()) {
            return R.parse("无物料明细信息");
        }
        List<DdParam> collect = wrkDetls.stream().map(wrkDetl -> {
            DdParam ddParam = new DdParam();
            ddParam.setBoxPos(wrkDetl.getOrigin());
            ddParam.setBoxType(wrkDetl.getColor());
            return ddParam;
        }).distinct().collect(Collectors.toList());

        return R.ok(collect);
    }

    @Override
    @Transactional
    public R gwmsGenerateInventory(GwmsGenerateInventoryDto param) {

        if (Cools.isEmpty(param)) {
            throw new CoolException("请求参数有误：" + param);
        }
        if (!Cools.isEmpty(param.getBarcode())) {
            int zpalletCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
            if (zpalletCount > 0) {
                throw new CoolException("库存托盘码已存在：" + param.getBarcode());
            }

            int barcodeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
            if (barcodeCount > 0) {
                throw new CoolException("工作档已存在该托盘码：" + param.getBarcode());
            }
        }
        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short)1);
        int iotype = 1;
        if (Cools.isEmpty(param.getMatList())) {
            iotype = 10;
        }
        // 根据源站点寻找库位
//        StartupDto dto = commonService.getLocNo(1, 1, param.getPalletizingNo(), null,null,null, locTypeDto);
        StartupDto dto = commonService.getLocNo(iotype, param.getPalletizingNo(), locTypeDto,0);

        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setWhsType(iotype == 1 && param.getPalletizingNo() == 2051 ? 1 : 0); // 返修入库标记
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(1L); // 工作状态：设备上走
        wrkMast.setIoType(iotype); // 入出库状态：1.入库
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(param.getPalletizingNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setBarcode(param.getBarcode()); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setCtnType(1); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }

        if (!Cools.isEmpty(param.getMatList())) {
            List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
            for (GwmsGenerateInventoryDto.MatList obj :matList) {
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.setWrkNo(wrkMast.getWrkNo());
                obj.getRolls().forEach(roll -> {
                    wrkDetl.setWrkNo(wrkMast.getWrkNo());
                    wrkDetl.setMatnr(roll.getSpecs()); // 规格
                    wrkDetl.setMaktx(roll.getSpecs()); //规格
                    wrkDetl.setUnit(roll.getBoxNo()); // 箱号
                    wrkDetl.setModel(roll.getRollNo()); // 卷号
                    wrkDetl.setBrand(obj.getPackageGroupNo()); // 包装组号
                    wrkDetl.setZpallet(param.getBarcode()); // 托盘码
                    wrkDetl.setBarcode(param.getBarcode());
                    wrkDetl.setOrigin(obj.getBoxPos()); // 木箱在托盘位置
                    wrkDetl.setColor(obj.getBoxType()); // 木箱类型
                    wrkDetl.setManu(obj.getRollType()); // 管芯类型
                    wrkDetl.setSku(obj.getWideInWidth()); // 实测宽幅
                    wrkDetl.setItemNum(obj.getThickness()); // 生箔厚度
                    wrkDetl.setManuDate(roll.getFqTime()); // 分切下料时间
                    wrkDetl.setWeight(roll.getNetWeight()); // 净重
                    wrkDetl.setVolume(roll.getGrossWeight()); // 毛重
                    wrkDetl.setLength(roll.getLength()); // 长度
                    wrkDetl.setSpecs(String.valueOf(roll.getSplices())); // 接头
                    wrkDetl.setAnfme(1.0);
//                    wrkDetl.setThreeCode(null); // 通过mes或excel导入检测是否合格 0不合格，1 合格
//                    wrkDetl.setDeadWarn(); // 理货标识 0默认，1理货中，2理货完成w
//                    wrkDetl.setInspect(); // 订单明细中用，标识备货的状态 0未备货，1备货中，2备货完成
//                    wrkDetl.setDanger(); // 订单明细中用，标识跨巷道移库 0未移库，1移库中，2移库完成
                    wrkDetl.setIoTime(now);
                    wrkDetl.setAppeTime(now);
                    wrkDetl.setAppeUser(21L); // root
                    wrkDetl.setModiUser(21L); // root
                    wrkDetl.setModiTime(now);
                    if (!wrkDetlService.insert(wrkDetl)) {
                        throw new CoolException("保存工作明细失败");
                    }

                    // 物料表备份一份
//                    Mat mat = new Mat();
//                    mat.sync(wrkDetl);
//                    mat.setTagId(6L);
//                    mat.setCreateTime(now);
//                    mat.setUpdateTime(now);
//                    if (!matService.insert(mat)) {
//                        throw new CoolException("备份物料表失败");
//                    }

                });
            }
        }


        // 更新目标库位状态
        LocMast locMast = locMastService.selectById(dto.getLocNo());
@@ -1092,6 +1332,10 @@
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
        }

        // 返回GWCS目标信息
        pushStaNoToGwcs(param.getPalletizingNo(),dto.getStaNo(),dto.getWorkNo(),param.getBarcode(),"gwms申请入库后推送gwcs");

        return null;
    }

@@ -1108,6 +1352,13 @@
        }

        wrkMast.setWrkSts(2L);
        if(wrkMast.getIoType() == 10){
            wrkMast.setBarcode(param.getBarcode());
        } else if(wrkMast.getIoType() == 12) { // 跨巷道转移入库

        } else if(wrkMast.getSourceStaNo() == 3046 || wrkMast.getSourceStaNo() == 3042) {
            wrkMast.setBarcode(param.getBarcode());
        }
        wrkMastService.updateById(wrkMast);

        return "请求成功";
@@ -1115,7 +1366,7 @@

    @Override
    @Transactional
    public String zwmsOutLocWork(ZwmsOutLocWorkDto param) {
    public R zwmsOutLocWork(ZwmsOutLocWorkDto param) {

        Order order = orderService.selectByNo(param.getOrderNo());
        if (!Cools.isEmpty(order)) {
@@ -1123,7 +1374,11 @@
        }

        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
        if (docType == null) {
            return R.parse("单据类型不存在，请检查：" + param.getOrderType());
        }
        Date now = new Date();

        // 单据主档
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
@@ -1161,38 +1416,16 @@
                now,    // 修改时间
                null    // 备注
        );

        if (!orderService.insert(order)) {
            throw new CoolException("生成单据主档失败，请联系管理员");
        }

        // 单据明细档
        List<DetlDto> list = new ArrayList<>();
        List<ZwmsOutLocWorkDto.Rolls> orderDetails = param.getMatDetails();
        for (ZwmsOutLocWorkDto.Rolls detail : orderDetails) {
            DetlDto dto = new DetlDto(detail.getRollNo(), detail.getBoxNo(), 1.0);
            dto.setOrderNo(detail.getSpecs());
            dto.setSplices(detail.getSplices());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                assert detlDto != null;
                detlDto.setAnfme(detlDto.getAnfme() + 1);
            } else {
                list.add(dto);
            }
        }
        for (DetlDto detlDto : list) {
//            Mat mat = matService.selectByMatnr(detlDto.getMatnr());
        for (String groupNo : param.getGroups()) {
            OrderDetl orderDetl = new OrderDetl();
//            if (Cools.isEmpty(mat)) {
//                throw new CoolException(detlDto.getMatnr() + "编号商品检索失败，请先添加商品");
//            } else {
//                orderDetl.sync(mat);
//            }
            orderDetl.setSpecs(String.valueOf(detlDto.getSplices()));
            orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch());
            orderDetl.setModel(detlDto.getMatnr());
            orderDetl.setMatnr(detlDto.getOrderNo());
            orderDetl.setMaktx(detlDto.getOrderNo());
            orderDetl.setAnfme(detlDto.getAnfme());
            orderDetl.setBrand(groupNo);
            orderDetl.setBatch("");
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setCreateBy(9527L);
@@ -1201,12 +1434,25 @@
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            orderDetl.setAnfme(1.0);
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
        }

        return null;
        return R.ok("单据生成成功");

    }

    @Override
    public R queryInLocTime(List<String> param) {
        if (Cools.isEmpty(param)) {
            return R.parse("参数不能为空");
        }

        List<InLocTimeDto> inLocTimeDtos = locDetlMapper.queryInLocTime(param);

        return R.ok(inLocTimeDtos);
    }

    @Override
@@ -1224,30 +1470,143 @@
            throw new CoolException("工作档当前状态不符合，任务号：" + param.getWorkNo() + "，工作档状态：" + wrkMast.getWrkSts());
        }

        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", param.getWorkNo()));

        // 是否需要复核(出库单需复核)
        boolean flag = false;
        if (!wrkDetls.isEmpty()) {
            flag = wrkDetls.stream().anyMatch(wrkDetl -> wrkDetl.getOrderNo() != null);
        }

        // 到达出库口确认为1，更新工作档状态为57.出库完成
        if (param.getOutLocResult() == 1) {
            wrkMast.setWrkSts(20L);
            // 空托盘到位直接更新工作档状态为14.已出库未确认，空托无需复核确认
            if (wrkMast.getIoType() == 110) {
//            wrkMast.setWrkSts(20L);
//            // 空托盘到位直接更新工作档状态为14.已出库未确认，空托无需复核确认
//            if (!flag || wrkMast.getIoType() == 110) {
                wrkMast.setWrkSts(14L);
            }
//            }
            wrkMastService.updateById(wrkMast);
        }

        // 出库上报推送mes记录
        ckjgsbPushMes(wrkMast,wrkDetls);

        return "出库结果上报成功";
    }

    private void ckjgsbPushMes(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
        GwmsGenerateInventoryDto gwmsGenerateInventoryDto = new GwmsGenerateInventoryDto();
        gwmsGenerateInventoryDto.setBarcode(wrkMast.getBarcode());
        gwmsGenerateInventoryDto.setPalletizingNo(wrkMast.getStaNo());
        List<GwmsGenerateInventoryDto.MatList> matLists = new ArrayList<>();
        for (WrkDetl wrkDetl:wrkDetls) {
            boolean flag = true;
            for (GwmsGenerateInventoryDto.MatList matList : matLists) {
                if (matList.getPackageGroupNo().equals(wrkDetl.getBrand())) {
                    matList.getRolls().add(new GwmsGenerateInventoryDto.Rolls(wrkDetl.getModel(),
                                    wrkDetl.getUnit(),wrkDetl.getMaktx(),wrkDetl.getLength(),
                                    Integer.parseInt(wrkDetl.getSpecs()),wrkDetl.getWeight(),wrkDetl.getVolume(),
                                    wrkDetl.getManuDate()));
                    flag = false;
                    break;
                }
            }
            if (flag) {
                GwmsGenerateInventoryDto.MatList matList = new GwmsGenerateInventoryDto.MatList();
                matList.setBoxPos(wrkDetl.getOrigin());
                matList.setPackageGroupNo(wrkDetl.getBrand());
                matList.setOutOrIn("out");
                matList.setStockType(wrkMast.getStaNo() == 2041 ? "返修出库" : "成品出库");
                matList.setBoxType(wrkDetl.getColor());
                matList.setRollType(wrkDetl.getManu());
                matList.setWideInWidth(wrkDetl.getSku());
                matList.setThickness(wrkDetl.getItemNum());
                List<GwmsGenerateInventoryDto.Rolls> rollsList = new ArrayList<>();
                GwmsGenerateInventoryDto.Rolls roll = new GwmsGenerateInventoryDto.Rolls(wrkDetl.getModel(),
                        wrkDetl.getUnit(),wrkDetl.getMaktx(),wrkDetl.getLength(),
                        Integer.parseInt(wrkDetl.getSpecs()),wrkDetl.getWeight(),wrkDetl.getVolume(),
                        wrkDetl.getManuDate());
                rollsList.add(roll);
                matList.setRolls(rollsList);
                matLists.add(matList);
            }
        }
       gwmsGenerateInventoryDto.setMatList(matLists);



        boolean success = false;
        // 获取请求头
        Map<String,Object> headers = new HashMap<>();
        headers.put("Content-Type","application/json;charset=UTF-8");

        // 构造请求体
        String body = JSON.toJSONString(gwmsGenerateInventoryDto);
        String response = "";
        try {
            response = new HttpHandler.Builder()
                    .setUri(MesConstant.MES_CC_IP_PORT)
                    .setPath(MesConstant.MES_CC_FXRK_URL)
                    .setHeaders(headers)
                    .setJson(body)
                    .build()
                    .doPost();
            if (!Cools.isEmpty(response)) {
                JSONObject jsonObject1 = JSONObject.parseObject(response);
                int code = (int) jsonObject1.get("code");
                boolean state  = jsonObject1.getBoolean("state");
                if (code == 200 && state) {
                    success = true;
                }
            } else {
                log.error("出库上报推送mes记录失败！！！url：{}；request：{}；response：{}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_FXRK_URL, body, response);
            }
        } catch (Exception e) {
            log.error("出库上报推送mes记录异常：{}", e.getMessage());
        } finally {
            try {
                // 保存接口日志
                apiLogService.save(
                        "出库上报推送mes记录",
                        MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_FXRK_URL,
                        null,
                        "127.0.0.1",
                        body,
                        response,
                        success
                );
            } catch (Exception e) {
                log.error("", e);
            }
        }
    }

    @Autowired
    private BasCrnpService basCrnpService;

    @Override
    @Transactional
    public String emptyOutLoc(GhjtApiParam param) {
//        3102/3009/3008/3006/3003/3002→3047/3112
        // 获取模式为电脑模式，无任务的堆垛机列表:防止分配到堆垛机不可用
        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts",3)
                .eq("wrk_no",0));
        if (basCrnps.isEmpty()) {
            // 都有任务则获取电脑模式的堆垛机列表
            basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts",3));
        }
        if (basCrnps.isEmpty()) {
            throw new CoolException("没有可用堆垛机,堆垛机停止或异常");
        }
        // 可用堆垛机列表
        List<Integer> crnNoList = basCrnps.stream().map(BasCrnp::getCrnNo).collect(Collectors.toList());
        // 寻找空托盘库位，先找浅库位
        List<LocMast> locMasts;
            locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","D")
                    .orderAsc(Arrays.asList("row1","lev1","bay1")).in("row1",3,4,6,7,10,11,14,15,18,19,22,23));
                    .orderAsc(Arrays.asList("row1","lev1","bay1")).in("crn_no",crnNoList).in("row1",3,4,6,7,10,11,14,15,18,19,22,23));
            if (locMasts.isEmpty()) {
                locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","D")
                        .orderAsc(Arrays.asList("row1","lev1","bay1")).in("row1",1,4,5,8,9,12,13,16,17,20,21,24));
                        .orderAsc(Arrays.asList("row1","lev1","bay1")).in("crn_no",crnNoList).in("row1",1,4,5,8,9,12,13,16,17,20,21,24));
            }

        if (locMasts.isEmpty()) {
@@ -1277,6 +1636,7 @@
        wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
        wrkMast.setCrnNo(locMast.getCrnNo());
        wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
        wrkMast.setBarcode(locMast.getBarcode());
        wrkMast.setFullPlt("N"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
@@ -1314,7 +1674,7 @@
        if (wrkMast == null) {
            throw new CoolException("工作档不存在！");
        }
        if (wrkMast.getWrkSts() != 2 || wrkMast.getIoType() != 103) {
        if (wrkMast.getWrkSts() != 2 || wrkMast.getIoType() != 103 && wrkMast.getIoType() != 109) {
            throw new CoolException("工作档当前状态不为2/出库类型不为拣料！");
        }
        // 更新工作档状态2.设备上走->42.等待码垛
@@ -1323,13 +1683,14 @@

        // 查询要拆的位置，只有一个
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        List<String> collect = wrkDetls.stream().map(WrkDetl::getOrigin).distinct().collect(Collectors.toList());
        String position = collect.get(0);
        WrkDetl wrkDetl = wrkDetls.get(0);

        // 返回拆垛规则
        ZphjcdgzVo zphjcdgzVo = new ZphjcdgzVo();
        zphjcdgzVo.setWorkNo(wrkMast.getWrkNo());
        zphjcdgzVo.setPosition(position);
        zphjcdgzVo.setWorkNo(wrkDetl.getWrkNo());
        zphjcdgzVo.setBoxType(wrkDetl.getColor());
        zphjcdgzVo.setPosition(wrkDetl.getOrigin());
        zphjcdgzVo.setCdType(wrkMast.getIoType() == 103 ? 1 : 2);

        return R.ok(zphjcdgzVo);
    }
@@ -1338,8 +1699,8 @@
    @Transactional
    public R zphjCdwc(ZphjcdwcParam param) {

        if (Cools.isEmpty(param.getWorkNo())) {
            throw new CoolException("工作号不能为空！");
        if (Cools.isEmpty(param.getWorkNo(),param.getSourceStaNo(),param.getSite(),param.getBarcode())) {
            return R.parse("参数不能为空，请检查入参");
        }
        WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
        if (wrkMast == null) {
@@ -1349,85 +1710,310 @@
            throw new CoolException("工作档当前状态不为42/出库类型不为拣料！");
        }

        // 获取出库物料
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));

        // 源库位
        LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());

        // 创建桁架理货出库的工作档
        int work = create111Work(wrkMast, wrkDetls, param.getSite(), wrkMast.getStaNo(), param.getBarcode());

        int descFlag = getType(wrkDetls);

        // 保存工作主档历史档
        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
            throw new CoolException("保存工作主档历史档失败");
        }
        // 获取目标站
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", wrkMast.getIoType() - 50)
                .eq("stn_no", wrkMast.getStaNo()) // 作业站点 = 拣料出库的目标站
                .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (Cools.isEmpty(staDesc)) {
            throw new CoolException("入库路径不存在");
        }
        // 堆垛机站点(目标站)
        Integer staNo = staDesc.getCrnStn();
        // 更新工作类型103->53
        wrkMast.setIoType(53);
        wrkMast.setWrkSts(52L); // 工作状态42->52.设备上走（拆垛完成）
        // 目标站点源站点转换
        wrkMast.setSourceStaNo(wrkMast.getStaNo());
        wrkMast.setStaNo(staNo);
        // 目标库位=源库位
        wrkMast.setLocNo(wrkMast.getSourceLocNo());
        // 源库位清除
        wrkMast.setSourceLocNo("");
        wrkMast.setModiTime(new Date());

        int outStaNo = 0; // 出库源站点
        if (staNo == 3044 || staNo == 3045) {
             outStaNo = 3046;
        } else if(staNo == 3040 || staNo == 3041) {
             outStaNo = 3042;
        // 获取备货区配置
        Config config = configMapper.selectConfigByCode("auto_stock_up");
        if (config == null) {
            throw new CoolException("理货获取备货区配置错误！！！");
        }
        if (outStaNo == 0) {
            throw new CoolException("出库源站点转换有误：" + staNo);
        }

        // 获取出库物料
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        int descFlag = getType(wrkDetls);
        // 前几列是备货区
        int columnNum = Integer.parseInt(config.getValue());

        // get0原托盘回流信息，get1拆垛出来物料出库信息
        List<ZphjcdwcVo> zphjcdwcVos = new ArrayList<>();

        ZphjcdwcVo zphjcdwcVo2 = new ZphjcdwcVo();
        zphjcdwcVo2.setWorkNo(work);
        zphjcdwcVo2.setSourceStaNo(param.getSite());
        zphjcdwcVo2.setStaNo(wrkMast.getStaNo());
        zphjcdwcVo2.setBarcode(param.getBarcode());
        zphjcdwcVo2.setDescFlag(descFlag);
        zphjcdwcVos.add(zphjcdwcVo2);

        // 如果从备货区来的，则不能回原库位
        if (locMast.getBay1() <= columnNum) {

            // 寻找一个新库位
            LocTypeDto locTypeDto = new LocTypeDto();
            locTypeDto.setLocType1((short) 1);
            StartupDto dto = commonService.getLocNo(53, param.getSourceStaNo(), locTypeDto, 0);
            // 新库位
            LocMast staLocMast = locMastService.selectById(dto.getLocNo());

            // 更新旧库位状态 O
            locMast.setLocSts("O");
            locMast.setBarcode("");
            locMast.setModiTime(new Date());
            locMastService.updateById(locMast);

            // 把旧库位明细转到新库位
            locDetlService.updateLocNo(staLocMast.getLocNo(), wrkMast.getSourceLocNo());

            // 更新新库位状态 Q
            staLocMast.setLocSts("Q");
            staLocMast.setBarcode(wrkMast.getBarcode());
            staLocMast.setModiTime(new Date());
            locMastService.updateById(staLocMast);

            // 更新工作工作主档
            wrkMast.setIoType(53);
            wrkMast.setWrkSts(52L); // 工作状态42->52.设备上走（拆垛完成）
            // 目标站点源站点转换
            wrkMast.setStaNo(dto.getStaNo());
            wrkMast.setSourceStaNo(dto.getSourceStaNo());
            wrkMast.setCrnNo(dto.getCrnNo());
            // 目标库位=源库位
            wrkMast.setLocNo(dto.getLocNo());
            // 源库位清除
            wrkMast.setSourceLocNo("");
            wrkMast.setModiTime(new Date());

        } else {
            // 更新工作工作主档
            wrkMast.setIoType(53);
            wrkMast.setWrkSts(52L); // 工作状态42->52.设备上走（拆垛完成）
            wrkMast.setSourceStaNo(param.getSourceStaNo());
            wrkMast.setStaNo(oneFloorIn[wrkMast.getCrnNo()]);
            // 源库位
            LocMast staLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
            // 目标库位=源库位
            wrkMast.setLocNo(wrkMast.getSourceLocNo());
            // 源库位清除
            wrkMast.setSourceLocNo("");
            wrkMast.setModiTime(new Date());

            // 更新新库位状态 Q
            staLocMast.setLocSts("Q");
            staLocMast.setModiTime(new Date());
            locMastService.updateById(staLocMast);
        }

        // 更新工作主档
        wrkMastService.updateById(wrkMast);

        // 回库
        ZphjcdwcVo zphjcdwcVo1 = new ZphjcdwcVo();
        zphjcdwcVo1.setWorkNo(wrkMast.getWrkNo());
        zphjcdwcVo1.setStaNo(wrkMast.getStaNo());
        zphjcdwcVo1.setSourceStaNo(wrkMast.getSourceStaNo());
        zphjcdwcVos.add(zphjcdwcVo1);

        ZphjcdwcVo zphjcdwcVo2 = new ZphjcdwcVo();
        zphjcdwcVo2.setSourceStaNo(outStaNo);
        zphjcdwcVo2.setStaNo(3106); // 3106/3077
        zphjcdwcVo2.setDescFlag(descFlag);
        zphjcdwcVos.add(zphjcdwcVo2);

        // 更新工作主档
        wrkMastService.updateById(wrkMast);
        // 修改库位状态 Q.拣料/盘点/并板再入库
        LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
        locMast.setLocSts("Q");
        locMast.setModiTime(new Date());
        if (!locMastService.updateById(locMast)) {
            throw new CoolException("修改库位状态失败");
        }
        zphjcdwcVo1.setBarcode(wrkMast.getBarcode());
        zphjcdwcVos.add(0,zphjcdwcVo1);

        // 下发回库的目标站点和拆垛的出库目标站点给gwcs
        return R.ok(zphjcdwcVos);
    }

    @Override
    public R kxlhCdwc(KxlhcdwcParam param) {

        if (Cools.isEmpty(param.getWorkNo(),param.getSourceStaNo(),param.getSite(),param.getBarcode())) {
            return R.parse("参数不能为空，请检查入参");
        }
        WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
        if (wrkMast == null) {
            throw new CoolException("工作档不存在！");
        }
        if (wrkMast.getWrkSts() != 42 || wrkMast.getIoType() != 109) {
            throw new CoolException("工作档当前状态不为42/出库类型不为空闲理货！");
        }

        Date now = new Date();

        // 获取出库物料
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));

        // 获取库存物料
        List<LocDetl> locDetls = locDetlMapper.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));

        // 源库位
        LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());

        List<ZphjcdwcVo> zphjcdwcVos = new ArrayList<>();

        if (wrkDetls.size() == locDetls.size()) { // 不需要回库，拆完后剩空托盘去叠盘机

            // 删除源库位库存明细
            locDetlMapper.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));

            // 修改源库位状态
            if (locMast.getLocSts().equals("R")) {
                locMast.setLocSts("O");
                locMast.setBarcode("");
                locMast.setSheetNo("0");
                locMast.setModiTime(now);
                locMast.setIoTime(now);
                locMastService.updateById(locMast);
            }

            // 修改工作主档状态
            wrkMast.setWrkSts(15L);
            wrkMast.setModiTime(now);
            wrkMastService.updateById(wrkMast);

            // 下发去叠盘位置
            ZphjcdwcVo zphjcdwcVo = new ZphjcdwcVo();
            zphjcdwcVo.setWorkNo(wrkMast.getWrkNo());
            zphjcdwcVo.setStaNo(3013);
            zphjcdwcVo.setSourceStaNo(param.getSourceStaNo());
            zphjcdwcVo.setBarcode(wrkMast.getBarcode());
            zphjcdwcVos.add(zphjcdwcVo);

        } else { // 拆完后还有物料，需要回库

            // 先删除库存明细，避免还未回库但组盘的先入库了
            for (WrkDetl wrkDetl : wrkDetls) {
                locDetlMapper.delete(new EntityWrapper<LocDetl>().eq("brand",wrkDetl.getBrand()));
            }

            // 修改工作主档
            wrkMast.setWrkSts(52L);
            wrkMast.setIoType(59);
            wrkMast.setSourceStaNo(wrkMast.getStaNo());
            wrkMast.setStaNo(oneFloorIn[wrkMast.getCrnNo()]);
            wrkMast.setLocNo(wrkMast.getSourceLocNo());
            wrkMast.setSourceLocNo("");
            wrkMast.setModiTime(now);
            wrkMastService.updateById(wrkMast);

            // 修改源库位状态
            if (locMast.getLocSts().equals("R")) {
                locMast.setLocSts("S");
                locMast.setModiTime(now);
                locMastService.updateById(locMast);
            }

            // 下发回库命令
            ZphjcdwcVo zphjcdwcVo = new ZphjcdwcVo();
            zphjcdwcVo.setWorkNo(wrkMast.getWrkNo());
            zphjcdwcVo.setStaNo(oneFloorIn[wrkMast.getCrnNo()]);
            zphjcdwcVo.setSourceStaNo(param.getSourceStaNo());
            zphjcdwcVo.setBarcode(wrkMast.getBarcode());
            zphjcdwcVos.add(zphjcdwcVo);
        }

        // 组盘点
        Integer site = param.getSite();

        // 判断组盘是否完成：两个到换盘站点的任务是否完成
        Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().eq("io_type", 109).ne("wrk_sts",15);
        if (site == 3046) {
            wrapper.in("sta_no",3045,3044);
        } else {
            wrapper.in("sta_no",3041,3040);
        }
        int count = wrkMastService.selectCount(wrapper);

        // 已经完成则下发组盘点入库命令
        if (count == 0) {
            // 获取到组盘点入库任务
            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_sts", 1).eq("io_type", 1).eq("source_sta_no", site));
            ZphjcdwcVo zphjcdwcVo = new ZphjcdwcVo();
            zphjcdwcVo.setWorkNo(wrkMast1.getWrkNo());
            zphjcdwcVo.setStaNo(wrkMast1.getStaNo());
            zphjcdwcVo.setSourceStaNo(site);
            zphjcdwcVo.setBarcode(param.getBarcode());
            zphjcdwcVos.add(zphjcdwcVo);
        }

        return R.ok(zphjcdwcVos);
    }

    @Override
    public R requestXhd(String barcode) {

        // 没有任务或者不是盘点任务的托盘经过则返回-1，忽略
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
        if (wrkMast == null || wrkMast.getIoType() != 107) {
            return R.ok(-1);
        }

        // 库存明细木箱位置集合
        List<LocDetl> locDetls = locDetlMapper.selectList(new EntityWrapper<LocDetl>().eq("zpallet", barcode));
        List<String> collect1 = locDetls.stream().map(LocDetl::getOrigin).distinct().collect(Collectors.toList());
        // 工作明细木箱位置集合
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
        List<String> collect2 = wrkDetls.stream().map(WrkDetl::getOrigin).distinct().collect(Collectors.toList());

        // 0明细异常,1亮左，2亮右，3都亮
        if (collect1.size() == 0 || collect2.size() == 0){
            return R.ok(0);
        } else if((collect1.size() == 1 && collect2.size() == 1) || (collect1.size() == 2 && collect2.size() == 2)) {
            return R.ok(3);
        } else if(collect1.size() == 2 && collect2.size() == 1) {
            return R.ok(collect2.get(0).equals("左") ? 1 : 2);
        } else {
            return R.parse("亮信号灯条码异常：" + barcode);
        }

    }

    /**
     * 创建桁架理货出库的工作档
     */
    private int create111Work(WrkMast wrk, List<WrkDetl> wrkDetls, Integer site, Integer staNo,String barcode) {
        int workNo = commonService.getWorkNo(4);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(2L); // 工作状态：设备上走
        wrkMast.setIoType(111); // 入出库状态：111.理货贴标出库
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setCrnNo(wrk.getCrnNo());
        wrkMast.setSourceStaNo(site);
        wrkMast.setStaNo(staNo);
        wrkMast.setSourceLocNo(wrk.getSourceLocNo());
        wrkMast.setBarcode(barcode); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setCtnType(1); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);

        // 插入工作档
        wrkMastService.insert(wrkMast);

        // 插入工作档明细
        for (WrkDetl wrkDetl:wrkDetls) {
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setBarcode(barcode);
            wrkDetl.setZpallet(barcode);
            wrkDetlService.insert(wrkDetl);
        }

        return workNo;
    }

    /**
     * 根据出库物料明细判断是否去贴标(单卷贴标，多卷不贴标)
     * @param wrkDetls 物料明细
     * @return 0.多卷不贴标路径，1.单卷贴标路径
     * @return 1.多卷直接出路径，4.单卷贴标路径
     */
    private int getType(List<WrkDetl> wrkDetls) {
        return wrkDetls.size() > 1 ? 0 : 1; // 一条记录就是一卷
        return wrkDetls.size() > 1 ? 1 : 4; // 一条记录就是一卷
    }

    public void pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo) {
    public boolean pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo,String barcode,String message) {
        boolean success = false;
        // 获取请求头
        Map<String, Object> headers = getHeaders();
@@ -1437,6 +2023,7 @@
        jsonObject.put("workNo", workNo);
        jsonObject.put("staNo", staNo);
        jsonObject.put("sourceStaNo", palletizingNo);
        jsonObject.put("barcode", barcode);
        String body = jsonObject.toJSONString();
        String response = "";
        try {
@@ -1449,23 +2036,16 @@
                    .doPost();
            if (!Cools.isEmpty(response)) {
                success = true;
//                // 修改订单状态 4.完成 ===>> 6.已上报
//                if (!orderService.updateSettle(order.getId(), 6L, null)) {
//                    throw new CoolException("服务器内部错误，请联系管理员");
//                }
            } else {
                log.error("zmws推送入库码头站点接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.PAKIN_URL, body, response);
                throw new CoolException("上报mes系统失败");
                log.error(message + "失败！！！url：{}；request：{}；response：{}", MesConstant.GWCS_IP_PORT + MesConstant.GWCS_FPKW_URL, body, response);
            }
        } catch (Exception e) {
            log.error("入库请求接口失败：{}", e.getMessage());
//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//            return FAIL.setMsg(e.getMessage());
            log.error(message + "异常：{}", e);
        } finally {
            try {
                // 保存接口日志
                apiLogService.save(
                        "入库",
                        message,
                        MesConstant.GWCS_IP_PORT + MesConstant.GWCS_FPKW_URL,
                        null,
                        "127.0.0.1",
@@ -1477,6 +2057,7 @@
                log.error("", e);
            }
        }
        return success;
    }

    Map<String, Object> getHeaders(){