Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

zhang

2025-07-15 641f7bb8b2d2e23f1f5192fecf030a567151c7b5

 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,9 +15,7 @@
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.mapper.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.constant.MesConstant;
@@ -36,6 +35,7 @@

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

/**
@@ -46,11 +46,11 @@
public class OpenServiceImpl implements OpenService {

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


    @Autowired
@@ -106,6 +106,12 @@

    @Resource
    private ConfigMapper configMapper;

    @Resource
    private OrderMapper orderMapper;

    @Resource
    private BasCrnpMapper basCrnpMapper;

    @Override
    @Transactional
@@ -496,12 +502,12 @@
    @Override
    @Transactional
    public void syncMat(MatSyncParam param) {
        if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
        if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
            throw new CoolException("商品数据为空");
        }

        for(MatSyncParam.MatParam matParam : param.getMatDetails()){
            if(Cools.isEmpty(matParam.getMatnr())){
        for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
            if (Cools.isEmpty(matParam.getMatnr())) {
                throw new CoolException("商品编码不能为空");
            }

@@ -594,7 +600,7 @@
                }
            } else {
                mat.sync(param);
                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
                    throw new CoolException("更新已存在商品信息失败，请联系管理员");
                }
            }
@@ -610,29 +616,29 @@
     * */
    @Override
    @Transactional
    public LabellerMatParam labellerMat(LabellerMatParam param){
        if (Cools.isEmpty(param.getDevNo())){
    public LabellerMatParam labellerMat(LabellerMatParam param) {
        if (Cools.isEmpty(param.getDevNo())) {
            throw new CoolException("参数：站点号 devNo为空");
        }else if (Cools.isEmpty(param.getLabNo())){
        } else if (Cools.isEmpty(param.getLabNo())) {
            throw new CoolException("参数：贴标机号 labNo为空");
        }
        BasDevp basDevp = basDevpService.selectById(param.getDevNo());
        if (Cools.isEmpty(basDevp)){
        if (Cools.isEmpty(basDevp)) {
            throw new CoolException("参数：站点号 devNo不存在");
        }else if (Cools.isEmpty(basDevp.getWrkNo()) || basDevp.getWrkNo()==0){
            throw new CoolException("站点:"+param.getDevNo()+" 不存在工作中任务");
        } else if (Cools.isEmpty(basDevp.getWrkNo()) || basDevp.getWrkNo() == 0) {
            throw new CoolException("站点:" + param.getDevNo() + " 不存在工作中任务");
        }

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException("站点:"+param.getDevNo()+" 工作中任务不存在,任务号："+basDevp.getWrkNo());
        }else if (!wrkMast.getWrkSts().equals(52L)){
            throw new CoolException("站点:"+param.getDevNo()+" 工作中任务状态已变更，请勿重复申请,任务号："+basDevp.getWrkNo()+",任务状态:"+wrkMast.getWrkSts$());
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException("站点:" + param.getDevNo() + " 工作中任务不存在,任务号：" + basDevp.getWrkNo());
        } else if (!wrkMast.getWrkSts().equals(52L)) {
            throw new CoolException("站点:" + param.getDevNo() + " 工作中任务状态已变更，请勿重复申请,任务号：" + basDevp.getWrkNo() + ",任务状态:" + wrkMast.getWrkSts$());
        }

        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", basDevp.getWrkNo()));
        if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
            throw new CoolException("站点:"+param.getDevNo()+" 工作中任务不存在任务明细,任务号："+basDevp.getWrkNo());
        if (Cools.isEmpty(wrkDetls) || wrkDetls.size() == 0) {
            throw new CoolException("站点:" + param.getDevNo() + " 工作中任务不存在任务明细,任务号：" + basDevp.getWrkNo());
        }

        LabellerMatParam labellerMatParam = new LabellerMatParam();
@@ -643,7 +649,7 @@
        ArrayList<LabellerMatParam.BoxNo> boxNos = new ArrayList<>();
//        String orderNo = "";

        for (WrkDetl wrkDetl:wrkDetls){
        for (WrkDetl wrkDetl : wrkDetls) {
            LabellerMatParam.BoxNo boxNo = new LabellerMatParam.BoxNo();
            boxNo.setBoxNo(wrkDetl.getBatch());
            boxNos.add(boxNo);
@@ -661,56 +667,56 @@
//        labellerMatParam.setLabTemplate("1");
//        labellerMatParam.setOrderNo(orderNo);
        wrkMast.setWrkSts(53L);
        if (!wrkMastService.updateById(wrkMast)){
        if (!wrkMastService.updateById(wrkMast)) {
            throw new CoolException("异常，请重新申请");
        }
        return labellerMatParam;
    }

    /*
    * 贴标机贴标完成
    * */
     * 贴标机贴标完成
     * */
    @Override
    @Transactional
    public void labellerComplete(LabellerCompleteParam param) {
        if (Cools.isEmpty(param.getDevNo())){
        if (Cools.isEmpty(param.getDevNo())) {
            throw new CoolException("参数：站点号 devNo为空");
        }else if (Cools.isEmpty(param.getLabNo())){
        } else if (Cools.isEmpty(param.getLabNo())) {
            throw new CoolException("参数：贴标机号 labNo为空");
        }else if (Cools.isEmpty(param.getLabResult())){
        } else if (Cools.isEmpty(param.getLabResult())) {
            throw new CoolException("参数：贴标结果 labResult为空");
        }else if (Cools.isEmpty(param.getWrkNo())){
        } else if (Cools.isEmpty(param.getWrkNo())) {
            throw new CoolException("参数：贴标任务号 wrkNo为空");
        }
        BasDevp basDevp = basDevpService.selectById(param.getDevNo());
        if (Cools.isEmpty(basDevp)){
            throw new CoolException("参数：站点号 devNo="+param.getDevNo()+"不存在");
        }else if (Cools.isEmpty(basDevp.getWrkNo()) || basDevp.getWrkNo()==0 ){
            throw new CoolException("站点:"+param.getDevNo()+" 不存在工作中任务");
        }else if(!basDevp.getWrkNo().toString().equals(param.getWrkNo())){
            throw new CoolException("站点:"+param.getDevNo()+" 进行中任务号="+basDevp.getWrkNo()+" 与贴标结果返回任务号="+param.getWrkNo()+" 不一致");
        if (Cools.isEmpty(basDevp)) {
            throw new CoolException("参数：站点号 devNo=" + param.getDevNo() + "不存在");
        } else if (Cools.isEmpty(basDevp.getWrkNo()) || basDevp.getWrkNo() == 0) {
            throw new CoolException("站点:" + param.getDevNo() + " 不存在工作中任务");
        } else if (!basDevp.getWrkNo().toString().equals(param.getWrkNo())) {
            throw new CoolException("站点:" + param.getDevNo() + " 进行中任务号=" + basDevp.getWrkNo() + " 与贴标结果返回任务号=" + param.getWrkNo() + " 不一致");
        }

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException("站点:"+param.getDevNo()+" 工作中任务不存在,任务号："+basDevp.getWrkNo());
        }else if (!wrkMast.getWrkSts().equals(53L)){
            throw new CoolException("站点:"+param.getDevNo()+" 工作中任务状态已变更，请勿重复申请,任务号："+basDevp.getWrkNo()+",任务状态:"+wrkMast.getWrkSts$());
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException("站点:" + param.getDevNo() + " 工作中任务不存在,任务号：" + basDevp.getWrkNo());
        } else if (!wrkMast.getWrkSts().equals(53L)) {
            throw new CoolException("站点:" + param.getDevNo() + " 工作中任务状态已变更，请勿重复申请,任务号：" + basDevp.getWrkNo() + ",任务状态:" + wrkMast.getWrkSts$());
        }

        if (param.getLabResult().equals("OK")){
        if (param.getLabResult().equals("OK")) {
            wrkMast.setWrkSts(54L);
            wrkMast.setStaNo(144);
            if (!wrkMastService.updateById(wrkMast)){
            if (!wrkMastService.updateById(wrkMast)) {
                throw new CoolException("异常，请重新申请");
            }
        }else if (param.getLabResult().equals("NG")){
        } else if (param.getLabResult().equals("NG")) {
            wrkMast.setWrkSts(52L);//重新贴标
            if (!wrkMastService.updateById(wrkMast)){
            if (!wrkMastService.updateById(wrkMast)) {
                throw new CoolException("异常，请重新申请");
            }
        }else {
            throw new CoolException("参数：贴标结果:labResult"+param.getLabResult()+";请按规则发送：成功：OK 、失败:NG");
        } else {
            throw new CoolException("参数：贴标结果:labResult" + param.getLabResult() + ";请按规则发送：成功：OK 、失败:NG");
        }

    }
@@ -723,13 +729,13 @@
    public void PalletizingCompleteTwoFloorParam(PalletizingCompleteTwoFloorParam param) {
        Long userId = 7777L;//中控
        //判断param参数
        if (Cools.isEmpty(param.getBarcode())){
        if (Cools.isEmpty(param.getBarcode())) {
            throw new CoolException("参数：托盘码 barcode为空");
        }else if (Cools.isEmpty(param.getPalletizingNo())){
        } else if (Cools.isEmpty(param.getPalletizingNo())) {
            throw new CoolException("参数：码垛位编号 palletizingNo为空");
        }else if (Cools.isEmpty(param.getBoxType())){
        } else if (Cools.isEmpty(param.getBoxType())) {
            throw new CoolException("参数：木箱类型 boxType为空");
        }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
        } else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size() == 0) {
            throw new CoolException("参数：物料明细 matLists为空");
        }

@@ -737,52 +743,52 @@
        String matnrTwo = "";//木箱相同位置 规格 matnr校验  2、右
        ArrayList<String> boxNos = new ArrayList<>();   //木箱唯一编码查重  （batch）
        //判断matLists参数
        for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
            if (Cools.isEmpty(matList.getMatnr())){
        for (PalletizingCompleteTwoFloorParam.MatList matList : param.getMatList()) {
            if (Cools.isEmpty(matList.getMatnr())) {
                throw new CoolException("参数：规格 matnr为空");
            }else if (Cools.isEmpty(matList.getPosition())){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：码垛位置 position为空");
            }else if (Cools.isEmpty(matList.getBatch())){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：木箱编号 batch为空");
            }else if (Cools.isEmpty(matList.getModel())){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：卷号 model为空");
            }else if (Cools.isEmpty(matList.getBatch())){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：木箱编号 boxNo为空");
            }else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：净重 weight为空");
            }else if (Cools.isEmpty(matList.getRoughWeight()) || matList.getRoughWeight().equals(0D)){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：毛重 roughWeight");
            }else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：卷长度 rollExtent");
            } else if (Cools.isEmpty(matList.getPosition())) {
                throw new CoolException("规格：" + matList.getMatnr() + "、参数：码垛位置 position为空");
            } else if (Cools.isEmpty(matList.getBatch())) {
                throw new CoolException("规格：" + matList.getMatnr() + "、参数：木箱编号 batch为空");
            } else if (Cools.isEmpty(matList.getModel())) {
                throw new CoolException("规格：" + matList.getMatnr() + "、参数：卷号 model为空");
            } else if (Cools.isEmpty(matList.getBatch())) {
                throw new CoolException("规格：" + matList.getMatnr() + "、参数：木箱编号 boxNo为空");
            } else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)) {
                throw new CoolException("规格：" + matList.getMatnr() + "、参数：净重 weight为空");
            } else if (Cools.isEmpty(matList.getRoughWeight()) || matList.getRoughWeight().equals(0D)) {
                throw new CoolException("规格：" + matList.getMatnr() + "、参数：毛重 roughWeight");
            } else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)) {
                throw new CoolException("规格：" + matList.getMatnr() + "、参数：卷长度 rollExtent");
            }
//            else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
//                throw new CoolException("规格："+matList.getMatnr()+"、参数：接头数 joint");
//            }

            if (matList.getPosition().equals("1")){//1、左  2、右
                if (!matnrOne.equals("")){
                    if (!matnrOne.equals(matList.getMatnr())){
                        throw new CoolException("木箱位置："+matList.getPosition()+"存在不同规格卷信息");
            if (matList.getPosition().equals("1")) {//1、左  2、右
                if (!matnrOne.equals("")) {
                    if (!matnrOne.equals(matList.getMatnr())) {
                        throw new CoolException("木箱位置：" + matList.getPosition() + "存在不同规格卷信息");
                    }
                }else {
                    matnrOne=matList.getMatnr();
                } else {
                    matnrOne = matList.getMatnr();
                }
            }else if (matList.getPosition().equals("2")){
                if (!matnrTwo.equals("")){
                    if (!matnrTwo.equals(matList.getMatnr())){
                        throw new CoolException("木箱位置："+matList.getPosition()+"存在不同规格卷信息");
            } else if (matList.getPosition().equals("2")) {
                if (!matnrTwo.equals("")) {
                    if (!matnrTwo.equals(matList.getMatnr())) {
                        throw new CoolException("木箱位置：" + matList.getPosition() + "存在不同规格卷信息");
                    }
                }else {
                    matnrTwo=matList.getMatnr();
                } else {
                    matnrTwo = matList.getMatnr();
                }
            }else {
                throw new CoolException("参数：木箱编号 boxNo:"+matList.getBatch()+",木箱位置错误："+matList.getPosition());
            } else {
                throw new CoolException("参数：木箱编号 boxNo:" + matList.getBatch() + ",木箱位置错误：" + matList.getPosition());
            }

            if (!boxNos.contains(matList.getBatch())){
            if (!boxNos.contains(matList.getBatch())) {
                boxNos.add(matList.getBatch());
            }else {
                throw new CoolException("参数：木箱编号 boxNo:"+matList.getBatch()+",木箱编码存在重复");
            } else {
                throw new CoolException("参数：木箱编号 boxNo:" + matList.getBatch() + ",木箱编码存在重复");
            }
        }

@@ -801,15 +807,15 @@
//        }


        if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()))!=0
            || wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()))!=0
            || waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()))!=0){
            throw new CoolException("托盘条码："+param.getBarcode()+"已存在，请勿重复组托");
        if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode())) != 0
                || wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode())) != 0
                || waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode())) != 0) {
            throw new CoolException("托盘条码：" + param.getBarcode() + "已存在，请勿重复组托");
        }


        Date now = new Date();
        for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
        for (PalletizingCompleteTwoFloorParam.MatList matList : param.getMatList()) {
            Mat mat = matService.selectByMatnr(matList.getMatnr());
            if (Cools.isEmpty(mat)) {
                mat = new Mat();
@@ -857,12 +863,12 @@
    @Transactional
    public void palletizingCompleteS(PalletizingCompleteParam param) {
        //判断param参数
        if (Cools.isEmpty(param.getBarcode())){
        if (Cools.isEmpty(param.getBarcode())) {
            throw new CoolException("参数：托盘码 barcode为空");
        }

        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
        if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()!=2){
        if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts() != 2) {
            log.error("退库码垛完成，返回托盘码未查询到工作档案！");
            throw new CoolException("参数：托盘码 barcode未查询到工作档案");
        }
@@ -877,11 +883,11 @@
    @Override
    @Transactional
    public void balconyComplete(LabellerMatParam param) {
        if (Cools.isEmpty(param.getWrkNo())){
        if (Cools.isEmpty(param.getWrkNo())) {
            throw new CoolException("工作号为空！");
        }
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getWrkNo()));
        if (Cools.isEmpty(wrkMast)){
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException("工作号为空！");
        }
        wrkMast.setWrkSts(57L);
@@ -896,34 +902,34 @@
    public void singleUnstackingComplete(SingleUnstackingCompleteParam param) {
        Long userId = 8888L;//桁架上位软件
        //判断param参数
        if (Cools.isEmpty(param.getPalletizingNo())){
        if (Cools.isEmpty(param.getPalletizingNo())) {
            throw new CoolException("参数：码垛位编号 palletizingNo为空");
        }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
        } else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size() == 0) {
            throw new CoolException("参数：物料明细 matLists为空");
        }

        ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>();
        ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
        //判断matLists参数
        for (SingleUnstackingCompleteParam.MatList matList:param.getMatList()){
            if (Cools.isEmpty(matList.getPosition())){
        for (SingleUnstackingCompleteParam.MatList matList : param.getMatList()) {
            if (Cools.isEmpty(matList.getPosition())) {
                throw new CoolException("参数：码垛位置 position为空");
            }else if (Cools.isEmpty(matList.getBoxNo())){
            } else if (Cools.isEmpty(matList.getBoxNo())) {
                throw new CoolException("参数：木箱编号 boxNo为空");
            }
            WrkDetlSingle wrkDetlSingleOne = wrkDetlSingleService.selectOne(new EntityWrapper<WrkDetlSingle>().eq("batch", matList.getBoxNo()));
            List<WrkDetlSingle> wrkDetlSingles = wrkDetlSingleService.selectList(new EntityWrapper<WrkDetlSingle>()
                    .eq("wrk_no", wrkDetlSingleOne.getWrkNo()).eq("io_time", wrkDetlSingleOne.getIoTime()));
            boolean sign=true;
            for (WrkDetlSingle wrkDetlSingle:wrkDetlSingles){
            boolean sign = true;
            for (WrkDetlSingle wrkDetlSingle : wrkDetlSingles) {
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.sync(wrkDetlSingle);
                wrkDetlsNew.add(wrkDetl);
                wrkDetlsOld.add(wrkDetlSingle);
                sign=false;
                sign = false;
                break;
            }
            if (sign){
            if (sign) {
                throw new CoolException("参数：木箱编号 boxNo未查询到对应的工作明细！");
            }
        }
@@ -950,7 +956,7 @@
            throw new CoolException("生成工作档失败==》桁架上位软件：单次拆垛完成通知");
        }

        for (WrkDetl wrkDetl : wrkDetlsNew){
        for (WrkDetl wrkDetl : wrkDetlsNew) {
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
@@ -962,9 +968,9 @@

        for (WrkDetlSingle wrkDetlSingle : wrkDetlsOld) {
            wrkDetlSingleService.delete(new EntityWrapper<WrkDetlSingle>()
                    .eq("batch",wrkDetlSingle.getBatch())
                    .eq("wrk_no",wrkDetlSingle.getWrkNo())
                    .eq("io_time",wrkDetlSingle.getIoTime()));
                    .eq("batch", wrkDetlSingle.getBatch())
                    .eq("wrk_no", wrkDetlSingle.getWrkNo())
                    .eq("io_time", wrkDetlSingle.getIoTime()));
        }

    }
@@ -977,16 +983,16 @@
    public void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param) {
//        Long userId = 8888L;//桁架上位软件
        //判断param参数
        if (Cools.isEmpty(param.getBarcode())){
        if (Cools.isEmpty(param.getBarcode())) {
            throw new CoolException("参数：托盘码 barcode为空");
        }
        WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
        if (Cools.isEmpty(wrkMastMatrix)){
            throw new CoolException("参数：托盘码查询工作档失败："+param.getBarcode());
        if (Cools.isEmpty(wrkMastMatrix)) {
            throw new CoolException("参数：托盘码查询工作档失败：" + param.getBarcode());
        }

        wrkMastMatrix.setSheetNo("2");
        if (!wrkMastService.updateById(wrkMastMatrix)){
        if (!wrkMastService.updateById(wrkMastMatrix)) {
            throw new CoolException("更新工作档失败==》桁架上位软件：单托拆垛完成通知");
        }
    }
@@ -1010,9 +1016,9 @@
    @Override
    public void updateBarcode() {
        List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D"));
        for (int i = 0; i < locMasts.size(); i ++) {
        for (int i = 0; i < locMasts.size(); i++) {
            LocMast locMast = locMasts.get(i);
            locMast.setBarcode("a"+i);
            locMast.setBarcode("a" + i);
            locMastService.updateById(locMast);
        }
        System.out.println("更新完了" + locMasts.size());
@@ -1020,29 +1026,27 @@

    @Override
    @Transactional
    public void prodCheck(List<ProdCheckParam> param) {
    public R prodCheck(List<ProdCheckParam> param) {
        if (param.isEmpty()) {
            throw new CoolException("请求参数不能为空");
            return R.parse("请求参数不能为空");
        }
        for (ProdCheckParam checkParam : param) {
            // 更新库存明细是否合格
            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("brand", checkParam.getPackageGroupNo())
                    .eq("unit", checkParam.getBoxNo()).eq("model", checkParam.getRollNo()));
            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().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) {
//            Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("model", checkParam.getRollNo()));
            if (locDetl == null) { //  || mat == null
                throw new CoolException("更新是否合格物料不存在：" + checkParam);
            }

            locDetl.setThreeCode(checkParam.getQualified());
            mat.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())));
            locDetlService.update(locDetl, new EntityWrapper<LocDetl>().eq("model", checkParam.getRollNo()));
//            matService.update(mat, (new EntityWrapper<Mat>().eq("model", checkParam.getRollNo())));
        }

        return R.ok("更新成功");
    }

    @Override
@@ -1060,7 +1064,7 @@
        StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto, 0);

        // 返回GWCS目标信息
        pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(),"一楼反修品入库推送gwcs");
        pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "一楼反修品入库推送gwcs");
//        if (!result) {
//            throw new CoolException("入库回推入库码头给GWCS失败");
//        }
@@ -1099,13 +1103,13 @@
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setAnfme(1.0);
            // 重新定位木箱位置
            for (FxprkParam.Box box :param.getBoxList()) {
            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());
                        matMapper.updateBoxPos(box.getPackageGroupNo(), box.getBoxPos(), param.getBarcode());
                    }
                    break;
                }
@@ -1143,6 +1147,13 @@
            // 都有任务则获取电脑模式的堆垛机列表
            basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts",3).eq("in_enable","Y")
                    .eq("out_enable","Y"));
        }
        WrkMast exist = wrkMastService.selectOne(
                new EntityWrapper<WrkMast>()
                        .eq("barcode", param.getBarcode())
                        .eq("io_type", 3));
        if (exist != null) {
            return R.error("任务已存在，不可重复提交");
        }
        if (basCrnps.isEmpty()) {
            throw new CoolException("没有可用堆垛机,堆垛机停止或异常或禁用");
@@ -1229,20 +1240,21 @@
            }
        }
        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short)1);
        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);
        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.入库
