13

zhang

2025-05-24 954799493a5d4a63a8844fd53e8a14c8ea9f6cea

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

@@ -11,10 +11,13 @@
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.third.CodeDataParam;
import com.zy.asrs.third.CodeParam;
import com.zy.asrs.third.MesResponse;
import com.zy.asrs.third.TokenUtils;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.constant.AgvSiteConstant;
import com.zy.common.constant.ApiInterfaceConstant;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
import com.zy.common.model.MesCombParam;
@@ -22,10 +25,12 @@
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.io.IOException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -84,29 +89,39 @@
    @Resource
    private BasDevpMapper basDevpMapper;

    @Value("mes.url")
    private String url;

    @Value("mes.pakin")
    private String code;

    @Override
    public R inLocCallAgv(String sta, String inSta) {

        BasDevp basDevp = basDevpMapper.selectById(inSta);
        // 0.出库模式，1.agv入库中，2.生成入库任务
        if (basDevp.getDevMk().equals("0")) { // 是出库
             // 判断是否有出库任务
            Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().lt("wrk_sts", 14).in("io_type", 101, 103, 107, 110);
            switch (inSta) {
                case "1040": wrapper.in("source_sta_no","1043","1044");break;
                case "2010": wrapper.in("source_sta_no","2013","2014"); break;
                case "2000": wrapper.in("source_sta_no","2003","2004");break;
                case "3010": wrapper.in("source_sta_no","3013","3014");break;
                default:
            }
            int count = wrkMastService.selectCount(wrapper);
            if (count == 0) {
                // 没有出库任务，更改为入库模式
                basDevp.setDevMk("1");
                basDevpMapper.updateById(basDevp);
            } else {
                return R.parse(inSta + "站点存在出库任务");
            }

        // 判断是否有出库任务
        Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().lt("wrk_sts", 14).in("io_type", 101, 103, 107, 110);

        switch (inSta) {
            case "1040":
                wrapper.in("source_sta_no", "1043", "1044");
                break;
            case "2010":
                wrapper.in("source_sta_no", "2013", "2014");
                break;
            case "2000":
                wrapper.in("source_sta_no", "2003", "2004");
                break;
            case "3010":
                wrapper.in("source_sta_no", "3013", "3014");
                break;
            default:
        }
        int count = wrkMastService.selectCount(wrapper);
        log.info("入库呼叫agv呼叫站点：{}，目标站点：{},出库任务数：{}", sta, inSta, count);
        if (count != 0) {
            return R.parse(inSta + "站点存在出库任务");
        }

        // 先绑定
@@ -140,6 +155,9 @@
            JSONObject jsonObject = JSON.parseObject(response);
            if (jsonObject.getInteger("code").equals(0)) {
                success = true;
                // 入库暂存+1
                basDevp.setInQty(basDevp.getInQty() + 1);
                basDevpMapper.updateById(basDevp);
            } else {
                message = jsonObject.getString("message");
                log.error("入库呼叫agv失败！！！url：{}；request：{}；response：{}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
@@ -173,10 +191,10 @@
            return R.parse("没有找到该站点的入库映射：" + site);
        }
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 请求唯一值
        jsonObject.put("ctnrTyp","2"); // 容器类型2
        jsonObject.put("stgBinCode",staMap); // 仓位编号，根据客仓编号转换
        jsonObject.put("indBind","0"); // 1绑定，0解绑
        jsonObject.put("reqCode", UUID.randomUUID().toString().replace("-", "")); // 请求唯一值
        jsonObject.put("ctnrTyp", "2"); // 容器类型2
        jsonObject.put("stgBinCode", staMap); // 仓位编号，根据客仓编号转换
        jsonObject.put("indBind", "0"); // 1绑定，0解绑

        String body = jsonObject.toJSONString();
        String response = "";
@@ -220,14 +238,14 @@
    private boolean bindPodAndBerth(String sta) {
        String staMap = AgvSiteConstant.SiteMap.get(sta);
        if (staMap == null) {
            log.error("没有找到该站点的入库映射:{}",sta);
            log.error("没有找到该站点的入库映射:{}", sta);
            return false;
        }
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 请求唯一值
        jsonObject.put("ctnrTyp","2"); // 容器类型2
        jsonObject.put("stgBinCode",staMap); // 仓位编号，根据客仓编号转换
        jsonObject.put("indBind","1"); // 1绑定，0解绑
        jsonObject.put("reqCode", UUID.randomUUID().toString().replace("-", "")); // 请求唯一值
        jsonObject.put("ctnrTyp", "2"); // 容器类型2
        jsonObject.put("stgBinCode", staMap); // 仓位编号，根据客仓编号转换
        jsonObject.put("indBind", "1"); // 1绑定，0解绑

        String body = jsonObject.toJSONString();
        String response = "";
@@ -272,7 +290,7 @@
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
        if(param.getCombMats().size()>1){
        if (param.getCombMats().size() > 1) {
            throw new CoolException("请提取一个商品，或者刷新重新组托！");
        }
        param.getCombMats().forEach(elem -> {
@@ -280,17 +298,17 @@
            if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                    eq("zpallet", param.getBarcode())
                    .eq("io_status", "N")
                    .eq("matnr",elem.getMatnr()).eq("batch",elem.getBatch())) > 0) {
                    .eq("matnr", elem.getMatnr()).eq("batch", elem.getBatch())) > 0) {
                throw new CoolException(param.getBarcode() + "已有相同数据");
            }
        });

        if(param.getBarcode().length()!=9){
            throw new CoolException("条码长度不是9位===>>" + param.getBarcode());
        if (param.getBarcode().length() != 8) {
            throw new CoolException("条码长度不是8位===>>" + param.getBarcode());
        }

        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
//        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
        if (countLoc > 0 || countWrk > 0) {
            throw new CoolException("工作档/库存条码数据已存在===>>" + param.getBarcode());
@@ -309,7 +327,7 @@
                if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                        eq("zpallet", param.getBarcode())
                        .eq("io_status", "N")
                        .eq("matnr",elem.getMatnr()).eq("batch",elem.getBatch())) > 0) {
                        .eq("matnr", elem.getMatnr()).eq("batch", elem.getBatch())) > 0) {
                    throw new CoolException(param.getBarcode() + "已有相同数据");
                }

@@ -344,7 +362,7 @@
                    throw new CoolException("保存入库通知档失败");
                }
            }
        // 关联组托
            // 关联组托
        } else {
            Order order = orderService.selectByNo(param.getOrderNo());
            if (Cools.isEmpty(order) || order.getSettle() > 2) {
@@ -353,9 +371,27 @@
            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();

            List<String> codes=new ArrayList<>();
            for (CombParam.CombMat elem : param.getCombMats()) {
                codes.add(elem.getThreeCode());
            }
            List<CodeDataParam> data = getData(TokenUtils.getToken(url), new CodeParam(codes));
            List<CombParam.CombMat> combMats = param.getCombMats();
            for (int i = 0; i < data.size(); i++) {


                //}
                //for (CombParam.CombMat elem : param.getCombMats()) {
                CombParam.CombMat elem = combMats.get(i);
                CodeDataParam codeDataParam = data.get(i);
                if (!codeDataParam.getQuality().equals(order.getShipCode())) {
                    throw new CoolException("单据质量状态和组托物料不匹配");
                }
                elem.setTemp1(codeDataParam.getQuality());
                elem.setAnfme(codeDataParam.getQty());
                elem.setBatch(codeDataParam.getBatchNum());
                elem.setThreeCode(codeDataParam.getBarcode());
                elem.setMatnr(codeDataParam.getProductionCode());
                elem.setMaktx(codeDataParam.getProductionName());
//            param.getCombMats().forEach(elem -> {

                // 订单明细数量校验
@@ -372,8 +408,10 @@
                }

//                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getSuppCode()
                        , orderDetl.getManu(),orderDetl.getSku(),orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2(),orderDetl.getTemp3(),orderDetl.getTemp4());
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getThreeCode()
                        , orderDetl.getManu(), orderDetl.getSku(), orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2(), orderDetl.getTemp3(), orderDetl.getTemp4());
                detlDto.setTemp1(codeDataParam.getQuality());
                detlDto.setFromOrderNo(codeDataParam.getBarcode());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                    assert one != null;
