订单上报mes修改

pang.jiabao

2024-09-04 e2f131e38492892b6813f3726f3c4420e86620a8

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

@@ -1177,7 +1177,7 @@
        if (wrkMast == null) {
            throw new CoolException("工作档不存在：" + param.getBarcode());
        }
        if (wrkMast.getIoType() != 101 || wrkMast.getWrkSts() != 20) {
        if (wrkMast.getWrkSts() != 20) {
            throw new CoolException(wrkMast.getWrkNo() + ",工作档类型：" + wrkMast.getIoType() + "工作状态：" + wrkMast.getWrkSts() + ",不匹配");
        }

@@ -1423,7 +1423,8 @@
    public R pdaFxprk(FxprkParam param, Long userId) {

        // 根据包装组号获取到木箱卷信息
        List<Mat> list = matService.selectList(new EntityWrapper<Mat>().in("brand", param.getBoxList().stream().map(FxprkParam.Box::getPackageGroupNo).collect(Collectors.toList())));
        List<String> groupNos = param.getBoxList().stream().map(FxprkParam.Box::getPackageGroupNo).collect(Collectors.toList());
        List<Mat> list = matService.selectList(new EntityWrapper<Mat>().in("brand", groupNos));
        if (list.isEmpty()) {
            throw new CoolException("没有查询到该包装组号信息：" + param.getBoxList().toString());
        }
@@ -1431,12 +1432,6 @@
        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short) 1);
        StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto, 0);

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

        int workNo = dto.getWorkNo();
        Date now = new Date();
@@ -1476,7 +1471,7 @@
            // 重新定位木箱位置
            for (FxprkParam.Box box :param.getBoxList()) {
                if (box.getPackageGroupNo().equals(obj.getBrand())) {
                    if (!box.getBoxPos().equals(obj.getOrigin())) {
                    if (!box.getBoxPos().equals(obj.getOrigin()) || !wrkDetl.getZpallet().equals(param.getBarcode())) {
                        wrkDetl.setOrigin(box.getBoxPos());
                        wrkDetl.setZpallet(param.getBarcode());
                        wrkDetl.setBarcode(param.getBarcode());
@@ -1504,8 +1499,73 @@
        } else {
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }

        // 返回GWCS目标信息
        boolean result = pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode());

        // 一楼反修品入库的木箱通过包装组号需给mes推送待判
        pushDpToMes(groupNos);

        return R.ok("入库成功");
    }

    /**
     * 一楼反修品入库的木箱通过包装组号需给mes推送待判
     */
    private void pushDpToMes(List<String> groupNos) {
        boolean success = false;
        // 获取请求头
        Map<String,Object> headers = new HashMap<>();
        headers.put("digi-type","sync ");
        headers.put("digi-protocol","raw");
        headers.put("digi-datakey"," XCommon.ImportData");

        // 构造请求体
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("groupNos", groupNos);
        String body = jsonObject.toJSONString();

        String response = "";
        try {
            response = new HttpHandler.Builder()
                    .setUri(MesConstant.MES_IP_PORT)
                    .setPath(MesConstant.MES_DP_URL)
                    .setHeaders(headers)
                    .setJson(body)
                    .build()
                    .doPost();
            if (!Cools.isEmpty(response)) {
                JSONObject jsonObject1 = JSONObject.parseObject(response);
                int code = (int) jsonObject1.get("code");
                String msg = (String) jsonObject1.get("msg");
                if (code != 200) {
                    throw new CoolException(msg);
                }
                success = true;
            } else {
                log.error("返修品入库给mes推送待判失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.PAKIN_URL, body, response);
                throw new CoolException("返修品入库给mes推送待判失败");
            }
        } catch (Exception e) {
            log.error("返修品入库给mes推送待判异常：{}", e.getMessage());
        } finally {
            try {
                // 保存接口日志
                apiLogService.save(
                        "返修品入库给mes推送待判",
                        MesConstant.MES_IP_PORT + MesConstant.MES_DP_URL,
                        null,
                        "127.0.0.1",
                        body,
                        response,
                        success
                );
            } catch (Exception e) {
                log.error("", e);
            }
        }
    }

    public boolean pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo,String barcode) {
        boolean success = false;
        // 获取请求头