@@ -1268,7 +1280,7 @@

        if (!Cools.isEmpty(param.getMatList())) {
            List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
            for (GwmsGenerateInventoryDto.MatList obj :matList) {
            for (GwmsGenerateInventoryDto.MatList obj : matList) {
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.setWrkNo(wrkMast.getWrkNo());
                obj.getRolls().forEach(roll -> {
@@ -1305,14 +1317,14 @@
                    }

                    // 物料表备份一份
                    Mat mat = new Mat();
                    mat.sync(wrkDetl);
                    mat.setTagId(6L);
                    mat.setCreateTime(now);
                    mat.setUpdateTime(now);
                    if (!matService.insert(mat)) {
                        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("备份物料表失败");
//                    }

                });
            }
@@ -1321,18 +1333,18 @@

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

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

        return null;
    }
@@ -1340,7 +1352,7 @@
    @Override
    @Transactional
    public String crnExecute(CrnExecuteParam param) {
        if (Cools.isEmpty(param.getStaNo(),param.getWorkNo())){
        if (Cools.isEmpty(param.getStaNo(), param.getWorkNo())) {
            throw new CoolException("参数不能为空：" + param);
        }

@@ -1348,13 +1360,15 @@
        if (wrkMast == null) {
            throw new CoolException("不存在该工作号：" + param.getWorkNo());
        }

        if (wrkMast.getWrkSts() == 3) {
            throw new CoolException("工作档状态不对：" + param.getWorkNo());
        }
        wrkMast.setWrkSts(2L);
        if(wrkMast.getIoType() == 10){
        if (wrkMast.getIoType() == 10) {
            wrkMast.setBarcode(param.getBarcode());
        } else if(wrkMast.getIoType() == 12) { // 跨巷道转移入库
        } else if (wrkMast.getIoType() == 12) { // 跨巷道转移入库

        } else if(wrkMast.getSourceStaNo() == 3046 || wrkMast.getSourceStaNo() == 3042) {
        } else if (wrkMast.getSourceStaNo() == 3046 || wrkMast.getSourceStaNo() == 3042) {
            wrkMast.setBarcode(param.getBarcode());
        }
        wrkMastService.updateById(wrkMast);
@@ -1372,6 +1386,9 @@
        }

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

        // 单据主档
@@ -1386,7 +1403,7 @@
                null,    // 初始票据号
                null,    // 票据号
                null,    // 客户编号
                null,    // 客户
                param.getCustomerName(),    // 客户
                null,    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
@@ -1409,7 +1426,7 @@
                now,    // 添加时间
                9527L,    // 修改人员
                now,    // 修改时间
                null    // 备注
                param.getMemo()    // 备注
        );

        if (!orderService.insert(order)) {
@@ -1454,14 +1471,14 @@
    @Transactional
    public String outLocResultReport(GhjtApiParam param) {

        if (Cools.isEmpty(param.getOutLocResult(),param.getWorkNo())) {
        if (Cools.isEmpty(param.getOutLocResult(), param.getWorkNo())) {
            throw new CoolException("入参不能为空：" + param);
        }

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getWorkNo()));
        if (wrkMast == null) {
            throw new CoolException("该工作档不存在，任务号：" + param.getWorkNo());
        } else if(wrkMast.getWrkSts() != 2) {
        } else if (wrkMast.getWrkSts() != 2) {
            throw new CoolException("工作档当前状态不符合，任务号：" + param.getWorkNo() + "，工作档状态：" + wrkMast.getWrkSts());
        }

@@ -1478,12 +1495,107 @@
//            wrkMast.setWrkSts(20L);
//            // 空托盘到位直接更新工作档状态为14.已出库未确认，空托无需复核确认
//            if (!flag || wrkMast.getIoType() == 110) {
                wrkMast.setWrkSts(14L);
            wrkMast.setWrkSts(14L);
//            }
            wrkMastService.updateById(wrkMast);
        }

        if (!wrkDetls.get(0).getMatnr().equals("空箱")) {
            // 出库上报推送mes记录
            ckjgsbPushMes(wrkMast, wrkDetls);
        } else {
            wrkMast.setWrkSts(14L);
            wrkMastService.updateById(wrkMast);
        }


        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
@@ -1494,11 +1606,11 @@
    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));
        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));
            basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3));
        }
        if (basCrnps.isEmpty()) {
            throw new CoolException("没有可用堆垛机,堆垛机停止或异常");
@@ -1507,12 +1619,12 @@
        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("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("crn_no",crnNoList).in("row1",1,4,5,8,9,12,13,16,17,20,21,24));
            }
        locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D")
                .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("crn_no", crnNoList).in("row1", 1, 4, 5, 8, 9, 12, 13, 16, 17, 20, 21, 24));
        }

        if (locMasts.isEmpty()) {
            throw new CoolException("没有找到空托盘，站点：" + param.getStaNo());
@@ -1604,7 +1716,7 @@
    @Transactional
    public R zphjCdwc(ZphjcdwcParam param) {

        if (Cools.isEmpty(param.getWorkNo(),param.getSourceStaNo(),param.getSite(),param.getBarcode())) {
        if (Cools.isEmpty(param.getWorkNo(), param.getSourceStaNo(), param.getSite(), param.getBarcode())) {
            return R.parse("参数不能为空，请检查入参");
        }
        WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
@@ -1717,7 +1829,7 @@
        zphjcdwcVo1.setStaNo(wrkMast.getStaNo());
        zphjcdwcVo1.setSourceStaNo(wrkMast.getSourceStaNo());
        zphjcdwcVo1.setBarcode(wrkMast.getBarcode());
        zphjcdwcVos.add(0,zphjcdwcVo1);
        zphjcdwcVos.add(0, zphjcdwcVo1);

        // 下发回库的目标站点和拆垛的出库目标站点给gwcs
        return R.ok(zphjcdwcVos);
@@ -1726,7 +1838,7 @@
    @Override
    public R kxlhCdwc(KxlhcdwcParam param) {

        if (Cools.isEmpty(param.getWorkNo(),param.getSourceStaNo(),param.getSite())) {
        if (Cools.isEmpty(param.getWorkNo(), param.getSourceStaNo(), param.getSite(), param.getBarcode())) {
            return R.parse("参数不能为空，请检查入参");
        }
        WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
@@ -1782,7 +1894,7 @@

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

            // 修改工作主档
@@ -1815,11 +1927,11 @@
        Integer site = param.getSite();

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

@@ -1831,7 +1943,7 @@
            zphjcdwcVo.setWorkNo(wrkMast1.getWrkNo());
            zphjcdwcVo.setStaNo(wrkMast1.getStaNo());
            zphjcdwcVo.setSourceStaNo(site);
            zphjcdwcVo.setBarcode(site == 3046 ? "T1046" : "T1042");
            zphjcdwcVo.setBarcode(param.getBarcode());
            zphjcdwcVos.add(zphjcdwcVo);
        }

@@ -1855,11 +1967,11 @@
        List<String> collect2 = wrkDetls.stream().map(WrkDetl::getOrigin).distinct().collect(Collectors.toList());

        // 0明细异常,1亮左，2亮右，3都亮
        if (collect1.size() == 0 || collect2.size() == 0){
        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)) {
        } 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) {
        } else if (collect1.size() == 2 && collect2.size() == 1) {
            return R.ok(collect2.get(0).equals("左") ? 1 : 2);
        } else {
            return R.parse("亮信号灯条码异常：" + barcode);
@@ -1867,10 +1979,90 @@

    }

    @Override
    public R getUnfulfilledOrders() {
        // 获取未完成订单统计信息
        List<OrderStatisticsDto> unfulfilledOrders = orderMapper.getUnfulfilledOrders("");
        return R.ok(unfulfilledOrders);
    }

    @Override
    public R getCrnLaneWayInfo() {
        List<CrnLaneWayInfoDto> crnLaneWayInfo = basCrnpMapper.getCrnLaneWayInfo();
        return R.ok(crnLaneWayInfo);
    }

    @Override
    public R getOutLocInfoByBarcode(String barcode) {

        // 根据托盘码获取任务主档
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
        if (wrkMast == null) {
            return R.parse("该条码无正在执行任务：" + barcode);
        }
        // 根据任务主档获取工作档明细
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        // 提取包装组号
        List<String> brandList = wrkDetls.stream().map(WrkDetl::getBrand).distinct().collect(Collectors.toList());
        OutLocInfoDto outLocInfoDto = new OutLocInfoDto();
        outLocInfoDto.setWrkNo(wrkMast.getWrkNo());
        List<OutLocInfoDto.Material> materialList = new ArrayList<>();
        for (String brand : brandList) {
            // 一个木箱
            OutLocInfoDto.Material material = new OutLocInfoDto.Material();
            material.setPackageGroupNo(brand); // 包装组号
            // 按包装组号过滤
            List<WrkDetl> wrkDetls1 = wrkDetls.stream().filter(wrkDetl -> Objects.equals(wrkDetl.getBrand(), brand)).collect(Collectors.toList());
            // 卷信息
            List<OutLocInfoDto.Material.MaterialDetail> materialDetailList = new ArrayList<>();
            for (WrkDetl wrkDetl : wrkDetls1) {
                OutLocInfoDto.Material.MaterialDetail materialDetail = new OutLocInfoDto.Material.MaterialDetail();
                materialDetail.setRollNo(wrkDetl.getModel());
                materialDetail.setBoxNo(wrkDetl.getUnit());
                materialDetail.setSpecs(wrkDetl.getMatnr());
                materialDetail.setBoxType(wrkDetl.getColor());
                materialDetail.setCoreType(wrkDetl.getManu());
                materialDetail.setWidth(wrkDetl.getSku());
                materialDetail.setThickness(wrkDetl.getItemNum());
                materialDetail.setWeight(wrkDetl.getWeight());
                materialDetail.setLength(wrkDetl.getLength());
                materialDetail.setVolume(wrkDetl.getVolume());
                materialDetail.setCustomerName(wrkDetl.getSupp());
                materialDetail.setMemo(wrkDetl.getMemo());
                material.setBoxPos(wrkDetl.getOrigin()); // 托盘上木箱位置
                materialDetailList.add(materialDetail);
            }
            // 订单信息
            WrkDetl wrkDetl = wrkDetls1.get(0);
            if (wrkDetl != null && wrkDetl.getOrderNo() != null) {
                Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", wrkDetl.getOrderNo()));
                if (order != null) {
                    material.setOrderNo(order.getOrderNo());
//                    material.setMemo(order.getMemo());
//                    material.setCustomerName(order.getCstmrName());
                    List<OrderStatisticsDto> unfulfilledOrders = orderMapper.getUnfulfilledOrders(order.getOrderNo());
                    if (unfulfilledOrders.size() == 1) {
                        OrderStatisticsDto orderStatisticsDto = unfulfilledOrders.get(0);
                        material.setSum(orderStatisticsDto.getSum());
                        material.setToShipQuantity(orderStatisticsDto.getToShipQuantity());
                        material.setWorkQuantity(orderStatisticsDto.getWorkQuantity());
                        material.setCompleteQuantity(orderStatisticsDto.getCompletedQuantity());
                    }
                }
            }

            material.setMaterialDetailList(materialDetailList);
            materialList.add(material);
        }
        outLocInfoDto.setMaterialList(materialList);

        return R.ok(outLocInfoDto);
    }

    /**
     * 创建桁架理货出库的工作档
     */
    private int create111Work(WrkMast wrk, List<WrkDetl> wrkDetls, Integer site, Integer staNo,String barcode) {
    private int create111Work(WrkMast wrk, List<WrkDetl> wrkDetls, Integer site, Integer staNo, String barcode) {
        int workNo = commonService.getWorkNo(4);
        Date now = new Date();
        // 生成工作档
@@ -1899,7 +2091,7 @@
        wrkMastService.insert(wrkMast);

        // 插入工作档明细
        for (WrkDetl wrkDetl:wrkDetls) {
        for (WrkDetl wrkDetl : wrkDetls) {
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setBarcode(barcode);
            wrkDetl.setZpallet(barcode);
@@ -1911,6 +2103,7 @@

    /**
     * 根据出库物料明细判断是否去贴标(单卷贴标，多卷不贴标)
     *
     * @param wrkDetls 物料明细
     * @return 1.多卷直接出路径，4.单卷贴标路径
     */
@@ -1918,39 +2111,60 @@
        return wrkDetls.size() > 1 ? 1 : 4; // 一条记录就是一卷
    }

    public boolean pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo,String barcode,String message) {
        boolean success = false;
        // 获取请求头
        Map<String, Object> headers = getHeaders();
    public boolean pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo, String barcode, String message) {
        int maxRetry = 3;       // 最多重试 3 次
        long retryDelay = 10000; // 重试间隔 10 秒
        boolean finalSuccess = false;

        // 构造请求体
        Map<String, Object> headers = getHeaders();
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("workNo", workNo);
        jsonObject.put("staNo", staNo);
        jsonObject.put("sourceStaNo", palletizingNo);
        jsonObject.put("barcode", barcode);
        String body = jsonObject.toJSONString();
        String response = "";
        try {
            response = new HttpHandler.Builder()
                    .setUri(MesConstant.GWCS_IP_PORT)
                    .setPath(MesConstant.GWCS_FPKW_URL)
                    .setHeaders(headers)
                    .setJson(body)
                    .build()
                    .doPost();
            if (!Cools.isEmpty(response)) {
                success = true;
            } else {
                log.error(message + "失败！！！url：{}；request：{}；response：{}", MesConstant.GWCS_IP_PORT + MesConstant.GWCS_FPKW_URL, body, response);
            }
        } catch (Exception e) {
            log.error(message + "异常：{}", e);
        } finally {

        for (int attempt = 1; attempt <= maxRetry; attempt++) {
            String response = "";
            boolean success = false;
            String attemptMsg = message + "（第 " + attempt + " 次尝试）";

            try {
                // 保存接口日志
                response = new HttpHandler.Builder()
                        .setUri(MesConstant.GWCS_IP_PORT)
                        .setPath(MesConstant.GWCS_FPKW_URL)
                        .setHeaders(headers)
                        .setJson(body)
                        .setTimeout(30, TimeUnit.SECONDS) // 设置连接 + 读取超时为30秒
                        .build()
                        .doPost();


                if (!Cools.isEmpty(response)) {
                    try {
                        JSONObject resJson = JSON.parseObject(response);
                        int code = resJson.getIntValue("code"); // 视具体接口而定
                        if (code == 200) {
                            success = true;
                            finalSuccess = true;
                            log.info("{} 成功，响应：{}", attemptMsg, response);
                        } else {
                            log.warn("{} 响应失败，返回code={}，完整响应：{}", attemptMsg, code, response);
                        }
                    } catch (Exception parseEx) {
                        log.warn("{} 响应解析失败，内容：{}", attemptMsg, response);
                    }
                } else {
                    log.warn("{} 失败，响应为空", attemptMsg);
                }
            } catch (Exception e) {
                log.error("{} 异常：{}", attemptMsg, e.getMessage(), e);
            }

            // 每次都记录日志，不论成功或失败
            try {
                apiLogService.save(
                        message,
                        attemptMsg,
                        MesConstant.GWCS_IP_PORT + MesConstant.GWCS_FPKW_URL,
                        null,
                        "127.0.0.1",
@@ -1959,40 +2173,54 @@
                        success
                );
            } catch (Exception e) {
                log.error("", e);
                log.error("保存接口日志异常：{}", e.getMessage(), e);
            }

            if (success) break; // 成功就不再重试

            // 如果还有下一次重试，则等待
            if (attempt < maxRetry) {
                try {
                    Thread.sleep(retryDelay);
                } catch (InterruptedException e) {
                    Thread.currentThread().interrupt();
                    break;
                }
            }
        }
        return success;

        return finalSuccess;
    }

    Map<String, Object> getHeaders(){
        Map<String,Object> headers = new HashMap<>();
        headers.put("digi-type","sync ");
        headers.put("digi-protocol","raw");
        headers.put("digi-datakey"," XCommon.ImportData");

    Map<String, Object> getHeaders() {
        Map<String, Object> headers = new HashMap<>();
        headers.put("digi-type", "sync ");
        headers.put("digi-protocol", "raw");
        headers.put("digi-datakey", " XCommon.ImportData");

        return headers;
    }


    private void descSta(Integer staNo,Integer crnNo){
    private void descSta(Integer staNo, Integer crnNo) {
//        int[] typeNos =new int[]{1,10,53,101,103,110};
        int[] typeNos =new int[]{10,110};
        for (Integer typeNo:typeNos){
            descSta3(staNo,crnNo,typeNo);
        int[] typeNos = new int[]{10, 110};
        for (Integer typeNo : typeNos) {
            descSta3(staNo, crnNo, typeNo);
        }
    }

    private void descSta3(Integer staNo,Integer crnNo,Integer typeNo){
    private void descSta3(Integer staNo, Integer crnNo, Integer typeNo) {
        StaDesc staDesc = new StaDesc();
        staDesc.setTypeNo(typeNo);
        staDesc.setStnNo(staNo);
        staDesc.setCrnNo(crnNo);
        staDesc.setCrnStn(CrnNoRC(crnNo,staDesc.getTypeNo()>100));
        staDesc.setCrnStn(CrnNoRC(crnNo, staDesc.getTypeNo() > 100));
        descSta2(staDesc);
    }

    private void descSta2(StaDesc staDesc){
    private void descSta2(StaDesc staDesc) {
        Date now = new Date();
        //入库
        int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
@@ -2009,9 +2237,9 @@
        }
    }

    private Integer CrnNoRC(Integer crnNo,boolean sign){
    private Integer CrnNoRC(Integer crnNo, boolean sign) {
        Integer crnStn = 0;
        switch (crnNo){
        switch (crnNo) {
            case 1:
                crnStn = 102;
                break;
@@ -2031,8 +2259,8 @@
                crnStn = 117;
                break;
        }
        if (sign){
            return crnStn-2;
        if (sign) {
            return crnStn - 2;
        }
        return crnStn;
    }