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

1

11 小时以前 5e567919108b4e1c914cdb1aae5d91ff2eb337d7

 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java

@@ -38,10 +38,18 @@
    //端口
    private String URL;

    @Value("${erp.address.inaddress}")
    //单据，商品档案地址
    private String inaddress;

    @Value("${erp.address.mataddress}")
    //商品档案地址
    private String matAddress;
    @Value("${erp.address.orgaddress}")
    //货主档案地址
    private String orgAddress;
    @Value("${erp.address.impurreceivebilladdress}")
    //收料单查询
    private String imPurreceiveBillAddress;
    @Value("${erp.address.impurreceivebilldetl}")
    //进仓通知单
    private String imPurreceiveBillDetlAddress;
    @Autowired
    private ApiLogService apiLogService;

@@ -69,6 +77,8 @@
    @Autowired
    private LocOwnerService locOwnerService;
    @Autowired
    private LocSuppService locSuppService;
    @Autowired
    private ErpSecretServiceImpl erpSecretService;
    @Value("${erp.login.accountId}")
    private String accountId;
@@ -83,7 +93,7 @@


        for(KingDeeUtilType kingDeeUtilType : KingDeeUtilType.values()) {
            MatLoadParam matLoadParam = new MatLoadParam();
//            MatLoadParam matLoadParam = new MatLoadParam();
            DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", kingDeeUtilType.desc));
            if (Cools.isEmpty(docType) && !kingDeeUtilType.formId.equals("BD_MATERIAL")){
                docType = docTypeService.selectOrAdd(kingDeeUtilType.desc, kingDeeUtilType.pakIn.equals(1));
@@ -91,38 +101,48 @@
            String FDocumentStatus=null;
            //条件和需要获得的结果拼接
            JSONObject jsonObject = new JSONObject();
            //物料档案查询
            if(kingDeeUtilType.formId.equals("BD_MATERIAL")){
                Tag tag = tagService.selectByName("全部", 1);
                jsonObject.put("id", null);//id
                jsonObject.put("number", null);//编码
                jsonObject.put("createorg_number", null);//创建组织
                jsonObject.put("start_createtime", "2025-01-01 00:00:00");//创建起始
                jsonObject.put("end_createtime", sdf1.format(new Date()));//创建截止
                jsonObject.put("start_modifytime", "2025-01-01 00:00:00");//更新起始
                jsonObject.put("end_modifytime", sdf1.format(new Date()));//更新截止
                jsonObject.put("start_approvedate", "2025-01-01");//审核起始
                jsonObject.put("end_approvedate", sdf2.format(new Date()));//审核截止
                jsonObject.put("status", Arrays.asList("B", "C"));//数据状态 [A:暂存, B:已提交, C:已审核]

            }else{
                //获取最新时间
                //单据状态
                FDocumentStatus="B";
                jsonObject.put("FilterString", "FCreateDate>'"+sdf1.format(docType.getCreateTime())+"'"+" and FStockId.Fname='立库'"+" and FDocumentStatus='"+FDocumentStatus+"'");
                jsonObject.put("FieldKeys", "FBillNo,FCreateDate,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,"+kingDeeUtilType.anfme+",FDocumentStatus");
                // FBillNo :单据编号；
                // FCreateDate ：单据创建时间；
                // FMaterialId.FNumber : 物料编码；
                // FMaterialName ：物料名称；
                // FMaterialId.FSpecification：物料规格
                // anfme : 物料数量
                // FDocumentStatus ：单据状态；

            String path = null;
            Date now = new Date();
            String latestUpdateTime = sdf1.format(docType.getUpdateTime());
            switch (kingDeeUtilType.formId) {
                case "BD_MATERIAL": //物料同步
                    jsonObject.put("id", null);//id
                    jsonObject.put("number", null);//编码
                    jsonObject.put("createorg_number", null);//创建组织
                    jsonObject.put("start_createtime", "2025-01-01 00:00:00");//创建起始
                    jsonObject.put("end_createtime", sdf1.format(now));//创建截止
                    jsonObject.put("start_modifytime", latestUpdateTime);//更新起始
                    jsonObject.put("end_modifytime", sdf1.format(now));//更新截止
                    jsonObject.put("start_approvedate", "2025-01-01");//审核起始
                    jsonObject.put("end_approvedate", sdf2.format(now));//审核截止
                    jsonObject.put("status", Arrays.asList("B", "C"));//数据状态 [A:暂存, B:已提交, C:已审核]
                    path = matAddress;
                    break;
                case "BD_RRGANIZATION": //供应商同步
                    jsonObject.put("start_createtime", "2025-01-01 00:00:00");//id
                    jsonObject.put("end_createtime", sdf1.format(now));
                    jsonObject.put("id", null);
                    jsonObject.put("number", null);
                    jsonObject.put("createorg_number", null);
                    jsonObject.put("status", Arrays.asList("B", "C"));//数据状态 [A:暂存, B:已提交, C:已审核]
                    path = orgAddress;
                    break;
                case "PUR_RECEIVEBIll": //已审核收料单查询
//                    jsonObject.put("start_biztime", latestUpdateTime);//业务起始日期
                    jsonObject.put("start_biztime",  "2025-01-01 00:00:00");//业务起始日期
                    jsonObject.put("end_biztime", sdf1.format(now));//业务结束日期
                    jsonObject.put("billno", Arrays.asList("CGSL-251125-000001"));
                    jsonObject.put("billstatus", Arrays.asList("A","B","C"));//数据状态 [A:暂存, B:已提交, C:已审核]
                    jsonObject.put("start_auditdate", null);//id
                    jsonObject.put("end_auditdate", null);
                    jsonObject.put("org_number", null);
                    jsonObject.put("supplier_number", null);
                    path = imPurreceiveBillAddress;
                    break;
            }
            JSONObject jsonObject1 = new JSONObject();
            jsonObject1.put("data", jsonObject);
            jsonObject1.put("pageSize", 10);
            jsonObject1.put("pageSize", 20);
            jsonObject1.put("pageNo", 1);
            String add = jsonObject1.toJSONString();

@@ -137,7 +157,7 @@
                response = new HttpHandler.Builder()
                        .setHeaders(headers)
                        .setUri(URL)
                        .setPath(inaddress)
                        .setPath(path)
                        .setJson(add)
                        .build()
                        .doPost();
@@ -152,7 +172,6 @@
                //商品档案同步
                if (kingDeeUtilType.formId.equals("BD_MATERIAL")) {
                    Tag tag = tagService.selectByName("全部", 1);

                    // 处理分页：根据返回的totalCount和pageSize计算页数
                    int pageSize = jsonResponse.getJSONObject("data").getIntValue("pageSize");
                    int totalCount = jsonResponse.getJSONObject("data").getIntValue("totalCount");
@@ -165,7 +184,7 @@
                        response = new HttpHandler.Builder()
                                .setHeaders(headers)
                                .setUri(URL)
                                .setPath(inaddress)
                                .setPath(path)
                                .setJson(add)
                                .build()
                                .doPost();
@@ -177,12 +196,18 @@
                            Date modifyTime = sdf1.parse(jsonObjectNew.get("modifytime").toString());
                            String matnr = jsonObjectNew.get("number").toString();
                            String name = jsonObjectNew.get("name").toString();
                            String createtime = jsonObjectNew.get("createtime").toString();
                            String createTime = jsonObjectNew.get("createtime").toString();
                            Double grossweight = jsonObjectNew.get("grossweight") != null ? new BigDecimal(jsonObjectNew.get("grossweight").toString()).doubleValue() : 0.0;
                            Double height = jsonObjectNew.get("height") != null ? new BigDecimal(jsonObjectNew.get("height").toString()).doubleValue() : 0.0;
                            Double width = jsonObjectNew.get("width") != null ? new BigDecimal(jsonObjectNew.get("width").toString()).doubleValue() : 0.0;
                            Double length = jsonObjectNew.get("length") != null ? new BigDecimal(jsonObjectNew.get("length").toString()).doubleValue() : 0.0;

                            Double netweight = jsonObjectNew.get("netweight") != null ? new BigDecimal(jsonObjectNew.get("grossweight").toString()).doubleValue() : 0.0;
                            // ---- 排序逻辑 ----
                            List<Double> dims = Arrays.asList(height, width, length);
                            dims.sort(Double::compareTo); // 升序排列：最小、中间、最大
                            Double min = dims.get(0);
                            Double mid = dims.get(1);
                            Double max = dims.get(2);
                            // 生成商品档案
                            Mat mat = matService.selectByMatnr(matnr);
                            if (mat == null) {
@@ -190,11 +215,12 @@
                                mat.setMatnr(matnr);
                                mat.setMaktx(name);
                                mat.setTagId(tag.getId());
                                mat.setWeight(grossweight);
                                mat.setManLength(length);
                                mat.setHeight(height);
                                mat.setWidth(width);
                                mat.setCreateTime(sdf1.parse(createtime));
                                mat.setWeight(grossweight);//净重
                                mat.setUnits(netweight);//毛重
                                mat.setManLength(max);
                                mat.setHeight(min);
                                mat.setWidth(mid);
                                mat.setCreateTime(sdf1.parse(createTime));
                                mat.setUpdateTime(modifyTime);
                                mat.setStatus(1);
                                if (!matService.insert(mat)) {
@@ -202,6 +228,7 @@
                                    log.info("同步新物料出错！参数：[{}]、[{}]", mat, jsonObjectNew);
                                } else {
                                    callApiLogSaveMat(mat, kingDeeUtilType, "同步新物料成功！", true);
                                    success = true;
                                }
                            } else {
                                boolean isUpdated = false;
@@ -212,153 +239,279 @@
                                    if (mat.getManLength().compareTo(length) != 0) mat.setManLength(length);
                                    if (mat.getHeight().compareTo(height) != 0) mat.setHeight(height);
                                    if (mat.getWidth().compareTo(width) != 0) mat.setWidth(width);
                                    if (mat.getCreateTime().compareTo(sdf1.parse(createtime)) != 0)
                                        mat.setCreateTime(sdf1.parse(createtime));
                                    if (mat.getCreateTime().compareTo(sdf1.parse(createTime)) != 0)
                                        mat.setCreateTime(sdf1.parse(createTime));
                                    mat.setUpdateTime(modifyTime);
                                    isUpdated = true;
                                }
                                // 执行更新操作
                                if (isUpdated) {
                                    mat.setUpdateTime(new Date());
                                    if (!matService.updateById(mat)) {
                                        callApiLogSaveMat(mat, kingDeeUtilType, "更新物料出错！" + mat, false);
                                        log.info("更新物料[商品编号：{}], 更新失败！", mat.getMatnr());
                                    } else {
                                        callApiLogSaveMat(mat, kingDeeUtilType, "更新物料成功！", true);
                                        success = true;
                                        log.info("更新物料[商品编号：{}]", mat.getMatnr());
                                    }
                                }
                            }
                        }
                    }
                }else if(kingDeeUtilType.formId.equals("BD_RRGANIZATION")){

                } else {
                    for (int j = 0; j < data.size(); j++) {
                        JSONArray jsonArray = data.getJSONArray(j);
                        //最新抓取时间
                        Date jsonDate = KingDeeUtil.KingDeeDate(jsonArray.get(1).toString());
                        docType.setCreateTime(jsonDate);
                        Order order = OrderInAndOutUtil.selectByNo(kingDeeUtilType.pakIn == 1, jsonArray.get(0).toString());
//                        Order order = orderService.selectByNo(jsonArray.get(0).toString());
                        LocOwner locOwner = null;
                        if (!Cools.isEmpty(1)) {
                            locOwner = locOwnerService.selectById(1);
                        } else {
                            locOwner = locOwnerService.selectById(1);
                        }
                        if (Cools.isEmpty(order)) {
                            Date now = new Date();
                            // 单据主档
                            order = new Order(
                                    String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                                    jsonArray.get(0).toString(),    // 订单编号
                                    DateUtils.convert(now),    // 单据日期
                                    docType.getDocId(),    // 单据类型
                                    null,    // 项目编号
                                    "1",    //项目名称 客户PO号
                                    null,    // 调拨项目编号
                                    null,    // 初始票据号
                                    null,    // 票据号
                                    locOwner.getOwnerUuid(),    // 客户编号
                                    locOwner.getOwner(),    // 客户
                                    null,    // 联系方式
                                    null,    // 操作人员
                                    null,    // 合计金额
                                    null,    // 优惠率
                                    null,    // 优惠金额
                                    null,    // 销售或采购费用合计
                                    null,    // 实付金额
                                    null,    // 付款类型
                                    null,    // 业务员
                                    null,    // 结算天数
                                    null,    // 邮费支付类型
                                    null,    // 邮费
                                    null,    // 付款时间
                                    null,    // 发货时间
                                    null,    // 物流名称
                                    null,    // 物流单号
                                    1L,    // 订单状态
                                    1,    // 状态
                                    9527L,    // 添加人员
                                    now,    // 添加时间
                                    9527L,    // 修改人员
                                    now,    // 修改时间
                                    null    // 备注
                            );
                             OrderInAndOutUtil.insertOrder(kingDeeUtilType.pakIn == 1, order);

//                            if (!orderService.insert(order)) {
//                                if (!jsonDate.equals(docType.getCreateTime())){
//                                    callApiLogSaveOrder(order,kingDeeUtilType, "生成单据主档失败，请联系管理员"+order, false);
//                                }
//                                continue;
////                                throw new CoolException("生成单据主档失败，请联系管理员");
//                            }
                        }
                        //物料编码
                        Mat mat = matService.selectByMatnr(jsonArray.get(2).toString());
                        if (Cools.isEmpty(mat)) {
                            if (!jsonDate.equals(docType.getCreateTime())){
                                callApiLogSaveOrder(order,kingDeeUtilType, "编号商品检索失败，请先添加商品"+jsonArray.get(2).toString(), false);
                            }
                            continue;
                        }
//                        OrderDetl orderDetl1 = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", jsonArray.get(0).toString()).eq("matnr", jsonArray.get(2).toString()));
//                        if (!Cools.isEmpty(orderDetl1)) {
//                            continue;
//                        }
                        Order order1 = OrderInAndOutUtil.selectByNo(kingDeeUtilType.pakIn == 1, jsonArray.get(0).toString());
                        List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(kingDeeUtilType.pakIn == 1, order1.getId());
                        boolean sign = false;
                        for (OrderDetl orderDetl : orderDetls){
                            if (orderDetl.getMatnr().equals( jsonArray.get(2).toString())){
                                sign = true;
                                break;
                            }
                        }
                        if (sign){
                            continue;
                        }
                        OrderDetl orderDetl = new OrderDetl();
                        orderDetl.sync(mat);
                        orderDetl.setBatch(null);
                        orderDetl.setAnfme(Double.parseDouble(jsonArray.get(5).toString()));
                        orderDetl.setOrderId(order.getId());
                        orderDetl.setOrderNo(order.getOrderNo());
                        orderDetl.setCreateBy(9527L);
                        orderDetl.setCreateTime(new Date());
                        orderDetl.setUpdateBy(9527L);
                        orderDetl.setUpdateTime(new Date());
                        orderDetl.setStatus(1);
                        orderDetl.setQty(0.0D);
//                        if (!orderDetlService.insert(orderDetl)) {
//                            callApiLogSaveOrder(order,kingDeeUtilType, "生成单据明细失败，请联系管理员!订单号："+order.getOrderNo(), false);
////                            throw new CoolException("生成单据明细失败，请联系管理员");
//                        }
                        OrderInAndOutUtil.insertOrderDetl(kingDeeUtilType.pakIn == 1,order,orderDetl);
                    if(success){
                        docType.setUpdateTime(now);
                        docTypeService.updateById(docType);
                    }
                    docTypeService.updateById(docType);
                }
                else if(kingDeeUtilType.formId.equals("BD_RRGANIZATION")){//供应商同步
                    int pageSize = jsonResponse.getJSONObject("data").getIntValue("pageSize");
                    int totalCount = jsonResponse.getJSONObject("data").getIntValue("totalCount");
                    int totalPages = (int) Math.ceil((double) totalCount / pageSize);

                    for (int page = 1; page <= totalPages; page++) {
                        jsonObject1.put("pageNo", page);
                        add = jsonObject1.toJSONString();
                        // 重新发起请求以获取该页的数据
                        response = new HttpHandler.Builder()
                                .setHeaders(headers)
                                .setUri(URL)
                                .setPath(path)
                                .setJson(add)
                                .build()
                                .doPost();

                        jsonResponse = JSON.parseObject(response);
                        data = jsonResponse.getJSONObject("data").getJSONArray("rows");
                        for (int j = 0; j < data.size(); j++) {
                            JSONObject jsonObjectNew = data.getJSONObject(j);
                            Date updateTime = sdf1.parse(jsonObjectNew.get("modifytime").toString());
                            String ownerUuid = jsonObjectNew.get("number").toString();
                            String owner = jsonObjectNew.get("name").toString();
                            Date createTime =  sdf1.parse(jsonObjectNew.get("createtime").toString());
                            // 生成商品档案
                            LocSupp locSupp = locSuppService.selectByUuid(ownerUuid);
                            if (locSupp == null) {
                                locSupp = new LocSupp();
                                locSupp.setOwner(owner);
                                locSupp.setOwnerUuid(ownerUuid);
                                locSupp.setCreateTime(createTime);
                                locSupp.setUpdateTime(updateTime);
                                locSupp.setStatus(1);
                                if (!locSuppService.insert(locSupp)) {
                                    callApiLogSaveSupp(locSupp, kingDeeUtilType, "同步新供应商出错！" + locSupp, false);
                                    log.info("同步新供应商出错！参数：[{}]、[{}]", locSupp, jsonObjectNew);
                                } else {
                                    callApiLogSaveSupp(locSupp, kingDeeUtilType, "同步新供应商成功！", true);
                                }
                            } else {
                                boolean isUpdated = false;
                                if (locSupp.getUpdateTime().compareTo(updateTime) != 0) {
                                    // 更新字段
                                    if (!locSupp.getOwner().equals(owner)) locSupp.setOwner(owner);
                                    if (!locSupp.getOwnerUuid().equals(ownerUuid)) locSupp.setOwnerUuid(ownerUuid);

                                    if (locSupp.getCreateTime().compareTo(createTime) != 0)
                                        locSupp.setCreateTime(createTime);
                                    locSupp.setUpdateTime(updateTime);
                                    isUpdated = true;
                                }
                                // 执行更新操作
                                if (isUpdated) {
                                    if (!locSuppService.updateById(locSupp)) {
                                        callApiLogSaveSupp(locSupp, kingDeeUtilType, "更新供应商出错！" + locSupp, false);
                                        log.info("更新供应商[供应商编号：{}], 更新失败！", locSupp.getOwnerUuid());
                                    } else {
                                        callApiLogSaveSupp(locSupp, kingDeeUtilType, "更新供应商成功！", true);
                                        log.info("更新供应商[供应商编号：{}]", locSupp.getOwnerUuid());
                                    }
                                }
                            }
                        }
                    }
                }
                else if(kingDeeUtilType.formId.equals("PUR_RECEIVEBIll")){
                    int pageSize = jsonResponse.getJSONObject("data").getIntValue("pageSize");
                    int totalCount = jsonResponse.getJSONObject("data").getIntValue("totalCount");
                    int totalPages = (int) Math.ceil((double) totalCount / pageSize);
                    for (int page = 1; page <= totalPages; page++) {
                        jsonObject1.put("pageNo", page);
                        add = jsonObject1.toJSONString();
                        // 重新发起请求以获取该页的数据
                        response = new HttpHandler.Builder()
                                .setHeaders(headers)
                                .setUri(URL)
                                .setPath(path)
                                .setJson(add)
                                .build()
                                .doPost();

                        jsonResponse = JSON.parseObject(response);
                        data = jsonResponse.getJSONObject("data").getJSONArray("rows");
                        for (int j = 0; j < data.size(); j++) {
                            JSONObject jsonObjectNew = data.getJSONObject(j);
                            Date createTime =  sdf1.parse(jsonObjectNew.get("createtime").toString());
                            String billNo = jsonObjectNew.get("billno").toString();//单据编号
                            String owner = jsonObjectNew.get("org_name").toString();//货主名称
                            String ownerUuid = jsonObjectNew.get("org_number").toString();//erp货主编号
                            JSONObject detailParam = new JSONObject();
                            JSONObject dataObj = new JSONObject();
                            dataObj.put("billno", billNo);
                            detailParam.put("data", dataObj);
                            detailParam.put("pageNo", 1);
                            detailParam.put("pageSize", 100);
                            detailParam.put("data", dataObj);
                            boolean hasNext = true;
                            while (hasNext) {
                                String reqJson = detailParam.toJSONString();
                                String detailResp = new HttpHandler.Builder()
                                        .setHeaders(headers)
                                        .setUri(URL)
                                        .setPath(imPurreceiveBillDetlAddress)
                                        .setJson(reqJson)
                                        .build()
                                        .doPost();
                                JSONObject detailJson = JSON.parseObject(detailResp);
                                JSONObject detData = detailJson.getJSONObject("data");
                                JSONArray rows = detData.getJSONArray("rows");
                                // ====== 处理明细 ======
                                for (int i = 0; i < rows.size(); i++) {
                                    JSONObject jsonObjectNew2 = rows.getJSONObject(i);
                                    Order order = orderService.selectByNo( billNo);//检索单据
                                    LocOwner locOwner = null;
                                    if (ownerUuid != null) {
                                        locOwner = locOwnerService.selectByUuid(ownerUuid);
                                        if (locOwner == null) {
                                            callApiLogSaveOrder(order,kingDeeUtilType, "货主检索失败，请先添加对应货主编号："+ownerUuid, false);continue;
                                        }
                                    } else{
                                        callApiLogSaveOrder(order,kingDeeUtilType, "货主检索失败，未查询到货主编号！", false);continue;
                                    }
                                    if (Cools.isEmpty(order)) {
                                        // 单据主档
                                        order = new Order(
                                                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                                                billNo,    // 订单编号
                                                createTime.toString(),    // 单据日期
                                                docType.getDocId(),    // 单据类型
                                                null,    // 项目编号
                                                null,    //项目名称 客户PO号  暂时不知道字段是哪个
                                                null,    // 调拨项目编号
                                                null,    // 初始票据号
                                                null,    // 票据号
                                                null,    // 项目id
                                                owner,    // 货主
                                                null,    // 联系方式
                                                null,    // 操作人员
                                                null,    // 合计金额
                                                null,    // 优惠率
                                                null,    // 优惠金额
                                                null,    // 销售或采购费用合计
                                                null,    // 实付金额
                                                null,    // 付款类型
                                                null,    // 业务员
                                                null,    // 结算天数
                                                null,    // 邮费支付类型
                                                null,    // 邮费
                                                null,    // 付款时间
                                                null,    // 发货时间
                                                null,    // 物流名称
                                                null,    // 物流单号
                                                1L,    // 订单状态
                                                1,    // 状态
                                                9527L,    // 添加人员
                                                now,    // 添加时间
                                                9527L,    // 修改人员
                                                now,    // 修改时间
                                                null,    // 备注
                                                kingDeeUtilType.pakIn !=1?2:1
                                        );
                                        if( orderService.insert(order)){
                                            callApiLogSaveOrder(order, kingDeeUtilType, "创建入库单成功！单号：" + billNo, true);
                                        }
                                    }
                                    JSONArray billEntryArray = jsonObjectNew2.getJSONArray("billentry");
                                    for (int k = 0; k < billEntryArray.size(); k++) {
                                        JSONObject entry = billEntryArray.getJSONObject(k);
                                        String matnr = entry.getString("material_number"); //物料编码，内部SKU
                                        Double anfme = entry.getDouble("eap7_decimalfield");//箱数
                                        Double totalNumItems = entry.getDouble("eap7_decimalfield1");//总件数
                                        Double Totalvolume = entry.getDouble("eap7_decimalfield2");//总体积
                                        String warehouse = entry.getString("warehouse_number");//仓库编码
                                        String pOrderNo = entry.getString("eap7_textfield3");//采购单号
                                        String s3 = entry.getString("eap7_textfield4");//客户sku（客户编号）
                                        String s2 = entry.getString("eap7_textfield5"); //条码UPC
                                        String memo = entry.getString("eap7_textfield6"); //备注（英文描述）
                                        String s1 = entry.getString("eap7_textfield7"); //客户PO
                                        String suppCode = entry.getString("supplier_number"); //供应商
                                        //物料编码
                                        Mat mat = matService.selectByMatnr(matnr);
                                        if (Cools.isEmpty(mat)) {
                                            callApiLogSaveOrder(order,kingDeeUtilType, "编号商品检索失败，请先添加商品"+matnr, false);
                                            continue;
                                        }
                                        Order order1 = orderService.selectByNo( billNo);
                                        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order1.getId());
                                        boolean sign = false;
                                        for (OrderDetl orderDetl : orderDetls){
                                            if (orderDetl.getMatnr().equals(matnr)){
                                                sign = true;
                                                break;
                                            }
                                        }
                                        if (sign){
                                            continue;
                                        }
                                        LocSupp locSupp = null;
                                        String supp =null;
                                        locSupp = locSuppService.selectByUuid(suppCode);
                                        if(locSupp != null){supp = locSupp.getOwner();}
                                        OrderDetl orderDetl = new OrderDetl();
                                        orderDetl.sync(mat);
                                        orderDetl.setAnfme(anfme);//总箱数
                                        orderDetl.setOrderId(order.getId());
                                        orderDetl.setOrderNo(order.getOrderNo());//表头单据
                                        orderDetl.setSupp(supp);//供应商名称（货源）
                                        orderDetl.setSuppCode(suppCode);//供应商编码
                                        orderDetl.setSku(matnr);//内部SKU
                                        orderDetl.setStandby1(s1);//客户PO
                                        orderDetl.setStandby2(s2);//条码UPC
                                        orderDetl.setStandby3(s3);//客户SKU
                                        orderDetl.setBoxType1(owner); //货主名称
                                        orderDetl.setBoxType2(ownerUuid);//货主编号（erp组织）
                                        orderDetl.setBoxType3(pOrderNo);//采购单号
                                        orderDetl.setMemo(memo);//英文备注
                                        orderDetl.setVolume(Totalvolume);//总体积
                                        orderDetl.setSafeQty(totalNumItems);//总件数
                                        orderDetl.setManu(warehouse);//仓库编码
                                        orderDetl.setCreateBy(9527L);
                                        orderDetl.setCreateTime(new Date());
                                        orderDetl.setUpdateBy(9527L);
                                        orderDetl.setUpdateTime(new Date());
                                        orderDetl.setStatus(1);
                                        orderDetl.setQty(0.0D);
                                        orderDetlService.insert(orderDetl);
                                    }
                                }
                                // 是否还有下一页
                                boolean lastPage = detData.getBoolean("lastPage");
                                if (lastPage) {
                                    hasNext = false;
                                } else {
                                    // 下一页
                                    int currPage = detData.getIntValue("pageNo");
                                    detailParam.put("pageNo", currPage + 1);
                                }
                            }
                        }
                        docTypeService.updateById(docType);
                    }
                }
            } catch (Exception e) {
                log.error("fail", e);
//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return FAIL.setMsg(e.getMessage());
            } finally {
//                try {
//                    // 保存接口日志
//                    apiLogService.save(
//                            "轮询数据",
//                            URL + inaddress,
//                            null,
//                            "127.0.0.1",
//                            add,
//                            response,
//                            success
//                    );
//                } catch (Exception e) {
//                    log.error("", e);
//                }

            }
        }
        return SUCCESS;
@@ -366,7 +519,17 @@

    public void callApiLogSaveMat(Mat mat, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
        apiLogService.save("获取"+kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
                "物料编号：" + mat.getMatnr() + "、物料名称：" + mat.getName() + "、类型：" + mat.getTagId$() + "、状态：" + mat.getStatus$(),
                "物料编号：" + mat.getMatnr() + "、物料名称：" + mat.getMaktx() + "、毛重：" + mat.getWeight()
                        + "、长：" + mat.getManLength()
                        + "、宽：" + mat.getWidth()
                        + "、高：" + mat.getHeight()
                        + "、状态：" + mat.getStatus$(),
                response, bool);
    }

    public void callApiLogSaveSupp(LocSupp locSupp, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
        apiLogService.save("获取"+kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
                "货主编号：" + locSupp.getOwnerUuid() + "、货主名称：" + locSupp.getOwner(),
                response, bool);
    }