手动导入订单和mes下发订单，增加客户名称和备注字段

pang.jiabao

2025-04-30 abb9b5c51d8a20be68b64e0c4a9620f6578d2e3a

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

@@ -1434,27 +1434,44 @@
    }

    @Override
    public R pdaFxprk(FxprkParam param, Long userId) {
    public R pdaFxprk(GwmsGenerateInventoryDto param, Long userId) {

        // 根据包装组号获取到木箱卷信息
        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());
        if (Cools.isEmpty(param,param.getMatList())) {
            throw new CoolException("请求参数不能为空：" + param);
        }
        if (Cools.isEmpty(param.getBarcode())) {
            throw new CoolException("条码不能为空：" + param.getBarcode());
        }

        int zpalletCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        if (zpalletCount > 0) {
            throw new CoolException("库存托盘码已存在：" + param.getBarcode());
        }

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

        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short) 1);
        StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto, 0);
        int iotype = 1;
        if (Cools.isEmpty(param.getMatList())) {
            iotype = 10;
        }

        // 根据源站点寻找库位
        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(1); // 返修入库标识
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(1L); // 工作状态：设备上走
        wrkMast.setIoType(1); // 入出库状态：1.入库
        wrkMast.setIoType(iotype); // 入出库状态：1.入库
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(param.getPalletizingNo());
@@ -1470,36 +1487,53 @@
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setAppeUser(userId);
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }
        wrkMast.setModiUser(userId);
        wrkMastService.insert(wrkMast);

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

        // 更新目标库位状态
@@ -1514,13 +1548,67 @@
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }

        // 一楼返修入库推送mes做记录
        pushFxrkToMes(param);

        // 返回GWCS目标信息
        openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(),"二楼返修入库推送gwcs");
        openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "一楼返修入库推送gwcs");

        // 一楼反修品入库的木箱通过包装组号需给mes推送待判
        pushDpToMes(groupNos);
        return R.ok("反修入库成功");
    }

        return R.ok("入库成功");
    private void pushFxrkToMes(GwmsGenerateInventoryDto param) {

        for (GwmsGenerateInventoryDto.MatList matList : param.getMatList()){
            matList.setOutOrIn("in");
            matList.setStockType("返修入库");
        }

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

        // 构造请求体
        String body = JSON.toJSONString(param);
        String response = "";
        try {
            response = new HttpHandler.Builder()
                    .setUri(MesConstant.MES_CC_IP_PORT)
                    .setPath(MesConstant.MES_CC_FXRK_URL)
                    .setHeaders(headers)
                    .setJson(body)
                    .build()
                    .doGet();
            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);
            }
        }

    }

    @Override
@@ -1730,6 +1818,27 @@
       return R.ok("调整成功");
    }

    @Override
    public R pdaFhhd(PdaDhhdParam param, Long userId) {

        String orderNo = param.getOrderNo();

        Order order = orderService.selectByNo(orderNo);
        if (order == null) {
            return R.parse("单据编号不存在：" + orderNo);
        } else if (!order.getSettle().equals(4L)) {
            return R.parse("单据状态不为4.已完成");
        }

        order.setSettle(5L);
        order.setUpdateBy(userId);
        order.setUpdateTime(new Date());

        orderService.updateById(order);

        return R.ok("发货核对成功");
    }

    // 同步盘点异常调整结果给mes
    void kctzPushMes(JSONObject jsonObject) {
        // 接口请求结果
@@ -1884,7 +1993,7 @@
                }
                throw new CoolException(msg);
            } else {
                log.error("返修品入库给mes推送待判失败！！！url：{}；request：{}；response：{}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_IP_PORT, body, response);
                log.error("返修品入库给mes推送待判失败！！！url：{}；request：{}；response：{}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_DP_URL, body, response);
                throw new CoolException("返修品入库给mes推送待判失败");
            }
        } catch (Exception e) {
@@ -1894,7 +2003,7 @@
                // 保存接口日志
                apiLogService.save(
                        "返修品入库给mes推送待判",
                        MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_IP_PORT,
                        MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_DP_URL,
                        null,
                        "127.0.0.1",
                        body,