#

1

19 小时以前 24673e6132418a4250f111e1ef38e4dbe15e4f7b

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

@@ -263,7 +263,7 @@
                JSONArray data = jsonResponse.getJSONObject("data").getJSONArray("rows");
                if(data.size()<=0)  continue;
                //商品档案同步
                if (kingDeeUtilType.formId.equals("BD_MATERIAL")) {
                if(kingDeeUtilType.formId.equals("BD_MATERIAL")) {
                    Tag tag = tagService.selectByName("全部", 1);
                    // 处理分页：根据返回的totalCount和pageSize计算页数
                    int pageSize = jsonResponse.getJSONObject("data").getIntValue("pageSize");
@@ -558,6 +558,11 @@
                                            callApiLogSaveOrder(order,kingDeeUtilType, "编号商品检索失败，请先添加商品"+matnr, false);
                                            continue;
                                        }
                                        if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {
                                            callApiLogSaveOrder(order, kingDeeUtilType,
                                                    "档案箱数量异常：" + matnr, false);
                                            continue;
                                        }
                                        Double erpAnfme = anfme*mat.getSafeQty();
                                        Order order1 = orderService.selectByNo( billNo);
                                        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order1.getId());
@@ -594,7 +599,7 @@
                                        orderDetl.setBoxType3(pOrderNo);//采购单号
                                        orderDetl.setMemo(memo);//英文备注
                                        orderDetl.setVolume(Totalvolume);//总体积
                                        orderDetl.setSafeQty(totalNumItems);//总件数
                                        orderDetl.setPrice(totalNumItems);//总件数
                                        orderDetl.setManu(warehouse);//仓库编码
                                        orderDetl.setCreateBy(9527L);
                                        orderDetl.setCreateTime(new Date());
@@ -734,6 +739,11 @@
                                if (Cools.isEmpty(mat)) {
                                    callApiLogSaveOrder(order, kingDeeUtilType,
                                            "商品不存在：" + matnr, false);
                                    continue;
                                }
                                if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {
                                    callApiLogSaveOrder(order, kingDeeUtilType,
                                            "档案箱数量异常：" + matnr, false);
                                    continue;
                                }
                                Double erpAnfme = anfme*mat.getSafeQty();
@@ -901,6 +911,11 @@
                                if (Cools.isEmpty(mat)) {
                                    callApiLogSaveOrder(order, kingDeeUtilType,
                                            "商品不存在：" + matnr, false);
                                    continue;
                                }
                                if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {
                                    callApiLogSaveOrder(order, kingDeeUtilType,
                                            "档案箱数量异常：" + matnr, false);
                                    continue;
                                }
                                Double erpAnfme = anfme*mat.getSafeQty();
@@ -1229,6 +1244,11 @@
                                            "物料档案不存在：" + matnr, false);
                                    continue;
                                }
                                if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {
                                    callApiLogSaveOrder(order, kingDeeUtilType,
                                            "档案箱数量异常：" + matnr, false);
                                    continue;
                                }
                                anfmeBox = Math.floor(anfme / mat.getSafeQty());
                                // ========= 明细去重 =========
                                List<OrderDetl> orderDetls =
@@ -1398,6 +1418,11 @@
                                            "商品不存在：" + matnr, false);
                                    continue;
                                }
                                if (mat.getSafeQty() == null || mat.getSafeQty() == 0) {
                                    callApiLogSaveOrder(order, kingDeeUtilType,
                                            "档案箱数量异常：" + matnr, false);
                                    continue;
                                }
                                anfmeBox = Math.floor(anfme / mat.getSafeQty());
                                // ========= 明细去重 =========
                                List<OrderDetl> orderDetls =
@@ -1477,6 +1502,7 @@
                            String owner = "和得科技";
                            String ownerUuid = "BU-00001";
                            String orderId = jsonObjectNew.getString("id");
                            String manuBill = jsonObjectNew.getString("manufacturenun");
                            // ========= 货主校验 =========
                            LocOwner locOwner = locOwnerService.selectByUuid(ownerUuid);
//                            if (locOwner == null) {
@@ -1497,7 +1523,7 @@
                                        null,    // 项目编号
                                        orderId,    //收料单id
                                        null,    // 调拨项目编号
                                        null,    // 初始票据号
                                        manuBill,    // 初始票据号
                                        null,    // 票据号
                                        null,    // 项目id
                                        owner,    // 货主
@@ -1552,7 +1578,9 @@
                                String s1 = entry.getString("eap7_textfield7"); //客户PO
                                String detlId = entry.getString("id"); //明细id
                                Long seq = entry.getLong("seq"); //分录行号
//                                String suppCode = entry.getString("supplier_number");
                                String manubill = entry.getString("manufacturenun");
                                String manubillid = entry.getString("orderid_id");
                                String manuentryid = entry.getString("mftentryid");
                                String suppCode = null;
                                if (anfme == null || anfme == 0) {
                                    callApiLogSaveOrder(order, kingDeeUtilType,
@@ -1583,6 +1611,8 @@
                                // ========= 保存明细 =========
                                OrderDetl orderDetl = new OrderDetl();
                                orderDetl.sync(mat);
                                orderDetl.setModel(manubillid);//orderid_id
                                orderDetl.setBrand(manuentryid);//manuentryid
                                orderDetl.setThreeCode(detlId);
                                orderDetl.setLineNumber(seq);
                                orderDetl.setAnfme(anfmeBox);