@@ -400,16 +438,20 @@
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                waitPakin.setDanger(detlDto.getDanger());
                waitPakin.setManu(detlDto.getMark()); //标记
                waitPakin.setOrigin(order.getItemName());//仓库
                waitPakin.setSupp(detlDto.getSuppName()); //供应商
                waitPakin.setSku(detlDto.getCustomer()); //客户名称
                waitPakin.setThreeCode(detlDto.getOrderNo()); //u8发过来的订单号
                waitPakin.setSuppCode(detlDto.getFromOrderNo()); //来源单号
                waitPakin.setThreeCode(detlDto.getFromOrderNo()); //条码
                waitPakin.setTemp1(detlDto.getTemp1());
                waitPakin.setTemp2(detlDto.getTemp2());
                waitPakin.setTemp3(detlDto.getTemp3());
                waitPakin.setTemp4(detlDto.getTemp4());
                int countWrk2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
                if (countWrk2 > 0) {
                    throw new CoolException("工作档条码数据已存在===>>" + param.getBarcode());
                }
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -419,6 +461,27 @@

    }


    public List<CodeDataParam> getData(Map<String, Object> token, CodeParam codeParam) {
        String response = null;
        try {
            response = new HttpHandler.Builder()
                    .setHeaders(token)
                    .setUri(url)
                    .setPath(code)
                    .setJson(JSON.toJSONString(codeParam))
                    .build()
                    .doPost();
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
        MesResponse jsonObject = JSON.parseObject(response, MesResponse.class);
        if (jsonObject.getCode().equals(200)) {
            return JSON.parseArray(jsonObject.getData(), CodeDataParam.class);
        }
        throw new CoolException(jsonObject.getMessage());
    }

    @Override
    @Transactional
    public void mergeComb(CombParam param, Long userId) {
@@ -426,7 +489,7 @@
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
        if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){
        if (param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)) {
            throw new CoolException("入库物料数量不能为空");
        }
        Order order = orderService.selectByNo(param.getOrderNo());
@@ -440,15 +503,15 @@
            throw new CoolException(param.getBarcode() + "数据正在进行入库");
        }

        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
        if (wrkMast.getWrkSts() != 14 && wrkMast.getIoType() != 104){
        if (wrkMast.getWrkSts() != 14 && wrkMast.getIoType() != 104) {
            throw new CoolException(param.getBarcode() + "该条码数据不为并板出库");
        }

        //设置非null批号，
        for (CombParam.CombMat combMat : param.getCombMats()) {
            if (combMat.getBatch() == null){
            if (combMat.getBatch() == null) {
                combMat.setBatch("");
            }
        }
@@ -481,11 +544,13 @@
            wrkDetl.setModiTime(now);
            wrkDetl.setModiUser(userId);
            wrkDetl.setManu(orderDetl.getManu());
            wrkDetl.setSupp(orderDetl.getSupp());
            wrkDetl.setTemp1(orderDetl.getTemp1());
            wrkDetl.setTemp2(orderDetl.getTemp2());
            wrkDetl.setTemp3(orderDetl.getTemp3());
            wrkDetl.setTemp4(orderDetl.getTemp4());
            wrkDetlService.insert(wrkDetl);
        }





    }
