#

1

13 小时以前 a006bb4695b29bd0a78ccbf62f6841d08ceb7048

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

@@ -336,7 +336,7 @@
                                if (mat.getUpdateTime().compareTo(modifyTime) != 0) {
                                    // 更新字段
                                    if (!mat.getMaktx().equals(name)) mat.setMaktx(name);
                                    if (!mat.getMemo().equals(memo)) mat.setMemo(memo);
                                    if (mat.getMemo() == null || !mat.getMemo().equals(memo)) mat.setMemo(memo);
                                    if (mat.getWeight().compareTo(grossweight) != 0) mat.setWeight(grossweight);
                                    if (mat.getUnits().compareTo(netweight) != 0) mat.setUnits(netweight);
                                    if (mat.getSafeQty().compareTo(unit) != 0) mat.setSafeQty(unit);
@@ -489,14 +489,14 @@
                                    JSONObject jsonObjectNew2 = rows.getJSONObject(i);
                                    Order order = orderService.selectByNo(billNo);//检索单据
                                    LocOwner locOwner = null;
                                    if (ownerUuid != null) {
                                        locOwner = locOwnerService.selectByUuid(ownerUuid);
                                        if (locOwner == null) {
                                            callApiLogSaveOwner(locOwner,kingDeeUtilType, "货主检索失败，请先添加对应货主编号："+ownerUuid+"名称"+owner, false);continue;
                                        }
                                    } else{
                                        callApiLogSaveOwner(locOwner,kingDeeUtilType, "货主检索失败，未查询到货主编号！", false);continue;
                                    }
//                                    if (ownerUuid != null) {
//                                        locOwner = locOwnerService.selectByUuid(ownerUuid);
//                                        if (locOwner == null) {
//                                            callApiLogSaveOwner(locOwner,kingDeeUtilType, "货主检索失败，请先添加对应货主编号："+ownerUuid+"名称"+owner, false);continue;
//                                        }
//                                    } else{
//                                        callApiLogSaveOwner(locOwner,kingDeeUtilType, "货主检索失败，未查询到货主编号！", false);continue;
//                                    }
                                    if (Cools.isEmpty(order)) {
                                        // 单据主档
                                        order = new Order(
@@ -1581,16 +1581,19 @@
                            for (int k = 0; k < billEntryArray.size(); k++) {
                                JSONObject entry = billEntryArray.getJSONObject(k);
                                String matnr = entry.getString("material_number"); //物料编码，内部SKU
                                Double anfmeBox = 0.0;//箱数
                                Double anfmeBox = entry.getDouble("eap7_integerfield");//箱数
                                Double anfme = entry.getDouble("completqty");//个数
                                Double totalNumItems = entry.getDouble("eap7_decimalfield1");//总件数
                                Double totalVolume = entry.getDouble("eap7_decimalfield2");//总体积
                                String warehouse = entry.getString("warehouse_number");//仓库编码
                                if(kingDeeUtilType.formId.equals("OUI_RECEIVEBIll")){

                                }
                                String pOrderNo = entry.getString("eap7_textfield");//采购单号
                                String s3 = entry.getString("eap7_textfield4");//客户sku（客户编号）
                                String s3 = entry.getString("eap7_textfield2");//客户sku（客户编号）
                                String s2 = entry.getString("eap7_textfield1"); //条码UPC
                                String memo = entry.getString("eap7_textfield6"); //备注（英文描述）
                                String s1 = entry.getString("eap7_textfield7"); //客户PO
                                String memo = entry.getString("eap7_textfield5"); //备注（英文描述）
                                String s1 = entry.getString("eap7_textfield4"); //客户PO
                                String detlId = entry.getString("id"); //明细id
                                Long seq = entry.getLong("seq"); //分录行号
                                Double taxrate = entry.getDouble("taxrate");