#杰克新增税率字段

lty

16 小时以前 47bf4931fc565cf1104abd5513b7bebfebbcec09

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

@@ -94,7 +94,7 @@
    }

    private JSONObject buildRequestParams(Order order, KingDeeUtilType kingDeeUtilType, SimpleDateFormat sdf1, SimpleDateFormat sdf2) {
        List<OrderDetl> orderDetlList = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",order.getOrderNo()));
        List<OrderDetl> orderDetlList = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id",order.getId()));
        if (kingDeeUtilType == null || kingDeeUtilType.formId == null) {
            log.warn("kingDeeUtilType 为空，已跳过本次同步！");
            return null;
@@ -102,7 +102,6 @@
        switch (kingDeeUtilType.formId) {
            case "PUR_RECEIVEBIll": // 进仓通知单
                path = imPurinbillAdd;
                JSONArray billentryLkArray = new JSONArray();
                JSONArray billentryArray = new JSONArray();  // 用于存储 billentry 对象
                String suppCode = null;  // 供应商
                String boxType2 = null;  // 货主/货源
@@ -115,6 +114,8 @@
                    }
                    Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
                    Double qty = orderDetl.getQty()*mat.getSafeQty();
                    JSONArray billentryLkArray = new JSONArray();

//                    Double qtytotal = orderDetl.getAnfme()*mat.getSafeQty();
//                    JSONArray idArr = new JSONArray();
//                    idArr.add(0L);
@@ -125,7 +126,7 @@
                            .fluentPut("billentry_lk_stableid", 677270092232273922L)
                            .fluentPut("billentry_lk_sbillid", Long.parseLong(order.getItemName()))  // 主单ID
                            .fluentPut("billentry_lk_sid", Long.parseLong(orderDetl.getThreeCode()))  // 明细ID
                            .fluentPut("billentry_lk_baseqty_old", orderDetl.getAnfme())  // ERP数量
                            .fluentPut("billentry_lk_baseqty_old", orderDetl.getErpAnfme())  // ERP数量
                            .fluentPut("billentry_lk_baseqty", qty);  // 作业数量
                    billentryLkArray.add(billentryLk);
                    // 创建 billentry 对象，填充缺失的字段
@@ -137,6 +138,8 @@
                            .fluentPut("outinvstatus_number", "110")
                            .fluentPut("linetype_number", "010")  // 行号类型
                            .fluentPut("qty", qty)  // 数量
                            .fluentPut("taxrate", orderDetl.getTaxrate())  // 税率
                            .fluentPut("priceandtax", orderDetl.getPriceandtax())  //含税单价
                            .fluentPut("material_number", orderDetl.getMatnr())  // 物料编号
                            .fluentPut("billentry_lk", billentryLkArray);

@@ -218,7 +221,8 @@
                            .fluentPut("material_number", orderDetl.getMatnr())
                            .fluentPut("invtype_number", "110")
                            .fluentPut("qualitystatus", "A")

                            .fluentPut("taxrate", orderDetl.getTaxrate())  // 税率
                            .fluentPut("priceandtax", orderDetl.getPriceandtax())  //含税单价
                            .fluentPut("billentry_lk", billentryLkArray1);

                    billentryArray1.add(billentry);
@@ -239,7 +243,7 @@

                                        .fluentPut("billentry", billentryArray1)  // 将 billentry 数组添加到请求参数
                        )));
            case "OUI_RECEIVEBIll":
            case "OUI_RECEIVEBIll"://委外入库单
                JSONArray billentryLkArray2 = new JSONArray();
                JSONArray billentryArray2 = new JSONArray();  // 用于存储 billentry 对象
                String suppCode2 = null;  // 供应商
@@ -261,7 +265,7 @@
                    JSONObject billentryLk = new JSONObject()
                            .fluentPut("id", 0L)
                            .fluentPut("seq", orderDetl.getLineNumber())
                            .fluentPut("billentry_lk_stableid", 1014628189722381313L)
                            .fluentPut("billentry_lk_stableid", 1828884569948973056L)
                            .fluentPut("billentry_lk_sbillid", Long.parseLong(order.getItemName()))  // 主单ID
                            .fluentPut("billentry_lk_sid", Long.parseLong(orderDetl.getThreeCode())); // 明细ID
//                            .fluentPut("billentry_lk_baseqty_old", orderDetl.getErpAnfme())  // ERP数量
@@ -281,7 +285,7 @@
                            .fluentPut("owner_number", "BU-00001")
                            .fluentPut("manuentry", orderDetl.getSpecs())
                            .fluentPut("manubill", orderDetl.getColor())
                            .fluentPut("manubillid", orderDetl.getModel())
                            .fluentPut("manubillid", Long.parseLong(orderDetl.getModel()))
                            .fluentPut("manuentryid", orderDetl.getBrand())
                            .fluentPut("producttype", "C")
                            .fluentPut("eap7_textfield", orderDetl.getBoxType3())
@@ -296,8 +300,9 @@
                            .fluentPut("outkeeper_number", "BU-00001")
                            .fluentPut("shipper_number", "BU-00001")
                            .fluentPut("entrysettleorg_number", "BU-00001")
                            .fluentPut("material_number", orderDetl.getMatnr())

                            .fluentPut("material_masterid_number", orderDetl.getMatnr())
                            .fluentPut("taxrate", orderDetl.getTaxrate())  // 税率
                            .fluentPut("priceandtax", orderDetl.getPriceandtax())  //含税单价
                            .fluentPut("billentry_lk", billentryLkArray2);

                    billentryArray2.add(billentry);
@@ -306,7 +311,7 @@
                        .fluentPut("data", new JSONArray(Arrays.asList(
                                new JSONObject()
                                        .fluentPut("billno", UUID.randomUUID().toString().replace("-", "").substring(0, 16))
                                        .fluentPut("billstatus", "C")
                                        .fluentPut("billstatus", "A")
                                        .fluentPut("id", 0L)
                                        .fluentPut("biztime", sdf1.format(now2))
                                        .fluentPut("org_number", "BU-00001")
@@ -318,6 +323,8 @@
                                        .fluentPut("invscheme_number", "601")
                                        .fluentPut("purorg_number", "BU-00001")
                                        .fluentPut("productionorg_number", "BU-00001")
                                        .fluentPut("supplier_number", "272")

                                        .fluentPut("billentry", billentryArray2)  // 将 billentry 数组添加到请求参数
                        )));
            case "STK_imSaloutbill":