@@ -502,15 +567,15 @@
        }

        // 获取商品列表
        for(CombParam.CombMat combMat : param.getCombMats()){
        for (CombParam.CombMat combMat : param.getCombMats()) {
            Mat mat = matService.selectByMatnr(combMat.getMatnr());
            if (Cools.isEmpty(mat)){
            if (Cools.isEmpty(mat)) {
                throw new CoolException(combMat.getMatnr() + ":商品档案不存在！");
            }
            if (Cools.isEmpty(combMat.getAnfme()) || combMat.getAnfme()==0){
            if (Cools.isEmpty(combMat.getAnfme()) || combMat.getAnfme() == 0) {
                throw new CoolException(combMat.getMatnr() + ":商品数量有误！");
            }
            if (Cools.isEmpty(combMat.getBatch())){
            if (Cools.isEmpty(combMat.getBatch())) {
//                throw new CoolException(combMat.getMatnr() + ":商品批号有误！");
            }
            ManLocDetl manLocDetl = new ManLocDetl();
@@ -531,16 +596,16 @@
    @Override
    public void offSale(OffSaleParam offSaleParam) {
        ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
        if (Cools.isEmpty(manLocDetl)){
        if (Cools.isEmpty(manLocDetl)) {
            throw new CoolException("无此商品！");
        }
        double anfme = manLocDetl.getAnfme() - offSaleParam.getAnfme();
        if (anfme < 0) {
            throw new CoolException("商品库存不足！");
        } else if (anfme == 0){
        } else if (anfme == 0) {
            manLocDetlMapper.deleteLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
        }
        manLocDetlMapper.updateAnfme0(anfme,manLocDetl.getNodeId());
        manLocDetlMapper.updateAnfme0(anfme, manLocDetl.getNodeId());
    }

    // 查找商品
@@ -599,7 +664,9 @@

        // 添加明细
        for (WrkDetl wrkDetl : list) {
            if (wrkDetl.getAnfme() == 0.0D) { continue; }
            if (wrkDetl.getAnfme() == 0.0D) {
                continue;
            }
            // todo 盘点记录、保存调整记录
            String orderNo = wrkDetl.getOrderNo();
            Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
@@ -615,7 +682,7 @@
        }

        // 修改盘点任务主档状态
        wrkMast.setFullPlt(wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()).size() != 0?"Y":"N");
        wrkMast.setFullPlt(wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()).size() != 0 ? "Y" : "N");
        wrkMast.setModiTime(now);
        wrkMast.setModiUser(userId);
        if (!wrkMastService.updateById(wrkMast)) {
@@ -681,40 +748,40 @@
                }
                String response = "";
                boolean success = false;
                try {
                    response = new HttpHandler.Builder()
                            .setUri(MesConstant.URL)
                            .setPath(MesConstant.PACK_DOWN_URL)
                            .setJson(JSON.toJSONString(mesCombParam))
                            .build()
                            .doPost();
                    JSONObject jsonObject = JSON.parseObject(response);
                    if (jsonObject.getInteger("code").equals(200)) {
                        success = true;
                    } else if (jsonObject.getInteger("code").equals(500)) {
                        log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
                        throw new CoolException(jsonObject.getString("msg"));
                    } else {
                        log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
                        throw new CoolException("上报mes系统失败");
                    }
                } catch (Exception e) {
                    log.error("fail", e);
                    throw new CoolException(e.getMessage());
                } finally {
                    try {
                        // 保存接口日志
                        apiLogService.save(
                                "打包下线帮托上报",
                                MesConstant.URL + MesConstant.PACK_DOWN_URL,
                                null,
                                "127.0.0.1",
                                JSON.toJSONString(mesCombParam),
                                response,
                                success
                        );
                    } catch (Exception e) { log.error("", e); }
                }
//                try {
//                    response = new HttpHandler.Builder()
//                            .setUri(url)
//                            .setPath(code)
//                            .setJson(JSON.toJSONString(mesCombParam))
//                            .build()
//                            .doPost();
//                    JSONObject jsonObject = JSON.parseObject(response);
//                    if (jsonObject.getInteger("code").equals(200)) {
//                        success = true;
//                    } else if (jsonObject.getInteger("code").equals(500)) {
//                        log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
//                        throw new CoolException(jsonObject.getString("msg"));
//                    } else {
//                        log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
//                        throw new CoolException("上报mes系统失败");
//                    }
//                } catch (Exception e) {
//                    log.error("fail", e);
//                    throw new CoolException(e.getMessage());
//                } finally {
//                    try {
//                        // 保存接口日志
//                        apiLogService.save(
//                                "打包下线帮托上报",
//                                MesConstant.URL + MesConstant.PACK_DOWN_URL,
//                                null,
//                                "127.0.0.1",
//                                JSON.toJSONString(mesCombParam),
//                                response,
//                                success
//                        );
//                    } catch (Exception e) { log.error("", e); }
//                }

            }

@@ -724,7 +791,7 @@
            openParam.setOrderNo(orderNo);
            openParam.setInboundDate(DateUtils.convert(now));
            openParam.setOrderType("打包入库单");
            openParam.setOrderDetails(detlDtos);
            openParam.setDetails(detlDtos);
            openService.pakinOrderCreate(openParam);
            Order order = orderService.selectByNo(orderNo);
            if (null == order) {
@@ -790,19 +857,19 @@
        BasDevp sta = basDevpService.checkSiteStatus(staNo);
        //根据订单号生成出库任务工作档
        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
        if (order.getSettle() != 1 && order.getSettle() != 2){
        if (order.getSettle() != 1 && order.getSettle() != 2) {
            throw new CoolException("该订单已处理");
        }

        List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
        Date now = new Date();
        for(OrderDetl orderDetl : orderDetls){
        for (OrderDetl orderDetl : orderDetls) {
            //查询所有库位状态为F的库位信息
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null,null);
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, null, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
            if (locDetls.size() == 0) {
                throw new CoolException("库存中没有该物料");
            }
            for(LocDetl locDetl : locDetls){
            for (LocDetl locDetl : locDetls) {
                //如果该库位出库路线所用的堆垛机out_enable不为Y,跳过该循环
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("loc_no", locDetl.getLocNo()));
@@ -811,13 +878,13 @@
                }
                BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
                        .eq("crn_no", locMast.getCrnNo()));
                if (Cools.isEmpty(crn_no) || !crn_no.getOutEnable().equals("Y")){
                if (Cools.isEmpty(crn_no) || !crn_no.getOutEnable().equals("Y")) {
                    continue;
                }

                //可出库数量 = 订单数量 - 作业中数量
                Double outQty = orderDetl.getAnfme() - orderDetl.getWorkQty();
                if(outQty <= 0){
                if (outQty <= 0) {
                    break;
                }
                // 判断入出库类型：101.全板出库 or 103.拣料出库
@@ -829,18 +896,18 @@
                order.setSettle(2L);
                order.setUpdateBy(userId);
                order.setUpdateTime(now);
                if(!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))){
                if (!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))) {
                    throw new CoolException("更新订单状态失败");
                }
                orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty);
                orderDetl.setUpdateBy(userId);
                orderDetl.setUpdateTime(now);
                Wrapper wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo)
                        .eq("matnr",orderDetl.getMatnr());
                if(!Cools.isEmpty(orderDetl.getBatch())){
                        .eq("matnr", orderDetl.getMatnr());
                if (!Cools.isEmpty(orderDetl.getBatch())) {
                    wrapper.eq("batch", orderDetl.getBatch());
                }
                if(!orderDetlService.update(orderDetl, wrapper)){
                if (!orderDetlService.update(orderDetl, wrapper)) {
                    throw new CoolException("更新订单明细失败");
                }
            }
@@ -850,13 +917,13 @@

    @Override
//    @Transactional
    public void leftoversOut(Map<String, Object> map,Long userId) {
    public void leftoversOut(Map<String, Object> map, Long userId) {
        String barcode = map.get("barcode").toString();
        String barcode2 = map.get("barcode2").toString();

        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",barcode2));
        int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode",barcode2).ne("io_type",200));
        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",barcode2));
        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", barcode2));
        int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", barcode2).ne("io_type", 200));
        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", barcode2));
        if (countLoc > 0 || countWrk > 0 || countwait > 0) {
            throw new CoolException("该条码已被使用===>>" + barcode2);
        }
@@ -901,7 +968,7 @@
            throw new CoolException("未查询到拣料任务明细");
        }

        for(WrkDetl wrkDetl : wrkDetls){
        for (WrkDetl wrkDetl : wrkDetls) {
            WrkDetl wrkDetl1 = new WrkDetl();
            wrkDetl1.sync(wrkDetl);
            wrkDetl1.setWrkNo(workNo);
@@ -909,33 +976,31 @@
        }



    }

    @Override
    public void pdaAdjust(pdaAdjustParam param, Long userId) {
        if (Cools.isEmpty(param)){
        if (Cools.isEmpty(param)) {
            throw new CoolException("盘点列表参数为空");
        }
        for (InventoryCheckOrderDetl orderDetl: param.getParam()){
        for (InventoryCheckOrderDetl orderDetl : param.getParam()) {
            InventoryCheckOrderDetl inventoryCheckOrderDetl = checkOrderDetlService.selectOne(new EntityWrapper<InventoryCheckOrderDetl>()
                    .eq("order_no", orderDetl.getOrderNo())
                    .eq("matnr", orderDetl.getMatnr())
                    .eq("batch", orderDetl.getBatch()));
            if (Cools.isEmpty(inventoryCheckOrderDetl)){
            if (Cools.isEmpty(inventoryCheckOrderDetl)) {
                throw new CoolException("未查询到盘点信息");
            }
            if (!inventoryCheckOrderDetl.getStatus().equals("1")){
            if (!inventoryCheckOrderDetl.getStatus().equals("1")) {
                throw new CoolException("该任务已盘点");
            }
            inventoryCheckOrderDetl.setCheckAnfme(orderDetl.getCheckAnfme());
            inventoryCheckOrderDetl.setStatus("2");
            if (!checkOrderDetlService.updateById(inventoryCheckOrderDetl)){
            if (!checkOrderDetlService.updateById(inventoryCheckOrderDetl)) {
                throw new CoolException("保存盘点信息失败!");
            }

        }



    }
@@ -943,26 +1008,26 @@
    @Override
    @Transactional
    public void inventoryUpload(String orderId) {
        if (Cools.isEmpty(orderId)){
        if (Cools.isEmpty(orderId)) {
            throw new CoolException("盘点单id为空");
        }
        InventoryCheckOrder inventoryCheckOrder = checkOrderService.selectById(orderId);
        if (Cools.isEmpty(inventoryCheckOrder)){
        if (Cools.isEmpty(inventoryCheckOrder)) {
            throw new CoolException("未找到盘点单");
        }
        if (inventoryCheckOrder.getStatus().equals("2")){
        if (inventoryCheckOrder.getStatus().equals("2")) {
            throw new CoolException("盘点单已提交");
        }
        int count = checkOrderDetlService.selectCount(new EntityWrapper<InventoryCheckOrderDetl>()
                .eq("order_no", inventoryCheckOrder.getOrderNo()).isNull("check_anfme"));
        if (count>0){
        if (count > 0) {
            throw new CoolException("有未完成的盘点任务");
        }

        List<InventoryCheckOrderDetl> checkOrderProfitDetls = checkOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>()
                .eq("order_no", inventoryCheckOrder.getOrderNo())
                .addFilter("anfme < check_anfme"));
        if (!checkOrderProfitDetls.isEmpty()){
        if (!checkOrderProfitDetls.isEmpty()) {
            //获取盘盈单param
            InventoryErpParam erpProfitParam = getErpProfitParam(inventoryCheckOrder, checkOrderProfitDetls);
            uploadErp(erpProfitParam);
@@ -972,65 +1037,279 @@
                .eq("order_no", inventoryCheckOrder.getOrderNo())
                .addFilter("anfme > check_anfme"));

        if (!checkOrderDeficitDetls.isEmpty()){
        if (!checkOrderDeficitDetls.isEmpty()) {
            //获取盘亏单param
            InventoryErpParam erpDeficitParam = getErpDeficitParam(inventoryCheckOrder, checkOrderDeficitDetls);
            uploadErp(erpDeficitParam);
        }

        inventoryCheckOrder.setStatus("2");
        if (!checkOrderService.updateById(inventoryCheckOrder)){
        if (!checkOrderService.updateById(inventoryCheckOrder)) {
            throw new CoolException("状态更新失败");
        }




    }

    public void uploadErp(InventoryErpParam param){
        String response = "";
        boolean success = false;
        try {
            HashMap<String, Object> headers = new HashMap<>();
            headers.put("Content-Type", "application/json");
            response = new HttpHandler.Builder()
                    .setHeaders(headers)
                    .setUri("10.0.100.160:30108")
                    .setPath("web/apps/gongqi.df.dataTrans/DTInterFace/doJobWithupdateBody")
                    .setJson(JSON.toJSONString(param))
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            if (jsonObject.getInteger("errcode").equals(0)) {
                success = true;
            } else if (jsonObject.getInteger("errcode").equals(1)) {
                log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(param), response);
                throw new CoolException(jsonObject.getString("msg"));
            } else {
                log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(param), response);
                throw new CoolException("上报mes系统失败");
            }
        } catch (Exception e) {
            log.error("fail", e);
            throw new CoolException(e.getMessage());
        } finally {
            try {
                // 保存接口日志
                apiLogService.save(
                        "盘点单上报",
                        MesConstant.URL + MesConstant.PACK_DOWN_URL,
                        null,
                        "127.0.0.1",
                        JSON.toJSONString(param),
                        response,
                        success
                );
            } catch (Exception e) { log.error("", e); }
    @Override
    @Transactional
    public void pingKuShelves(CombParam combParam, Long userId) {
        Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3));
        if (Cools.isEmpty(node)) {
            throw new CoolException("未找到库位信息");
        }

        Order order = orderService.selectByNo(combParam.getOrderNo());
        if (Cools.isEmpty(order) || order.getSettle() > 2) {
            throw new CoolException("单据编号已过期");
        }
        // 生成入库通知档
        List<DetlDto> detlDtos = new ArrayList<>();

        for (CombParam.CombMat elem : combParam.getCombMats()) {


//            param.getCombMats().forEach(elem -> {

            // 订单明细数量校验
            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
            if (Cools.isEmpty(orderDetl)) {
                throw new CoolException("该单据中未找到对应物料明细");
            }
            if (elem.getAnfme() > orderDetl.getEnableQty()) {
                throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
            }
            // 修改订单作业数量
            if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
                throw new CoolException("修改单据作业数量失败");
            }

//                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
            DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), orderDetl.getSuppCode()
                    , orderDetl.getManu(), orderDetl.getSku(), orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2(), orderDetl.getTemp3(), orderDetl.getTemp4());
            if (DetlDto.has(detlDtos, detlDto)) {
                DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                assert one != null;
                one.setAnfme(one.getAnfme() + detlDto.getAnfme());
            } else {
                detlDtos.add(detlDto);
            }
//            });
        }
        int workNo = commonService.getWorkNo(4);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(4L); // 工作状态：生成入库ID
        wrkMast.setIoType(300); // 入出库状态：1.入库
        wrkMast.setIoPri(12D); // 优先级
        wrkMast.setLocNo(node.getName());
        wrkMast.setBarcode(""); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setSheetNo(order.getOrderNo());
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }
        for (DetlDto detlDto : detlDtos) {
            Mat mat = matService.selectByMatnr(detlDto.getMatnr());
            if (Cools.isEmpty(mat)) {
                throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
            }
            WrkDetl wrkDetl = new WrkDetl();

            wrkDetl.sync(detlDto);
            wrkDetl.sync(mat);

            wrkDetl.setOrderNo(order.getOrderNo());
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            wrkDetl.setManu(detlDto.getMark()); //标记
            wrkDetl.setOrigin(order.getItemName());//仓库
            wrkDetl.setSupp(detlDto.getSuppName()); //供应商
            wrkDetl.setSku(detlDto.getCustomer()); //客户名称
            wrkDetl.setThreeCode(detlDto.getOrderNo()); //u8发过来的订单号
            wrkDetl.setSuppCode(detlDto.getFromOrderNo()); //来源单号
            wrkDetl.setTemp1(detlDto.getTemp1());
            wrkDetl.setTemp2(detlDto.getTemp2());
            wrkDetl.setTemp3(detlDto.getSuppName());
            wrkDetl.setTemp4(detlDto.getTemp4());
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
        }
        orderService.updateSettle(order.getId(), 2L, userId);


    }

    public InventoryErpParam getErpProfitParam(InventoryCheckOrder inventoryCheckOrder,List<InventoryCheckOrderDetl> checkOrderProfitDetls) {
    @Override
    @Transactional
    public void pingKuUnShelves(CombParam combParam, Long userId) {
        String orderNo = combParam.getOrderNo();

        Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3));
        if (Cools.isEmpty(node)) {
            throw new CoolException("未找到库位信息");
        }
        //根据订单号生成出库任务工作档
        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
        if (order.getSettle() != 1 && order.getSettle() != 2) {
            throw new CoolException("该订单已处理");
        }
        List<DetlDto> detlDtos = new ArrayList<>();
        for (CombParam.CombMat elem : combParam.getCombMats()) {
            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", combParam.getLocno())
                    .eq("matnr", elem.getMatnr()).eq("batch", elem.getBatch())
                    .eq("temp3", elem.getSupp()).eq("temp1", elem.getTemp1()).eq("temp2", elem.getTemp2());
            ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);

            if (Cools.isEmpty(manLocDetl)) {
                throw new CoolException("该库位未查询到货物信息");
            }
            if (elem.getAnfme() > manLocDetl.getAnfme()) {
                throw new CoolException("出库数量大于库位剩余数量");
            }

            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
            if (Cools.isEmpty(orderDetl)) {
                throw new CoolException("该单据中未找到对应物料明细");
            }
            if (elem.getAnfme() > orderDetl.getEnableQty()) {
                throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
            }
            // 修改订单作业数量
            if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
                throw new CoolException("修改单据作业数量失败");
            }

            DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), orderDetl.getSuppCode()
                    , orderDetl.getManu(), orderDetl.getSku(), orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2(), orderDetl.getTemp3(), orderDetl.getTemp4());


            int workNo = commonService.getWorkNo(4);
            Date now = new Date();
            // 生成工作档
            WrkMast wrkMast = new WrkMast();
            wrkMast.setWrkNo(workNo);
            wrkMast.setIoTime(new Date());
            wrkMast.setWrkSts(14L); // 工作状态：生成入库ID
            wrkMast.setIoType(301); // 入出库状态：301.平库出库
            wrkMast.setIoPri(12D); // 优先级
            wrkMast.setSourceLocNo(node.getName());
            wrkMast.setBarcode(""); // 托盘码
            wrkMast.setFullPlt("Y"); // 满板：Y
            wrkMast.setPicking("N"); // 拣料
            wrkMast.setExitMk("N"); // 退出
            wrkMast.setEmptyMk("N"); // 空板
            wrkMast.setLinkMis("Y");
            wrkMast.setSheetNo(order.getOrderNo());
            // 操作人员数据
            wrkMast.setAppeTime(now);
            wrkMast.setModiTime(now);
            boolean res = wrkMastService.insert(wrkMast);
            if (!res) {
                throw new CoolException("保存工作档失败");
            }

            Mat mat = matService.selectByMatnr(detlDto.getMatnr());
            if (Cools.isEmpty(mat)) {
                throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
            }
            WrkDetl wrkDetl = new WrkDetl();

            wrkDetl.sync(detlDto);
            wrkDetl.sync(mat);

            wrkDetl.setOrderNo(order.getOrderNo());
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            wrkDetl.setManu(detlDto.getMark()); //标记
            wrkDetl.setOrigin(order.getItemName());//仓库
            wrkDetl.setSupp(detlDto.getSuppName()); //供应商
            wrkDetl.setSku(detlDto.getCustomer()); //客户名称
            wrkDetl.setThreeCode(detlDto.getOrderNo()); //u8发过来的订单号
            wrkDetl.setSuppCode(detlDto.getFromOrderNo()); //来源单号
            wrkDetl.setTemp1(detlDto.getTemp1());
            wrkDetl.setTemp2(detlDto.getTemp2());
            wrkDetl.setTemp3(detlDto.getTemp3());
            wrkDetl.setTemp4(detlDto.getTemp4());
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }

            if (new BigDecimal(manLocDetl.getAnfme()).subtract(new BigDecimal(elem.getAnfme())).doubleValue() == 0) {
                manLocDetlService.delete(manLocDetlWrapper);
            } else {
                manLocDetl.setAnfme(new BigDecimal(manLocDetl.getAnfme()).subtract(new BigDecimal(elem.getAnfme())).doubleValue());
                if (!manLocDetlService.update(manLocDetl, manLocDetlWrapper)) {
                    throw new CoolException("更新明细失败");
                }
            }


        }
        orderService.updateSettle(order.getId(), 2L, userId);


    }

    public void uploadErp(InventoryErpParam param) {
//        String response = "";
//        boolean success = false;
//        try {
//            HashMap<String, Object> headers = new HashMap<>();
//            headers.put("Content-Type", "application/json");
//            response = new HttpHandler.Builder()
//                    .setHeaders(headers)
//                    .setUri("10.0.100.160:30108")
//                    .setPath("web/apps/gongqi.df.dataTrans/DTInterFace/doJobWithupdateBody")
//                    .setJson(JSON.toJSONString(param))
//                    .build()
//                    .doPost();
//            JSONObject jsonObject = JSON.parseObject(response);
//            if (jsonObject.getInteger("errcode").equals(0)) {
//                success = true;
//            } else if (jsonObject.getInteger("errcode").equals(1)) {
//                log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(param), response);
//                throw new CoolException(jsonObject.getString("msg"));
//            } else {
//                log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(param), response);
//                throw new CoolException("上报mes系统失败");
//            }
//        } catch (Exception e) {
//            log.error("fail", e);
//            throw new CoolException(e.getMessage());
//        } finally {
//            try {
//                // 保存接口日志
//                apiLogService.save(
//                        "盘点单上报",
//                        url ,
//                        null,
//                        "127.0.0.1",
//                        JSON.toJSONString(param),
//                        response,
//                        success
//                );
//            } catch (Exception e) { log.error("", e); }
//        }
    }

    public InventoryErpParam getErpProfitParam(InventoryCheckOrder inventoryCheckOrder, List<InventoryCheckOrderDetl> checkOrderProfitDetls) {
        Date date = new Date();
        InventoryErpParam erpProfitParam = new InventoryErpParam();
        InventoryErpParam.DataJson dataJson = new InventoryErpParam.DataJson();
@@ -1043,7 +1322,7 @@
        updateJson.setOrderNo(inventoryCheckOrder.getOrderNo());
        updateJson.setDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date));
        List<InventoryErpParam.MatDetails> matDetails = new ArrayList<>();
        for (InventoryCheckOrderDetl checkOrderProfitDetl: checkOrderProfitDetls){
        for (InventoryCheckOrderDetl checkOrderProfitDetl : checkOrderProfitDetls) {
            InventoryErpParam.MatDetails matDetail = new InventoryErpParam.MatDetails();

            Mat mat = matService.selectByMatnr(checkOrderProfitDetl.getMatnr());
@@ -1055,7 +1334,7 @@
            matDetail.setAnfme(anfme);
            matDetail.setLocNo(checkOrderProfitDetl.getLocNo());
            matDetail.setWarehouse(checkOrderProfitDetl.getArea());
            matDetail.setSeq(updateJson.getMatDetails() == null?1:updateJson.getMatDetails().size()+1);
            matDetail.setSeq(updateJson.getMatDetails() == null ? 1 : updateJson.getMatDetails().size() + 1);
            matDetails.add(matDetail);
        }
        updateJson.setMatDetails(matDetails);
@@ -1064,7 +1343,7 @@
        return erpProfitParam;
    }

    public InventoryErpParam getErpDeficitParam(InventoryCheckOrder inventoryCheckOrder,List<InventoryCheckOrderDetl> checkOrderDeficitDetls) {
    public InventoryErpParam getErpDeficitParam(InventoryCheckOrder inventoryCheckOrder, List<InventoryCheckOrderDetl> checkOrderDeficitDetls) {
        Date date = new Date();
        InventoryErpParam erpDeficitParam = new InventoryErpParam();
        InventoryErpParam.DataJson dataJson = new InventoryErpParam.DataJson();
@@ -1077,7 +1356,7 @@
        updateJson2.setOrderNo(inventoryCheckOrder.getOrderNo());
        updateJson2.setDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date));
        List<InventoryErpParam.MatDetails> matDetails = new ArrayList<>();
        for (InventoryCheckOrderDetl checkOrderDeficitDetl: checkOrderDeficitDetls){
        for (InventoryCheckOrderDetl checkOrderDeficitDetl : checkOrderDeficitDetls) {
            InventoryErpParam.MatDetails matDetail = new InventoryErpParam.MatDetails();

            Mat mat = matService.selectByMatnr(checkOrderDeficitDetl.getMatnr());
@@ -1089,7 +1368,7 @@
            matDetail.setAnfme(anfme);
            matDetail.setLocNo(checkOrderDeficitDetl.getLocNo());
            matDetail.setWarehouse(checkOrderDeficitDetl.getArea());
            matDetail.setSeq(updateJson2.getMatDetails() == null?1:updateJson2.getMatDetails().size()+1);
            matDetail.setSeq(updateJson2.getMatDetails() == null ? 1 : updateJson2.getMatDetails().size() + 1);
            matDetails.add(matDetail);
        }
        updateJson2.setMatDetails(matDetails);